remove AudioDSP from ServiceBroker and ServiceManager

popcornmix · Mar 28, 2017 · a9aafcd · a9aafcd
1 parent 64b8e7a
commit a9aafcd
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 19 deletions.
diff --git a/xbmc/ServiceBroker.cpp b/xbmc/ServiceBroker.cpp
@@ -48,11 +48,6 @@ PVR::CPVRManager &CServiceBroker::GetPVRManager()
   return g_application.m_ServiceManager->GetPVRManager();
 }
 
-ActiveAE::CActiveAEDSP &CServiceBroker::GetADSP()
-{
-  return g_application.m_ServiceManager->GetADSPManager();
-}
-
 IAE& CServiceBroker::GetActiveAE()
 {
   return g_application.m_ServiceManager->GetActiveAE();

diff --git a/xbmc/ServiceBroker.h b/xbmc/ServiceBroker.h
@@ -68,7 +68,6 @@ class CServiceBroker
   static ANNOUNCEMENT::CAnnouncementManager &GetAnnouncementManager();
   static XBPython &GetXBPython();
   static PVR::CPVRManager &GetPVRManager();
-  static ActiveAE::CActiveAEDSP& GetADSP();
   static IAE& GetActiveAE();
   static CContextMenuManager& GetContextMenuManager();
   static CDataCacheCore& GetDataCacheCore();

diff --git a/xbmc/ServiceManager.cpp b/xbmc/ServiceManager.cpp
@@ -21,7 +21,6 @@
 #include "ServiceManager.h"
 #include "addons/BinaryAddonCache.h"
 #include "ContextMenuManager.h"
-#include "cores/AudioEngine/Engines/ActiveAE/AudioDSPAddons/ActiveAEDSP.h"
 #include "cores/AudioEngine/Engines/ActiveAE/ActiveAE.h"
 #include "cores/DataCacheCore.h"
 #include "games/GameServices.h"
@@ -75,7 +74,6 @@ bool CServiceManager::Init2()
     return false;
   }
 
-  m_ADSPManager.reset(new ActiveAE::CActiveAEDSP());
   m_PVRManager.reset(new PVR::CPVRManager());
   m_dataCacheCore.reset(new CDataCacheCore());
 
@@ -120,7 +118,6 @@ bool CServiceManager::StartAudioEngine()
 bool CServiceManager::Init3()
 {
   m_peripherals->Initialise();
-  m_ADSPManager->Init();
   m_PVRManager->Init();
   m_contextMenuManager->Init();
   m_gameServices->Init();
@@ -138,7 +135,6 @@ void CServiceManager::Deinit()
   if (m_PVRManager)
     m_PVRManager->Deinit();
   m_PVRManager.reset();
-  m_ADSPManager.reset();
   m_addonMgr.reset();
 #ifdef HAS_PYTHON
   CScriptInvocationManager::GetInstance().UnregisterLanguageInvocationHandler(m_XBPython.get());
@@ -175,11 +171,6 @@ PVR::CPVRManager& CServiceManager::GetPVRManager()
   return *m_PVRManager;
 }
 
-ActiveAE::CActiveAEDSP& CServiceManager::GetADSPManager()
-{
-  return *m_ADSPManager;
-}
-
 IAE& CServiceManager::GetActiveAE()
 {
   ActiveAE::CActiveAE& ae = *m_ActiveAE;

diff --git a/xbmc/ServiceManager.h b/xbmc/ServiceManager.h
@@ -30,8 +30,6 @@ class CBinaryAddonCache;
 
 namespace ActiveAE {
 class CActiveAE;
-class CActiveAEDSP;
-class CActiveAE;
 }
 
 namespace ANNOUNCEMENT
@@ -87,7 +85,6 @@ class CServiceManager
   XBPython& GetXBPython();
 #endif
   PVR::CPVRManager& GetPVRManager();
-  ActiveAE::CActiveAEDSP& GetADSPManager();
   IAE& GetActiveAE();
   CContextMenuManager& GetContextMenuManager();
   CDataCacheCore& GetDataCacheCore();
@@ -125,7 +122,6 @@ class CServiceManager
   std::unique_ptr<XBPython> m_XBPython;
 #endif
   std::unique_ptr<PVR::CPVRManager> m_PVRManager;
-  std::unique_ptr<ActiveAE::CActiveAEDSP> m_ADSPManager;
   std::unique_ptr<ActiveAE::CActiveAE, delete_activeAE> m_ActiveAE;
   std::unique_ptr<CContextMenuManager, delete_contextMenuManager> m_contextMenuManager;
   std::unique_ptr<CDataCacheCore, delete_dataCacheCore> m_dataCacheCore;