[mythtv] Mythmusic patch

[Ed Benckert]

Heres the patch, diff'ed against the cvs I just downloaded.

-------------- next part --------------
diff -urN mythmusic/mythmusic/main.cpp mythmusic-fixed/mythmusic/main.cpp
--- mythmusic/mythmusic/main.cpp	2004-01-05 16:32:06.000000000 -0500
+++ mythmusic-fixed/mythmusic/main.cpp	2004-03-02 16:08:35.000000000 -0500
@@ -26,6 +26,11 @@
 #include <mythtv/mythplugin.h>
 #include <mythtv/mythmedia.h>
 
+int RatingWeight;
+int PlayCountWeight;
+int LastPlayWeight; 
+int RandomWeight;   
+
 void CheckFreeDBServerFile(void)
 {
     char filename[1024];
@@ -439,6 +444,10 @@
     }
 
     //  Load all available info about songs (once!)
+    RatingWeight = gContext->GetNumSetting("IntelliRatingWeight", 2);
+    PlayCountWeight = gContext->GetNumSetting("IntelliPlayCountWeight", 2);
+    LastPlayWeight = gContext->GetNumSetting("IntelliLastPlayWeight", 2);
+    RandomWeight = gContext->GetNumSetting("IntelliRandomWeight", 2);
     QString startdir = gContext->GetSetting("MusicLocation");
     startdir = QDir::cleanDirPath(startdir);
     if (!startdir.endsWith("/"));
diff -urN mythmusic/mythmusic/metadata.cpp mythmusic-fixed/mythmusic/metadata.cpp
--- mythmusic/mythmusic/metadata.cpp	2004-02-11 00:05:36.000000000 -0500
+++ mythmusic-fixed/mythmusic/metadata.cpp	2004-03-02 16:09:17.000000000 -0500
@@ -1033,6 +1033,10 @@
 
 void MusicNode::writeTree(GenericTree *tree_to_write_to, int a_counter)
 {
+    extern int RatingWeight;
+    extern int PlayCountWeight;
+    extern int LastPlayWeight;
+    extern int RandomWeight;
     
     GenericTree *sub_node = tree_to_write_to->addNode(my_title);
     sub_node->setAttribute(0, 0);
@@ -1044,10 +1048,6 @@
     Metadata *a_track;
     int track_counter = 0;
     anit.toFirst();
-    int RatingWeight = gContext->GetNumSetting("IntelliRatingWeight", 2);
-    int PlayCountWeight = gContext->GetNumSetting("IntelliPlayCountWeight", 2);
-    int LastPlayWeight = gContext->GetNumSetting("IntelliLastPlayWeight", 2);
-    int RandomWeight = gContext->GetNumSetting("IntelliRandomWeight", 2);
     while( (a_track = anit.current() ) != 0)
     {
         QString title_temp = QString(QObject::tr("%1 - %2")).arg(a_track->Track()).arg(a_track->Title());
diff -urN mythmusic/mythmusic/playlist.cpp mythmusic-fixed/mythmusic/playlist.cpp
--- mythmusic/mythmusic/playlist.cpp	2004-02-24 18:30:16.000000000 -0500
+++ mythmusic-fixed/mythmusic/playlist.cpp	2004-03-02 16:09:43.000000000 -0500
@@ -707,6 +707,11 @@
 
 int Playlist::writeTree(GenericTree *tree_to_write_to, int a_counter)
 {
+    extern int RatingWeight;
+    extern int PlayCountWeight;
+    extern int LastPlayWeight;
+    extern int RandomWeight;
+    
     Track *it;
 
     // compute max/min playcount,lastplay for this playlist
@@ -743,10 +748,6 @@
         }
     }
 
-    int RatingWeight = gContext->GetNumSetting("IntelliRatingWeight", 2); 
-    int PlayCountWeight = gContext->GetNumSetting("IntelliPlayCountWeight", 2); 
-    int LastPlayWeight = gContext->GetNumSetting("IntelliLastPlayWeight", 2); 
-    int RandomWeight = gContext->GetNumSetting("IntelliRandomWeight", 2); 
     for(it = songs.first(); it; it = songs.next())
     {
         if(!it->getCDFlag())