fixed: CFileItem::IsPlayList should check mimetype if available aswell

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@30653 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
opdenkamp · May 28, 2010 · 2f22b97 · 2f22b97
1 parent 390dede
commit 2f22b97
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/xbmc/FileItem.cpp b/xbmc/FileItem.cpp
@@ -612,7 +612,7 @@ bool CFileItem::IsSmartPlayList() const
 
 bool CFileItem::IsPlayList() const
 {
-  return CPlayListFactory::IsPlaylist(m_strPath);
+  return CPlayListFactory::IsPlaylist(*this);
 }
 
 bool CFileItem::IsPythonScript() const

diff --git a/xbmc/PlayListFactory.cpp b/xbmc/PlayListFactory.cpp
@@ -101,6 +101,31 @@ CPlayList* CPlayListFactory::Create(const CFileItem& item)
 
 }
 
+bool CPlayListFactory::IsPlaylist(const CFileItem& item)
+{
+  CStdString strMimeType = item.GetMimeType();
+  strMimeType.ToLower();
+
+/* These are abit uncertain 
+  if(strMimeType == "video/x-ms-asf"
+  || strMimeType == "video/x-ms-asx"
+  || strMimeType == "video/x-ms-wmv"
+  || strMimeType == "video/x-ms-wma"
+  || strMimeType == "video/x-ms-wfs"
+  || strMimeType == "video/x-ms-wvx"
+  || strMimeType == "video/x-ms-wax"
+  || strMimeType == "video/x-ms-asf")
+    return true;
+*/
+
+  if(strMimeType == "audio/x-pn-realaudio"
+  || strMimeType == "playlist"
+  || strMimeType == "audio/x-mpegurl")
+    return true;
+
+  return IsPlaylist(item.m_strPath);
+}
+
 bool CPlayListFactory::IsPlaylist(const CStdString& filename)
 {
   CStdString extension = CUtil::GetExtension(filename);

diff --git a/xbmc/PlayListFactory.h b/xbmc/PlayListFactory.h
@@ -34,5 +34,6 @@ namespace PLAYLIST
     static CPlayList* Create(const CStdString& filename);
     static CPlayList* Create(const CFileItem& item);
     static bool IsPlaylist(const CStdString& filename);
+    static bool IsPlaylist(const CFileItem& item);
   };
 }