Ticket #7634: mythtv_upnp_music_playlist.diff

mythtv/programs/mythbackend/upnpcdsmusic.cpp

@@ -78 +78 @@
             "GROUP BY a.album_id "
             "ORDER BY a.album_name",
         "WHERE song.album_id=:KEY" },
+    {   "Playlists",
+        "playlist.playlist_id",
+        "SELECT playlist.playlist_id as id, "
+          "playlist.playlist_name as name, "
+          "playlist.songcount as children "
+             "FROM music_songs song INNER JOIN music_playlists playlist ON playlist.playlist_songs like concat('%,', song.song_id ,',%') or playlist.playlist_songs like concat('', song.song_id ,',%') or playlist.playlist_songs like concat('%,', song.song_id ,'')"
+            "%1 "
+            "GROUP BY playlist.playlist_id "
+            "ORDER BY playlist.playlist_name",
+        "" },
 /*
 
     {   "By Artist",
@@ -135 +145 @@
 
 QString UPnpCDSMusic::GetTableName( QString sColumn )
 {
+  if(sColumn.contains("playlist"))
+    return "music_songs song INNER JOIN music_playlists playlist ON playlist.playlist_songs like concat('%,', song.song_id ,',%') or playlist.playlist_songs like concat('', song.song_id ,',%') or playlist.playlist_songs like concat('%,', song.song_id ,'')";
+  else
     return "music_songs song";
 }
 
@@ -142 +155 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-QString UPnpCDSMusic::GetItemListSQL( QString /* sColumn */ )
+QString UPnpCDSMusic::GetItemListSQL( QString sColumn )
 {
-    return "SELECT song.song_id as intid, artist.artist_name as artist, "         \
+  return QString("SELECT song.song_id as intid, artist.artist_name as artist, "   \
                "album.album_name as album, song.name as title, "                  \
                "genre.genre, song.year, song.track as tracknum, "                 \
                "song.description, song.filename, song.length "                    \
-            "FROM music_songs song "                                              \
+            "FROM %1 "                                                            \
                " join music_artists artist on artist.artist_id = song.artist_id " \
                " join music_albums album on album.album_id = song.album_id "      \
-               " join music_genres genre on  genre.genre_id = song.genre_id ";
+                 " join music_genres genre on  genre.genre_id = song.genre_id ")
+            .arg( GetTableName(sColumn) );
 }
 
 /////////////////////////////////////////////////////////////////////////////