diff options
| author | ronso0 <ronso0@mixxx.org> | 2021-06-15 17:56:35 +0200 |
|---|---|---|
| committer | ronso0 <ronso0@mixxx.org> | 2021-06-15 18:53:50 +0200 |
| commit | 9415f92a7c8f63e6216fdf559ea398662438fb33 (patch) | |
| tree | 2eb3b8944a7ce31ac1e2dc6874642c69b9c1426d /src/broadcast | |
| parent | 7585ce91606b618ee575a78248a9bf4a4a649046 (diff) | |
Broadcasting: fix wrapping arund pushbutton values
Diffstat (limited to 'src/broadcast')
| -rw-r--r-- | src/broadcast/broadcastmanager.cpp | 4 | ||||
| -rw-r--r-- | src/broadcast/broadcastmanager.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/broadcast/broadcastmanager.cpp b/src/broadcast/broadcastmanager.cpp index 39e4a10847..6fa80519a4 100644 --- a/src/broadcast/broadcastmanager.cpp +++ b/src/broadcast/broadcastmanager.cpp @@ -92,8 +92,7 @@ void BroadcastManager::slotControlEnabled(double v) { // Wrap around manually . // Wrapping around in WPushbutton does not work // since the status button has 4 states, but this CO is bool - m_pBroadcastEnabled->set(0.0); - emit broadcastEnabled(false); + v = 0.0; } if (v > 0.0) { @@ -116,6 +115,7 @@ void BroadcastManager::slotControlEnabled(double v) { slotProfilesChanged(); } else { + m_pBroadcastEnabled->set(false); m_pStatusCO->forceSet(STATUSCO_UNCONNECTED); QList<BroadcastProfilePtr> profiles = m_pBroadcastSettings->profiles(); for(BroadcastProfilePtr profile : profiles) { diff --git a/src/broadcast/broadcastmanager.h b/src/broadcast/broadcastmanager.h index 75479e3bf6..8a68d16efa 100644 --- a/src/broadcast/broadcastmanager.h +++ b/src/broadcast/broadcastmanager.h @@ -15,10 +15,10 @@ class BroadcastManager : public QObject { public: enum StatusCOStates { STATUSCO_UNCONNECTED = 0, // IDLE state, no error - STATUSCO_CONNECTING = 1, // 30 s max - STATUSCO_CONNECTED = 2, // On Air - STATUSCO_FAILURE = 3, // Happens when all connection fails - STATUSCO_WARNING = 4 + STATUSCO_CONNECTING = 1, // 30 s max + STATUSCO_CONNECTED = 2, // On Air + STATUSCO_FAILURE = 3, // Happens when all connection fail + STATUSCO_WARNING = 4 // Happens when at least one but not all fail }; BroadcastManager(SettingsManager* pSettingsManager, |