diff options
author | Stéphane Lepin <stephane.lepin@gmail.com> | 2017-08-04 12:29:43 +0200 |
---|---|---|
committer | Stéphane Lepin <stephane.lepin@gmail.com> | 2017-08-04 12:29:43 +0200 |
commit | accdb0c6d50279c48cd8013f91eb93a5bef04d72 (patch) | |
tree | aa46a3956640cb93fa814616ccfed84c78e0300b /src/broadcast | |
parent | 9557e7de8f4a87efd912ad2b86a925d05a26fd30 (diff) |
Refactor EngineBroadcast as a simple pointer
Diffstat (limited to 'src/broadcast')
-rw-r--r-- | src/broadcast/broadcastmanager.cpp | 6 | ||||
-rw-r--r-- | src/broadcast/broadcastmanager.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/broadcast/broadcastmanager.cpp b/src/broadcast/broadcastmanager.cpp index 3a24fa7a23..366da4446a 100644 --- a/src/broadcast/broadcastmanager.cpp +++ b/src/broadcast/broadcastmanager.cpp @@ -13,10 +13,9 @@ BroadcastManager::BroadcastManager(SettingsManager* pSettingsManager, pSoundManager->getNetworkStream(); if (!pNetworkStream.isNull()) { - m_pBroadcast = QSharedPointer<EngineBroadcast>( - new EngineBroadcast(m_pConfig, + m_pBroadcast = new EngineBroadcast(m_pConfig, pSettingsManager->broadcastSettings(), - pNetworkStream)); + pNetworkStream); pNetworkStream->addWorker(m_pBroadcast); } @@ -28,6 +27,7 @@ BroadcastManager::BroadcastManager(SettingsManager* pSettingsManager, BroadcastManager::~BroadcastManager() { // Disable broadcast so when Mixxx starts again it will not connect. m_pBroadcastEnabled->set(0); + delete m_pBroadcast; } void BroadcastManager::setEnabled(bool value) { diff --git a/src/broadcast/broadcastmanager.h b/src/broadcast/broadcastmanager.h index 6d19ac61f9..877865a6f6 100644 --- a/src/broadcast/broadcastmanager.h +++ b/src/broadcast/broadcastmanager.h @@ -32,7 +32,7 @@ class BroadcastManager : public QObject { private: UserSettingsPointer m_pConfig; - QSharedPointer<EngineBroadcast> m_pBroadcast; + EngineBroadcast* m_pBroadcast; ControlProxy* m_pBroadcastEnabled; }; |