Anonymous

diff --git a/guilib/AudioContext.cpp b/guilib/AudioContext.cppindex b3efdf8..5fd5cf7 100644--- a/guilib/AudioContext.cpp+++ b/guilib/AudioContext.cpp@@ -22,7 +22,6 @@ #include "system.h" #include "AudioContext.h" #include "GUIAudioManager.h"-#include "IAudioDeviceChangedCallback.h" #include "Settings.h" #include "GUISettings.h" #include "XBAudioConfig.h"@@ -70,7 +69,6 @@ CAudioContext::~CAudioContext() }  // \brief Create a new device by type (DEFAULT_DEVICE, DIRECTSOUND_DEVICE, AC97_DEVICE)-// Note: DEFAULT_DEVICE is created by the IAudioDeviceChangedCallback void CAudioContext::SetActiveDevice(int iDevice) {   /* if device is the same, no need to bother */diff --git a/guilib/AudioContext.h b/guilib/AudioContext.hindex efa62f0..12c79cc 100644--- a/guilib/AudioContext.h+++ b/guilib/AudioContext.h@@ -28,9 +28,6 @@  #include "StdString.h" -// forward definitions-class IAudioDeviceChangedCallback;- #define DSMIXBINTYPE_STANDARD 1 #define DSMIXBINTYPE_DMO 2 #define DSMIXBINTYPE_AAC 3diff --git a/guilib/GUIAudioManager.cpp b/guilib/GUIAudioManager.cppindex 0db33e1..8be427e 100644--- a/guilib/GUIAudioManager.cpp+++ b/guilib/GUIAudioManager.cpp@@ -43,7 +43,6 @@ CGUIAudioManager::CGUIAudioManager() {   m_bInitialized = false;   m_actionSound=NULL;-  m_bEnabled=true; }  CGUIAudioManager::~CGUIAudioManager()@@ -53,7 +52,7 @@ CGUIAudioManager::~CGUIAudioManager()  void CGUIAudioManager::Initialize(int iDevice) {-  if (m_bInitialized || !m_bEnabled)+  if (m_bInitialized)     return;    if (g_guiSettings.GetString("lookandfeel.soundskin")=="OFF")@@ -170,7 +169,7 @@ void CGUIAudioManager::FreeUnused() void CGUIAudioManager::PlayActionSound(const CAction& action) {   // it's not possible to play gui sounds when passthrough is active-  if (!m_bInitialized || !m_bEnabled || g_audioContext.IsPassthroughActive())+  if (!m_bInitialized || g_audioContext.IsPassthroughActive())     return;    CSingleLock lock(m_cs);@@ -201,7 +200,7 @@ void CGUIAudioManager::PlayActionSound(const CAction& action) void CGUIAudioManager::PlayWindowSound(int id, WINDOW_SOUND event) {   // it's not possible to play gui sounds when passthrough is active-  if (!m_bInitialized || !m_bEnabled || g_audioContext.IsPassthroughActive())+  if (!m_bInitialized || g_audioContext.IsPassthroughActive())     return;    CSingleLock lock(m_cs);@@ -251,7 +250,7 @@ void CGUIAudioManager::PlayWindowSound(int id, WINDOW_SOUND event) void CGUIAudioManager::PlayPythonSound(const CStdString& strFileName) {   // it's not possible to play gui sounds when passthrough is active-  if (!m_bInitialized || !m_bEnabled || g_audioContext.IsPassthroughActive())+  if (!m_bInitialized || g_audioContext.IsPassthroughActive())     return;    CSingleLock lock(m_cs);@@ -289,10 +288,10 @@ bool CGUIAudioManager::Load()   m_actionSoundMap.clear();   m_windowSoundMap.clear(); -  Enable(m_bEnabled); // make sure we initialize or deinitialize-   if (g_guiSettings.GetString("lookandfeel.soundskin")=="OFF")     return true;+  else+    Enable(true);    if (g_guiSettings.GetString("lookandfeel.soundskin")=="SKINDEFAULT")   {@@ -409,12 +408,10 @@ void CGUIAudioManager::Enable(bool bEnable)   if (g_guiSettings.GetString("lookandfeel.soundskin")=="OFF")     bEnable = false; -  if (bEnable && !m_bInitialized)+  if (bEnable)     Initialize(CAudioContext::DEFAULT_DEVICE);-  else if (!bEnable && m_bInitialized)+  else     DeInitialize(CAudioContext::DEFAULT_DEVICE);--  m_bEnabled=bEnable; }  // \brief Sets the volume of all playing soundsdiff --git a/guilib/GUIAudioManager.h b/guilib/GUIAudioManager.hindex a31573c..ef73abc 100644--- a/guilib/GUIAudioManager.h+++ b/guilib/GUIAudioManager.h@@ -21,7 +21,6 @@  *  */ -#include "IAudioDeviceChangedCallback.h" #include "utils/CriticalSection.h" #include "utils/log.h" #include "StdString.h"@@ -35,7 +34,7 @@ class TiXmlNode;  enum WINDOW_SOUND { SOUND_INIT = 0, SOUND_DEINIT }; -class CGUIAudioManager : public IAudioDeviceChangedCallback+class CGUIAudioManager {   class CWindowSounds   {@@ -46,10 +45,10 @@ class CGUIAudioManager : public IAudioDeviceChangedCallback  public:   CGUIAudioManager();-  virtual ~CGUIAudioManager();+          ~CGUIAudioManager(); -  virtual void        Initialize(int iDevice);-  virtual void        DeInitialize(int iDevice);+          void        Initialize(int iDevice);+          void        DeInitialize(int iDevice);            bool        Load(); diff --git a/xbmc/Application.cpp b/xbmc/Application.cppindex 7d978ca..a7d3c1e 100644--- a/xbmc/Application.cpp+++ b/xbmc/Application.cpp@@ -1773,7 +1773,7 @@ void CApplication::LoadSkin(const CStdString& strSkin)   g_windowManager.AddMsgTarget(&g_fontManager);   g_windowManager.SetCallback(*this);   g_windowManager.Initialize();-  g_audioManager.Initialize(CAudioContext::DEFAULT_DEVICE);+  g_audioManager.Enable(true);   g_audioManager.Load();    CGUIDialogFullScreenInfo* pDialog = NULL;@@ -1814,7 +1814,7 @@ void CApplication::LoadSkin(const CStdString& strSkin) void CApplication::UnloadSkin() {   g_ApplicationRenderer.Stop();-  g_audioManager.DeInitialize(CAudioContext::DEFAULT_DEVICE);+  g_audioManager.Enable(false);    g_windowManager.DeInitialize();