[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/kmplayer/src
From:       Koos Vriezen <koos.vriezen () gmail ! com>
Date:       2011-10-10 20:45:00
Message-ID: 20111010204500.6432AAC888 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1258261 by vriezen:

Try harder to get the media type for small local files

 M  +8 -5      mediaobject.cpp  


--- trunk/extragear/multimedia/kmplayer/src/mediaobject.cpp #1258260:1258261
@@ -429,7 +429,8 @@
     Mrl *mrl = node->mrl ();
     if (mrl && (MediaManager::Any == type || MediaManager::AudioVideo == type))
     {
-        mime = mrl->mimetype;
+        if (!mrl->mimetype.isEmpty ())
+            setMimetype (mrl->mimetype);
         if (mrl && (MediaManager::Any == type || MediaManager::AudioVideo == type))
             if (mime == "application/x-shockwave-flash" ||
                     mime == "application/futuresplash" ||
@@ -454,7 +455,9 @@
 
     bool only_playlist = false;
     bool maybe_playlist = false;
-    if (MediaManager::Audio == type || MediaManager::AudioVideo == type) {
+    if (MediaManager::Audio == type
+            || MediaManager::AudioVideo == type
+            || MediaManager::Any == type) {
         only_playlist = true;
         maybe_playlist = isPlayListMime (mime);
     }
@@ -467,14 +470,14 @@
                 if (mrl && mimeptr) {
                     mrl->mimetype = mimeptr->name ();
                     setMimetype (mrl->mimetype);
-                    only_playlist = MediaManager::Audio == type ||
-                        MediaManager::AudioVideo == type;
-                    maybe_playlist = isPlayListMime (mime); // get new mime
                 }
                 kDebug () << "wget2 " << str << " " << mime;
             } else {
                 setMimetype (mime);
             }
+            only_playlist = MediaManager::Audio == type ||
+                MediaManager::AudioVideo == type;
+            maybe_playlist = isPlayListMime (mime); // get new mime
             if (file.open (IO_ReadOnly)) {
                 if (only_playlist) {
                     maybe_playlist &= file.size () < 2000000;
[prev in list] [next in list] [prev in thread] [next in thread]