diff options
author | Stéphane Lepin <stephane.lepin@gmail.com> | 2017-08-04 12:54:16 +0200 |
---|---|---|
committer | Stéphane Lepin <stephane.lepin@gmail.com> | 2017-08-04 12:54:16 +0200 |
commit | 8882d9339b127b978f4b0fabde94ade397f49aa5 (patch) | |
tree | b7611916ed9a46116bb979aa5ecd8760447f1e4e /src/broadcast | |
parent | b89def435531f1066d44c80d9cf2db1e7890bee9 (diff) |
EngineBroadcast back to QSharedPointer
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 aa4f58df15..8a2f0560bf 100644 --- a/src/broadcast/broadcastmanager.cpp +++ b/src/broadcast/broadcastmanager.cpp @@ -13,9 +13,10 @@ BroadcastManager::BroadcastManager(SettingsManager* pSettingsManager, pSoundManager->getNetworkStream(); if (!pNetworkStream.isNull()) { - m_pBroadcast = new EngineBroadcast(m_pConfig, + m_pBroadcast = QSharedPointer<EngineBroadcast>( + new EngineBroadcast(m_pConfig, pSettingsManager->broadcastSettings(), - pNetworkStream->getNumOutputChannels()); + pNetworkStream->getNumOutputChannels())); pNetworkStream->addWorker(m_pBroadcast); } @@ -27,7 +28,6 @@ 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 877865a6f6..6d19ac61f9 100644 --- a/src/broadcast/broadcastmanager.h +++ b/src/broadcast/broadcastmanager.h @@ -32,7 +32,7 @@ class BroadcastManager : public QObject { private: UserSettingsPointer m_pConfig; - EngineBroadcast* m_pBroadcast; + QSharedPointer<EngineBroadcast> m_pBroadcast; ControlProxy* m_pBroadcastEnabled; }; |