changed: refactored CFileItemList::Stack() into StackFiles and StackF…

…olders - Stack() now takes a bool to specify wether we want to stack all or just collapse folders (defaults to true)

xbmc/FileItem.cpp

@@ -1985,7 +1985,7 @@ void CFileItemList::RemoveExtensions()
     m_items[i]->RemoveExtension();
 }
 
-void CFileItemList::Stack()
+void CFileItemList::Stack(bool stackFiles /* = true */)
 {
   CSingleLock lock(m_lock);
 
@@ -1998,6 +1998,14 @@ void CFileItemList::Stack()
   // items needs to be sorted for stuff below to work properly
   Sort(SORT_METHOD_LABEL, SORT_ORDER_ASC);
 
+  if (stackFiles)
+    StackFiles();
+
+  StackFolders();
+}
+
+void CFileItemList::StackFolders()
+{
   // Precompile our REs
   VECCREGEXP folderRegExps;
   CRegExp folderRegExp(true);
@@ -2126,7 +2134,10 @@ void CFileItemList::Stack()
       }
     }
   }
+}
 
+void CFileItemList::StackFiles()
+{
   // Precompile our REs
   VECCREGEXP stackRegExps;
   CRegExp tmpRegExp(true);
@@ -2145,7 +2156,7 @@ void CFileItemList::Stack()
   }
 
   // now stack the files, some of which may be from the previous stack iteration
-  i = 0;
+  int i = 0;
   while (i < Size())
   {
     CFileItemPtr item1 = Get(i);

xbmc/FileItem.h

@@ -399,7 +399,14 @@ class CFileItemList : public CFileItem
   void SetFastLookup(bool fastLookup);
   bool Contains(const CStdString& fileName) const;
   bool GetFastLookup() const { return m_fastLookup; };
-  void Stack();
+
+  /*! \brief stack a CFileItemList
+   By default we stack all items (files and folders) in a CFileItemList
+   \param stackFiles whether to stack all items or just collapse folders (defaults to true)
+   \sa StackFiles,StackFolders
+   */
+  void Stack(bool stackFiles = true);
+
   SORT_ORDER GetSortOrder() const { return m_sortOrder; }
   SORT_METHOD GetSortMethod() const { return m_sortMethod; }
   /*! \brief load a CFileItemList out of the cache
@@ -473,6 +480,18 @@ class CFileItemList : public CFileItem
   void FillSortFields(FILEITEMFILLFUNC func);
   CStdString GetDiscCacheFile(int windowID) const;
 
+  /*!
+   \brief stack files in a CFileItemList
+   \sa Stack
+   */
+  void StackFiles();
+
+  /*!
+   \brief stack folders in a CFileItemList
+   \sa Stack
+   */
+  void StackFolders();
+
   VECFILEITEMS m_items;
   MAPFILEITEMS m_map;
   bool m_fastLookup;