changed: if mimetype is set that is a more sure type than any video/audio/picture tags

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@33284 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

1 files changed, 11 insertions, 11 deletions

diff --git a/xbmc/FileItem.cpp b/xbmc/FileItem.cpp
index 4577aae7af..05c05a24df 100644
--- a/xbmc/FileItem.cpp
+++ b/xbmc/FileItem.cpp
@@ -456,14 +456,14 @@ bool CFileItem::Exists(bool bUseCache /* = true */) const
 

 bool CFileItem::IsVideo() const

 {

-  if (HasVideoInfoTag()) return true;

-  if (HasMusicInfoTag()) return false;

-  if (HasPictureInfoTag()) return false;

-

   /* check preset mime type */

   if( m_mimetype.Left(6).Equals("video/") )

     return true;

 

+  if (HasVideoInfoTag()) return true;

+  if (HasMusicInfoTag()) return false;

+  if (HasPictureInfoTag()) return false;

+

   if (IsHDHomeRun() || IsTuxBox() || CUtil::IsDVD(m_strPath))

     return true;

 

@@ -492,16 +492,16 @@ bool CFileItem::IsVideo() const
 

 bool CFileItem::IsAudio() const

 {

+  /* check preset mime type */

+  if( m_mimetype.Left(6).Equals("audio/") )

+    return true;

+

   if (HasMusicInfoTag()) return true;

   if (HasVideoInfoTag()) return false;

   if (HasPictureInfoTag()) return false;

   if (IsCDDA()) return true;

   if (!m_bIsFolder && IsLastFM()) return true;

 

-  /* check preset mime type */

-  if( m_mimetype.Left(6).Equals("audio/") )

-    return true;

-

   CStdString extension;

   if( m_mimetype.Left(12).Equals("application/") )

   { /* check for some standard types */

@@ -534,13 +534,13 @@ bool CFileItem::IsKaraoke() const
 

 bool CFileItem::IsPicture() const

 {

+  if( m_mimetype.Left(6).Equals("image/") )

+    return true;

+

   if (HasPictureInfoTag()) return true;

   if (HasMusicInfoTag()) return false;

   if (HasVideoInfoTag()) return false;

 

-  if( m_mimetype.Left(6).Equals("image/") )

-    return true;

-

   return CUtil::IsPicture(m_strPath);

 }