Ticket #1676: AlbumSort-mythtv.patch

libs/libmyth/lcddevice.h

@@ -121 +121 @@
         MUSIC_SHUFFLE_NONE  = 0,
         MUSIC_SHUFFLE_RAND  = 1,
         MUSIC_SHUFFLE_SMART = 2,
+        MUSIC_SHUFFLE_ALBUM = 3
     };
 
     static class LCD * Get(void);

libs/libmyth/generictree.cpp

@@ -97 +97 @@
     m_selected_subnode = NULL;
     m_current_ordering_index = -1;
 
-    // Use 4 here, because we know that's what mythmusic wants (limits resizing)
-    m_attributes = new IntVector(4);
+    // Use 5 here, because we know that's what mythmusic wants (limits resizing)
+    m_attributes = new IntVector(5);
     
     m_string = a_string;
     m_int = an_int;

programs/mythlcdserver/lcdprocclient.cpp

@@ -1895 +1895 @@
         {
             shuffle = "S:i ";
         }
+        else if (music_shuffle == 3)
+        {
+            shuffle = "S:a ";
+        }
 
         if (music_repeat == 1)
         {