changed: always expand iso images in music window

xbmc · Apr 24, 2017 · d71fb96 · d71fb96
1 parent c5eb848
commit d71fb96
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/xbmc/filesystem/Directory.cpp b/xbmc/filesystem/Directory.cpp
@@ -373,12 +373,13 @@ bool CDirectory::RemoveRecursive(const CURL& url)
   return false;
 }
 
-void CDirectory::FilterFileDirectories(CFileItemList &items, const std::string &mask)
+void CDirectory::FilterFileDirectories(CFileItemList &items, const std::string &mask,
+                                       bool always)
 {
   for (int i=0; i< items.Size(); ++i)
   {
     CFileItemPtr pItem=items[i];
-    if (!pItem->m_bIsFolder && pItem->IsFileFolder(EFILEFOLDER_TYPE_ALWAYS))
+    if (!pItem->m_bIsFolder && pItem->IsFileFolder(always?EFILEFOLDER_TYPE_ALWAYS : EFILEFOLDER_TYPE_ONBROWSE))
     {
       std::unique_ptr<IFileDirectory> pDirectory(CFileDirectoryFactory::Create(pItem->GetURL(),pItem.get(),mask));
       if (pDirectory.get())

diff --git a/xbmc/filesystem/Directory.h b/xbmc/filesystem/Directory.h
@@ -79,6 +79,6 @@ class CDirectory
   /*! \brief Filter files that act like directories from the list, replacing them with their directory counterparts
    \param items The item list to filter
    \param mask  The mask to apply when filtering files */
-  static void FilterFileDirectories(CFileItemList &items, const std::string &mask);
+  static void FilterFileDirectories(CFileItemList &items, const std::string &mask, bool always=true);
 };
 }
diff --git a/xbmc/music/windows/GUIWindowMusicBase.cpp b/xbmc/music/windows/GUIWindowMusicBase.cpp
@@ -36,6 +36,7 @@
 #include "GUIPassword.h"
 #include "PartyModeManager.h"
 #include "GUIInfoManager.h"
+#include "filesystem/Directory.h"
 #include "filesystem/MusicDatabaseDirectory.h"
 #include "music/dialogs/GUIDialogSongInfo.h"
 #include "addons/GUIDialogAddonInfo.h"
@@ -1233,6 +1234,9 @@ bool CGUIWindowMusicBase::GetDirectory(const std::string &strDirectory, CFileIte
   bool bResult = CGUIMediaWindow::GetDirectory(strDirectory, items);
   if (bResult)
   {
+    // We always want to expand disc images in music windows.
+    CDirectory::FilterFileDirectories(items, ".iso", false);
+
     CMusicThumbLoader loader;
     loader.FillThumb(items);