Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

UDP sound sync improvement

Browse Source 
improving the new auto-reconnect mode.
Only disconnect receiver on network change, or when idle after receiving something.
This commit is contained in:
Frank
2023-01-02 20:06:54 +01:00
parent df63ba1dcc
commit d02bdb8a82
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
usermods/audioreactive/audio_reactive.h
View File

@@ -1121,7 +1121,7 @@ class AudioReactive : public Usermod {
if (udpSyncConnected) { if (udpSyncConnected) {
udpSyncConnected = false; udpSyncConnected = false;
fftUdp.stop(); fftUdp.stop();
last_UDPTime = millis(); receivedFormat = 0;
DEBUGSR_PRINTLN(F("AR connectUDPSoundSync(): connection lost, UDP closed.")); DEBUGSR_PRINTLN(F("AR connectUDPSoundSync(): connection lost, UDP closed."));
} }
return; // neither AP nor other connections availeable return; // neither AP nor other connections availeable
@@ -1387,7 +1387,7 @@ class AudioReactive : public Usermod {
if (udpSyncConnected) { // clean-up: if open, close old UDP sync connection if (udpSyncConnected) { // clean-up: if open, close old UDP sync connection
udpSyncConnected = false; udpSyncConnected = false;
fftUdp.stop(); fftUdp.stop();
last_UDPTime = millis(); receivedFormat = 0;
DEBUGSR_PRINTLN(F("AR connected(): old UDP connection closed.")); DEBUGSR_PRINTLN(F("AR connected(): old UDP connection closed."));
} }
@@ -1397,6 +1397,7 @@ class AudioReactive : public Usermod {
#else #else
udpSyncConnected = fftUdp.beginMulticast(WiFi.localIP(), IPAddress(239, 0, 0, 1), audioSyncPort); udpSyncConnected = fftUdp.beginMulticast(WiFi.localIP(), IPAddress(239, 0, 0, 1), audioSyncPort);
#endif #endif
receivedFormat = 0;
if (udpSyncConnected) last_UDPTime = millis(); if (udpSyncConnected) last_UDPTime = millis();
if (apActive && !(WLED_CONNECTED)) { if (apActive && !(WLED_CONNECTED)) {
DEBUGSR_PRINTLN(udpSyncConnected ? F("AR connected(): UDP: connected using AP.") : F("AR connected(): UDP is disconnected (AP).")); DEBUGSR_PRINTLN(udpSyncConnected ? F("AR connected(): UDP: connected using AP.") : F("AR connected(): UDP is disconnected (AP)."));
@@ -1514,13 +1515,16 @@ class AudioReactive : public Usermod {
if (have_new_sample) syncVolumeSmth = volumeSmth; // remember received sample if (have_new_sample) syncVolumeSmth = volumeSmth; // remember received sample
else volumeSmth = syncVolumeSmth; // restore originally received sample for next run of dynamics limiter else volumeSmth = syncVolumeSmth; // restore originally received sample for next run of dynamics limiter
limitSampleDynamics(); // run dynamics limiter on received volumeSmth, to hide jumps and hickups limitSampleDynamics(); // run dynamics limiter on received volumeSmth, to hide jumps and hickups
} else {
receivedFormat = 0;
} }
if ( (audioSyncEnabled & 0x02) // receive mode if ( (audioSyncEnabled & 0x02) // receive mode
&& udpSyncConnected // connected && udpSyncConnected // connected
&& (receivedFormat > 0) // we actually received something in the past
&& ((millis() - last_UDPTime) > 25000)) { // close connection after 25sec idle && ((millis() - last_UDPTime) > 25000)) { // close connection after 25sec idle
udpSyncConnected = false; udpSyncConnected = false;
last_UDPTime = millis(); receivedFormat = 0;
fftUdp.stop(); fftUdp.stop();
volumeSmth =0.0f; volumeSmth =0.0f;
volumeRaw =0; volumeRaw =0;
@@ -1594,6 +1598,7 @@ class AudioReactive : public Usermod {
udpSyncConnected = false; udpSyncConnected = false;
fftUdp.stop(); fftUdp.stop();
DEBUGSR_PRINTLN(F("AR onUpdateBegin(true): UDP connection closed.")); DEBUGSR_PRINTLN(F("AR onUpdateBegin(true): UDP connection closed."));
receivedFormat = 0;
} }
} else { } else {
// update has failed or create task requested // update has failed or create task requested