MythMusic: Couple of tweaks to streaming radio playback

* Allow both unix and window line-ending in the m3u playlist file. * allow for URLs that have a query (cherry picked from commit a39c41c) Signed-off-by: Stuart Morgan <smorgan@mythtv.org>
MythTV · Jul 7, 2012 · ebf4860 · ebf4860
1 parent 92083c8
commit ebf4860
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/mythplugins/mythmusic/mythmusic/pls.cpp b/mythplugins/mythmusic/mythmusic/pls.cpp
@@ -250,7 +250,7 @@ int PlayListFile::parsePLS(PlayListFile *pls, QTextStream *stream)
 int PlayListFile::parseM3U(PlayListFile *pls, QTextStream *stream)
 {
     QString data = stream->readAll();
-    QStringList lines = data.split("\r\n");
+    QStringList lines = data.split(QRegExp("[\r\n]"));
 
     QStringList::iterator it;
     for (it = lines.begin(); it != lines.end(); ++it)

diff --git a/mythplugins/mythmusic/mythmusic/shoutcast.cpp b/mythplugins/mythmusic/mythmusic/shoutcast.cpp
@@ -75,7 +75,12 @@ class ShoutCastRequest
                       "Host: %HOST%\r\n"
                       "User-Agent: MythMusic/%VERSION%\r\n"
                       "Accept: */*\r\n");
-        hdr.replace("%PATH%", url.path());
+
+        QString path = url.path();
+        if (url.hasQuery())
+            path += '?' + url.encodedQuery();
+
+        hdr.replace("%PATH%", path);
         hdr.replace("%HOST%", url.host());
         hdr.replace("%VERSION%", MYTH_BINARY_VERSION);
 
@@ -117,7 +122,11 @@ class IceCastRequest
                       "User-Agent: MythMusic/%VERSION%\r\n"
                       "Accept: */*\r\n");
 
-        hdr.replace("%PATH%", url.path());
+        QString path = url.path();
+        if (url.hasQuery())
+            path += '?' + url.encodedQuery();
+
+        hdr.replace("%PATH%", path);
         hdr.replace("%HOST%", url.host());
         hdr.replace("%VERSION%", MYTH_BINARY_VERSION);