BroadcastSettings: make sure only one instance exists

2 files changed, 6 insertions, 4 deletions

diff --git a/src/broadcast/broadcastmanager.cpp b/src/broadcast/broadcastmanager.cpp
index 0e328e2eeb..7ac64a3b6a 100644
--- a/src/broadcast/broadcastmanager.cpp
+++ b/src/broadcast/broadcastmanager.cpp
@@ -6,14 +6,15 @@
 #include "engine/sidechain/enginesidechain.h"
 #include "soundio/soundmanager.h"
 
-BroadcastManager::BroadcastManager(UserSettingsPointer pConfig,
+BroadcastManager::BroadcastManager(SettingsManagerPointer pSettingsManager,
                                    SoundManager* pSoundManager)
-        : m_pConfig(pConfig) {
+        : m_pConfig(pSettingsManager->settings()) {
     QSharedPointer<EngineNetworkStream> pNetworkStream =
             pSoundManager->getNetworkStream();
     if (!pNetworkStream.isNull()) {
         m_pBroadcast = QSharedPointer<EngineBroadcast>(
-                new EngineBroadcast(pConfig));
+                new EngineBroadcast(m_pConfig,
+                                    pSettingsManager->broadcastSettings()));
         pNetworkStream->addWorker(m_pBroadcast);
     }
     m_pBroadcastEnabled = new ControlProxy(
diff --git a/src/broadcast/broadcastmanager.h b/src/broadcast/broadcastmanager.h
index 092e11f03f..46edcb6bec 100644
--- a/src/broadcast/broadcastmanager.h
+++ b/src/broadcast/broadcastmanager.h
@@ -4,6 +4,7 @@
 #include <QObject>
 
 #include "engine/sidechain/enginebroadcast.h"
+#include "preferences/settingsmanager.h"
 #include "preferences/usersettings.h"
 
 class SoundManager;
@@ -11,7 +12,7 @@ class SoundManager;
 class BroadcastManager : public QObject {
     Q_OBJECT
   public:
-    BroadcastManager(UserSettingsPointer pConfig,
+    BroadcastManager(SettingsManagerPointer pSettingsManager,
                      SoundManager* pSoundManager);
     virtual ~BroadcastManager();