[SCM] bangarang packaging branch, master, updated. debian/1.0.1-1-31-g7831eb2

[Ryan Kavanagh]

The following commit has been merged in the master branch:
commit 1fa4a047cb39744e16f11ec8593ac6b9acf4285e
Author: Ryan Kavanagh <ryanakca at kubuntu.org>
Date:   Tue Jul 5 10:48:06 2011 -0400

    Avoid QFSFileEngine::open warnings
---
 debian/patches/02_QFSFileEngine_open.diff |  101 +++++++++++++++++++++++++++++
 debian/patches/series                     |    1 +
 2 files changed, 102 insertions(+), 0 deletions(-)

diff --git a/debian/patches/02_QFSFileEngine_open.diff b/debian/patches/02_QFSFileEngine_open.diff
new file mode 100644
index 0000000..e230330
--- /dev/null
+++ b/debian/patches/02_QFSFileEngine_open.diff
@@ -0,0 +1,101 @@
+Description: Avoid QFSFileEngine::open warnings
+Author: Andrew Lake <jamboarder at gmail.com>
+Origin: upstream
+Reviewed-By: Ryan Kavanagh <ryanakca at kubuntu.org>
+Last-Update: 2011-07-05
+Index: bangarang/src/platform/utilities/typechecks.cpp
+===================================================================
+--- bangarang.orig/src/platform/utilities/typechecks.cpp	2011-07-05 10:45:10.526350750 -0400
++++ bangarang/src/platform/utilities/typechecks.cpp	2011-07-05 10:46:15.766674268 -0400
+@@ -26,9 +26,12 @@
+ 
+ bool Utilities::isMusic(const QString &url)
+ {
+-    KMimeType::Ptr result = KMimeType::findByUrl(KUrl(url), 0, true);
+-
+-    return isMusicMimeType(result);
++    if (!url.isEmpty()) {
++        KMimeType::Ptr result = KMimeType::findByUrl(KUrl(url), 0, true);
++        return isMusicMimeType(result);
++    } else {
++        return false;
++    }
+ }
+ 
+ bool Utilities::isMusicMimeType(KMimeType::Ptr type)
+@@ -53,8 +56,12 @@
+ 
+ bool Utilities::isAudio(const QString &url)
+ {
+-    KMimeType::Ptr result = KMimeType::findByUrl(KUrl(url), 0, true);
+-    return isAudioMimeType(result);
++    if (!url.isEmpty()) {
++        KMimeType::Ptr result = KMimeType::findByUrl(KUrl(url), 0, true);
++        return isAudioMimeType(result);
++    } else {
++        return false;
++    }
+ }
+ 
+ bool Utilities::isAudioMimeType(KMimeType::Ptr type)
+@@ -88,17 +95,19 @@
+ 
+ bool Utilities::isVideo(const QString &url)
+ {
+-    KMimeType::Ptr result = KMimeType::findByUrl(KUrl(url), 0, true);
+-
+-    //NOTE: Special handling for .wma extensions
+-    //It turns out that wma files may pass the "video/x-ms-asf" mimetype test.
+-    //Per Microsoft KB284094, the only way to distinguish between audio-only
+-    //and audio+video content is to look at the file extenstion.
+-    if (result->is("video/x-ms-asf") && KUrl(url).fileName().endsWith(".wma")) {
++    if (!url.isEmpty()) {
++        KMimeType::Ptr result = KMimeType::findByUrl(KUrl(url), 0, true);
++        //NOTE: Special handling for .wma extensions
++        //It turns out that wma files may pass the "video/x-ms-asf" mimetype test.
++        //Per Microsoft KB284094, the only way to distinguish between audio-only
++        //and audio+video content is to look at the file extenstion.
++        if (result->is("video/x-ms-asf") && KUrl(url).fileName().endsWith(".wma")) {
++            return false;
++        }
++        return isVideoMimeType(result);
++    } else {
+         return false;
+     }
+-
+-    return isVideoMimeType(result);
+ }
+ 
+ bool Utilities::isVideoMimeType(KMimeType::Ptr type)
+@@ -123,17 +132,24 @@
+ 
+ bool Utilities::isM3u(const QString &url)
+ {
+-    KMimeType::Ptr result = KMimeType::findByUrl(KUrl(url), 0, true);
+-    return (result->is("audio/m3u") ||
+-            result->is("application/vnd.apple.mpegurl") ||
+-            result->is("audio/x-mpegurl"));
++    if (!url.isEmpty()) {
++        KMimeType::Ptr result = KMimeType::findByUrl(KUrl(url), 0, true);
++        return (result->is("audio/m3u") ||
++                result->is("application/vnd.apple.mpegurl") ||
++                result->is("audio/x-mpegurl"));
++    } else {
++        return false;
++    }
+ }
+ 
+ bool Utilities::isPls(const QString &url)
+ {
+-    KMimeType::Ptr result = KMimeType::findByUrl(KUrl(url), 0, true);
+-
+-    return result->is("audio/x-scpls");
++    if (!url.isEmpty()) {
++        KMimeType::Ptr result = KMimeType::findByUrl(KUrl(url), 0, true);
++        return result->is("audio/x-scpls");
++    } else {
++        return false;
++    }
+ }
+ 
+ bool Utilities::isDvd(const KUrl& url)
diff --git a/debian/patches/series b/debian/patches/series
index 373b745..661f0d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_psychadelic_psychedelic.diff
+02_QFSFileEngine_open.diff

-- 
bangarang packaging