changed: make the music extension member in AdvancedSettings private

adds an accessor and use this instead.
mkortstiege · Mar 3, 2015 · efc8522 · efc8522
1 parent b2db871
commit efc8522
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 15 deletions.
diff --git a/xbmc/FileItem.cpp b/xbmc/FileItem.cpp
@@ -782,7 +782,7 @@ bool CFileItem::IsAudio() const
      return true;
   }
 
-  return URIUtils::HasExtension(m_strPath, g_advancedSettings.m_musicExtensions);
+  return URIUtils::HasExtension(m_strPath, g_advancedSettings.GetMusicExtensions());
 }
 
 bool CFileItem::IsKaraoke() const
@@ -2236,7 +2236,7 @@ void CFileItemList::FilterCueItems()
                 }
                 else
                 { // try replacing the extension with one of our allowed ones.
-                  vector<string> extensions = StringUtils::Split(g_advancedSettings.m_musicExtensions, "|");
+                  vector<string> extensions = StringUtils::Split(g_advancedSettings.GetMusicExtensions(), "|");
                   for (vector<string>::const_iterator i = extensions.begin(); i != extensions.end(); ++i)
                   {
                     strMediaFile = URIUtils::ReplaceExtension(pItem->GetPath(), *i);

diff --git a/xbmc/addons/GUIDialogAddonSettings.cpp b/xbmc/addons/GUIDialogAddonSettings.cpp
@@ -393,7 +393,7 @@ bool CGUIDialogAddonSettings::ShowVirtualKeyboard(int iControl)
             {
               strMask = setting->Attribute("mask");
               // convert mask qualifiers
-              StringUtils::Replace(strMask, "$AUDIO", g_advancedSettings.m_musicExtensions);
+              StringUtils::Replace(strMask, "$AUDIO", g_advancedSettings.GetMusicExtensions());
               StringUtils::Replace(strMask, "$VIDEO", g_advancedSettings.m_videoExtensions);
               StringUtils::Replace(strMask, "$IMAGE", g_advancedSettings.m_pictureExtensions);
 #if defined(_WIN32_WINNT)
@@ -407,7 +407,7 @@ bool CGUIDialogAddonSettings::ShowVirtualKeyboard(int iControl)
               if (type == "video")
                 strMask = g_advancedSettings.m_videoExtensions;
               else if (type == "audio")
-                strMask = g_advancedSettings.m_musicExtensions;
+                strMask = g_advancedSettings.GetMusicExtensions();
               else if (type == "executable")
 #if defined(_WIN32_WINNT)
                 strMask = ".exe|.bat|.cmd|.py";

diff --git a/xbmc/filesystem/RSSDirectory.cpp b/xbmc/filesystem/RSSDirectory.cpp
@@ -91,7 +91,7 @@ static bool IsPathToMedia(const std::string& strPath )
 {
   return URIUtils::HasExtension(strPath,
                               g_advancedSettings.m_videoExtensions + '|' +
-                              g_advancedSettings.m_musicExtensions + '|' +
+                              g_advancedSettings.GetMusicExtensions() + '|' +
                               g_advancedSettings.m_pictureExtensions);
 }
 

diff --git a/xbmc/interfaces/Builtins.cpp b/xbmc/interfaces/Builtins.cpp
@@ -749,7 +749,7 @@ int CBuiltins::Execute(const std::string& execString)
     if (item.m_bIsFolder)
     {
       CFileItemList items;
-      std::string extensions = g_advancedSettings.m_videoExtensions + "|" + g_advancedSettings.m_musicExtensions;
+      std::string extensions = g_advancedSettings.m_videoExtensions + "|" + g_advancedSettings.GetMusicExtensions();
       CDirectory::GetDirectory(item.GetPath(),items,extensions);
 
       bool containsMusic = false, containsVideo = false;

diff --git a/xbmc/interfaces/json-rpc/FileOperations.cpp b/xbmc/interfaces/json-rpc/FileOperations.cpp
@@ -93,7 +93,7 @@ JSONRPC_STATUS CFileOperations::GetDirectory(const std::string &method, ITranspo
   else if (media == "music")
   {
     regexps = g_advancedSettings.m_audioExcludeFromListingRegExps;
-    extensions = g_advancedSettings.m_musicExtensions;
+    extensions = g_advancedSettings.GetMusicExtensions();
   }
   else if (media == "pictures")
   {
@@ -310,7 +310,7 @@ bool CFileOperations::FillFileItemList(const CVariant &parameterObject, CFileIte
       else if (media == "music")
       {
         regexps = g_advancedSettings.m_audioExcludeFromListingRegExps;
-        extensions = g_advancedSettings.m_musicExtensions;
+        extensions = g_advancedSettings.GetMusicExtensions();
       }
       else if (media == "pictures")
       {

diff --git a/xbmc/interfaces/legacy/ModuleXbmc.cpp b/xbmc/interfaces/legacy/ModuleXbmc.cpp
@@ -453,7 +453,7 @@ namespace XBMCAddon
       if (strcmpi(mediaType, "video") == 0)
         result = g_advancedSettings.m_videoExtensions;
       else if (strcmpi(mediaType, "music") == 0)
-        result = g_advancedSettings.m_musicExtensions;
+        result = g_advancedSettings.GetMusicExtensions();
       else if (strcmpi(mediaType, "picture") == 0)
         result = g_advancedSettings.m_pictureExtensions;
 

diff --git a/xbmc/music/GUIViewStateMusic.cpp b/xbmc/music/GUIViewStateMusic.cpp
@@ -57,7 +57,7 @@ std::string CGUIViewStateWindowMusic::GetLockType()
 
 std::string CGUIViewStateWindowMusic::GetExtensions()
 {
-  return g_advancedSettings.m_musicExtensions;
+  return g_advancedSettings.GetMusicExtensions();
 }
 
 VECSOURCES& CGUIViewStateWindowMusic::GetSources()

diff --git a/xbmc/music/infoscanner/MusicInfoScanner.cpp b/xbmc/music/infoscanner/MusicInfoScanner.cpp
@@ -444,7 +444,7 @@ bool CMusicInfoScanner::DoScan(const std::string& strDirectory)
 
   // load subfolder
   CFileItemList items;
-  CDirectory::GetDirectory(strDirectory, items, g_advancedSettings.m_musicExtensions + "|.jpg|.tbn|.lrc|.cdg");
+  CDirectory::GetDirectory(strDirectory, items, g_advancedSettings.GetMusicExtensions() + "|.jpg|.tbn|.lrc|.cdg");
 
   // sort and get the path hash.  Note that we don't filter .cue sheet items here as we want
   // to detect changes in the .cue sheet as well.  The .cue sheet items only need filtering
@@ -1487,7 +1487,7 @@ int CMusicInfoScanner::CountFilesRecursively(const std::string& strPath)
 {
   // load subfolder
   CFileItemList items;
-  CDirectory::GetDirectory(strPath, items, g_advancedSettings.m_musicExtensions, DIR_FLAG_NO_FILE_DIRS);
+  CDirectory::GetDirectory(strPath, items, g_advancedSettings.GetMusicExtensions(), DIR_FLAG_NO_FILE_DIRS);
 
   if (m_bStop)
     return 0;

diff --git a/xbmc/network/upnp/UPnPServer.cpp b/xbmc/network/upnp/UPnPServer.cpp
@@ -677,7 +677,7 @@ CUPnPServer::OnBrowseDirectChildren(PLT_ActionReference&          action,
             // request came from
             string supported = g_advancedSettings.m_pictureExtensions + "|"
                              + g_advancedSettings.m_videoExtensions + "|"
-                             + g_advancedSettings.m_musicExtensions + "|"
+                             + g_advancedSettings.GetMusicExtensions() + "|"
                              + g_advancedSettings.m_discStubExtensions;
             CDirectory::GetDirectory((const char*)parent_id, items, supported);
             DefaultSortItems(items);

diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp
@@ -1408,3 +1408,8 @@ void CAdvancedSettings::setExtraLogLevel(const std::vector<CVariant> &components
     m_extraLogLevels |= static_cast<int>(it->asInteger());
   }
 }
+
+std::string CAdvancedSettings::GetMusicExtensions() const
+{
+  return m_musicExtensions;
+}
diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h
@@ -391,11 +391,13 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler
     float GetDisplayLatency(float refreshrate);
     bool m_initialized;
 
+    //! \brief Returns a list of music extension for filtering in the GUI
+    std::string GetMusicExtensions() const;
+
     void SetDebugMode(bool debug);
 
     // runtime settings which cannot be set from advancedsettings.xml
     std::string m_pictureExtensions;
-    std::string m_musicExtensions;
     std::string m_videoExtensions;
     std::string m_discStubExtensions;
     std::string m_subtitlesExtensions;
@@ -409,6 +411,7 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler
     std::string m_userAgent;
 
   private:
+    std::string m_musicExtensions;
     void setExtraLogLevel(const std::vector<CVariant> &components);
 };
 

diff --git a/xbmc/utils/URIUtils.cpp b/xbmc/utils/URIUtils.cpp
@@ -139,7 +139,7 @@ void URIUtils::RemoveExtension(std::string& strFileName)
 
     std::string strFileMask;
     strFileMask = g_advancedSettings.m_pictureExtensions;
-    strFileMask += "|" + g_advancedSettings.m_musicExtensions;
+    strFileMask += "|" + g_advancedSettings.GetMusicExtensions();
     strFileMask += "|" + g_advancedSettings.m_videoExtensions;
     strFileMask += "|" + g_advancedSettings.m_subtitlesExtensions;
 #if defined(TARGET_DARWIN)