diff options
| author | ametovic <ametovic@svn> | 2010-04-29 21:39:30 +0000 |
|---|---|---|
| committer | ametovic <ametovic@svn> | 2010-04-29 21:39:30 +0000 |
| commit | bdf6ce6d384b8bb9739c698491a1a730ee34b1c2 (patch) | |
| tree | 1aac593838062f80af6a2bf35e8e7acf1c77c371 /guilib/GUIAudioManager.cpp | |
| parent | 52b75145e7e5ef8f9bf4da64455fcd573b905745 (diff) | |
fixed: navigation sounds broken due to the skins moving to addons
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@29674 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib/GUIAudioManager.cpp')
| -rw-r--r-- | guilib/GUIAudioManager.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/guilib/GUIAudioManager.cpp b/guilib/GUIAudioManager.cpp index f5ec711afb..7c9768dc93 100644 --- a/guilib/GUIAudioManager.cpp +++ b/guilib/GUIAudioManager.cpp @@ -30,6 +30,7 @@ #include "../xbmc/Util.h" #include "../xbmc/FileSystem/Directory.h" #include "tinyXML/tinyxml.h" +#include "addons/Skin.h" #ifdef HAS_SDL_AUDIO #include <SDL/SDL_mixer.h> #endif @@ -295,12 +296,7 @@ bool CGUIAudioManager::Load() if (g_guiSettings.GetString("lookandfeel.soundskin")=="SKINDEFAULT") { - m_strMediaDir="special://home/skin/" + g_guiSettings.GetString("lookandfeel.skin") + "/sounds"; - if ( ! CDirectory::Exists( m_strMediaDir ) ) - { - m_strMediaDir = CUtil::AddFileToFolder("special://xbmc/skin", g_guiSettings.GetString("lookandfeel.skin")); - m_strMediaDir = CUtil::AddFileToFolder(m_strMediaDir, "sounds"); - } + m_strMediaDir = CUtil::AddFileToFolder(g_SkinInfo->Path(), "sounds"); } else m_strMediaDir = CUtil::AddFileToFolder("special://xbmc/sounds", g_guiSettings.GetString("lookandfeel.soundskin")); |