Ticket #4105: albumfix2.patch

mythmusic/mythmusic/playlist.cpp

@@ -963 +963 @@
                         else if (tmpdata->LastPlay() > lastplayMax) { lastplayMax = tmpdata->LastPlay(); }
                     }
                 }
+                // pre-fill the album-map with the album name.  This allows us to do album mode in album order
+                album = tmpdata->Artist() + "~" + tmpdata->Album();
+                if ((Ialbum = album_map.find(album)) == album_map.end()) 
+                {
+                    album_map.insert(AlbumMap::value_type(album,0));
+                }
                 
                 // pre-fill the artist map with the artist name and song title
                 artist = tmpdata->Artist() + "~" + tmpdata->Title();
                 if ((Iartist = artist_map.find(artist)) == artist_map.end()) 
                 {
-                  artist_map.insert(ArtistMap::value_type(artist,
-                                                        0));
-                }
+                  artist_map.insert(ArtistMap::value_type(artist,0));
+                }                
             }
         }
     }
+    // populate the sort id into the album map
+    uint32_t album_count = 1; 
+    for( Ialbum = album_map.begin(); Ialbum != album_map.end(); Ialbum++ ) 
+    {
+        Ialbum->second = album_count;
+        album_count++;
+    }    
 
     // populate the sort id into the artist map
     uint32_t count = 1; 
@@ -1033 +1045 @@
                     added_node->setAttribute(3, integer_rating); //  "intelligent" order
 
                     // "intellegent/album" order
+                    uint32_t album_order;
                     album = tmpdata->Artist() + "~" + tmpdata->Album();
-                    if ((Ialbum = album_map.find(album)) == album_map.end()) {
-                      // Add room for 100 albums with 100 tracks.
-                      integer_rating *= 10000;
-                      integer_rating += (a_counter * 100);
-
-                      album_map.insert(AlbumMap::value_type(album,
-                                                            integer_rating));
-
-                      integer_rating += tmpdata->Track();
-                      added_node->setAttribute(4, integer_rating);
+                    if ((Ialbum = album_map.find(album)) == album_map.end())
+                    {
+                        // we didn't find this album in the map, yet we pre-loaded them all
+                        // we are broken, but we just set the track order to 1, since there
+                        // is no real point in reporting an error
+                        album_order = 1;
                     }
-                    else {
-                      integer_rating = Ialbum->second;
-                      integer_rating += tmpdata->Track();
-                      added_node->setAttribute(4, integer_rating);
+                    else 
+                    {
+                        album_order = Ialbum->second * 100;
                     }
+                    album_order += tmpdata->Track();
+                    added_node->setAttribute(4, album_order);
                     
                     // "artist" order, sorts by artist name then track title
                     // uses the pre-prepared artist map to do this