MythMusic: remove any username/password when displaying any radio str…

…eam URLs
MythTV · May 27, 2013 · 3247383 · 3247383
1 parent bbc5e9c
commit 3247383
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/mythplugins/mythmusic/theme/default-wide/stream-ui.xml b/mythplugins/mythmusic/theme/default-wide/stream-ui.xml
@@ -188,7 +188,7 @@
             <template>%STATION% - %CHANNEL%</template>
         </textarea>
 
-        <textarea name="filename" from="basetextarea">
+        <textarea name="url" from="basetextarea">
             <font>basesmall</font>
             <area>230,595,840,35</area>
         </textarea>

diff --git a/mythtv/libs/libmythmetadata/musicmetadata.cpp b/mythtv/libs/libmythmetadata/musicmetadata.cpp
@@ -848,7 +848,15 @@ void MusicMetadata::toMap(MetadataMap &metadataMap, const QString &prefix)
     metadataMap[prefix + "station"] = m_station;
     metadataMap[prefix + "channel"] = m_channel;
     metadataMap[prefix + "genre"] = m_genre;
-    metadataMap[prefix + "url"] = m_filename;
+
+    if (isRadio())
+    {
+        QUrl url(m_filename);
+        metadataMap[prefix + "url"] = url.toString(QUrl::RemoveUserInfo);
+    }
+    else
+        metadataMap[prefix + "url"] = m_filename;
+
     metadataMap[prefix + "logourl"] = m_logoUrl;
     metadataMap[prefix + "metadataformat"] = m_metaFormat;
 }