Skip to content

Fix UDP socket binding on reconnection (Fixes #25) #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Skeyelab merged 1 commit into from
Oct 24, 2025
Merged

Fix UDP socket binding on reconnection (Fixes #25) #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 41 additions & 29 deletions Source/AirPlay/AirPlayManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ AirPlayManager::AirPlayManager() : Thread("AirPlayStream")
{
encoder = std::make_unique<AudioEncoder>();
buffer = std::make_unique<StreamBuffer>(2, 8192);

#if JUCE_MAC
streamer = std::make_unique<AirPlayMac>();
#elif JUCE_WINDOWS
Expand All @@ -37,44 +37,56 @@ void AirPlayManager::prepare(double sampleRate, int samplesPerBlock)

void AirPlayManager::connectToDevice(const AirPlayDevice& device)
{
juce::Logger::writeToLog("AirPlayManager: connectToDevice called for: " + device.getDeviceName() + " at " + device.getHostAddress() + ":" + juce::String(device.getPort()));
const juce::ScopedLock sl(connectionLock);

hasError = false;
isReconnecting = false;
if (streamer && streamer->connect(device))

if (streamer)
{
connectedDevice = device;
lastError.clear();
startThread();
notifyStatusChange("Connected to " + device.getDeviceName());
DBG("AirPlayManager: Connected to " + device.getDeviceName());
juce::Logger::writeToLog("AirPlayManager: Streamer exists, attempting connection");
if (streamer->connect(device))
{
connectedDevice = device;
lastError.clear();
startThread();
notifyStatusChange("Connected to " + device.getDeviceName());
juce::Logger::writeToLog("AirPlayManager: Connected to " + device.getDeviceName());
}
else
{
lastError = streamer->getLastError();
hasError = true;
notifyError("Connection failed: " + lastError);
juce::Logger::writeToLog("AirPlayManager: Connection failed - " + lastError);
}
}
else
{
lastError = streamer ? streamer->getLastError() : "Streamer not available";
lastError = "Streamer not available";
hasError = true;
notifyError("Connection failed: " + lastError);
DBG("AirPlayManager: Connection failed - " + lastError);
juce::Logger::writeToLog("AirPlayManager: Streamer not available");
}
}

void AirPlayManager::disconnectFromDevice()
{
const juce::ScopedLock sl(connectionLock);

signalThreadShouldExit();
notify();
stopThread(2000);

if (streamer)
streamer->disconnect();

connectedDevice = AirPlayDevice();
hasError = false;
isReconnecting = false;
notifyStatusChange("Disconnected");
DBG("AirPlayManager: Disconnected");
juce::Logger::writeToLog("AirPlayManager: Disconnected");
}

bool AirPlayManager::isConnected() const
Expand Down Expand Up @@ -104,19 +116,19 @@ juce::String AirPlayManager::getLastError() const
juce::String AirPlayManager::getConnectionStatus() const
{
const juce::ScopedLock sl(connectionLock);

if (!streamer)
return "Not initialized";

if (isReconnecting)
return "Reconnecting...";

if (hasError)
return "Error: " + lastError;

if (streamer->isConnected())
return "Connected to " + connectedDevice.getDeviceName();

return "Disconnected";
}

Expand All @@ -126,7 +138,7 @@ void AirPlayManager::setAutoReconnect(bool enable)
{
// Platform-specific implementation would need this method
// For now, just log it
DBG("AirPlayManager: Auto-reconnect " + juce::String(enable ? "enabled" : "disabled"));
juce::Logger::writeToLog("AirPlayManager: Auto-reconnect " + juce::String(enable ? "enabled" : "disabled"));
}
}

Expand All @@ -150,10 +162,10 @@ void AirPlayManager::processAudioStream()
{
if (!isConnected() || !buffer || !encoder || !streamer)
return;

juce::AudioBuffer<float> tempBuffer(2, currentSamplesPerBlock);
int samplesRead = buffer->read(tempBuffer, currentSamplesPerBlock);

if (samplesRead > 0)
{
if (!streamer->streamAudio(tempBuffer, samplesRead))
Expand All @@ -170,16 +182,16 @@ void AirPlayManager::processAudioStream()
void AirPlayManager::monitorConnection()
{
juce::int64 now = juce::Time::currentTimeMillis();

// Monitor every 5 seconds
if (now - lastMonitorTime < 5000)
return;

lastMonitorTime = now;

if (!streamer)
return;

// Check if we're still connected
if (streamer->isConnected())
{
Expand All @@ -190,7 +202,7 @@ void AirPlayManager::monitorConnection()
hasError = false;
isReconnecting = false;
notifyStatusChange("Connection recovered");
DBG("AirPlayManager: Connection recovered");
juce::Logger::writeToLog("AirPlayManager: Connection recovered");
}
}
else if (!hasError)
Expand All @@ -200,7 +212,7 @@ void AirPlayManager::monitorConnection()
lastError = "Connection lost to " + connectedDevice.getDeviceName();
hasError = true;
notifyError(lastError);
DBG("AirPlayManager: " + lastError);
juce::Logger::writeToLog("AirPlayManager: " + lastError);
}
}

Expand Down
Loading