Ticket #449: mythmusic.patch

mythmusic/mythmusic/main.cpp

@@ -191 +191 @@
     {
         while (query.next())
         {
-            QString name = directory + QString::fromUtf8(query.value(0).toString());
+            QString name = directory + QString::fromAscii(query.value(0).toString());
             if (name != QString::null)
             {
                 if ((iter = music_files.find(name)) != music_files.end())
@@ -223 +223 @@
 
             query.prepare("DELETE FROM musicmetadata WHERE "
                           "filename = :NAME ;");
-            query.bindValue(":NAME", name.utf8());
+            query.bindValue(":NAME", name.ascii());
             query.exec();
         }
 

mythmusic/mythmusic/metadata.cpp

@@ -99 +99 @@
     query.prepare("SELECT artist,compilation_artist,album,title,genre,year,tracknum,"
                   "length,intid,rating,playcount,lastplay,compilation FROM "
                   "musicmetadata WHERE filename = :FILENAME ;");
-    query.bindValue(":FILENAME", sqlfilename.utf8());
+    query.bindValue(":FILENAME", sqlfilename.ascii());
 
     if (query.exec() && query.isActive() && query.size() > 0)
     {
@@ -175 +175 @@
     query.bindValue(":YEAR", year);
     query.bindValue(":TRACKNUM", tracknum);
     query.bindValue(":LENGTH", length);
-    query.bindValue(":FILENAME", sqlfilename.utf8());
+    query.bindValue(":FILENAME", sqlfilename.ascii());
     query.bindValue(":COMPILATION", compilation);
     query.bindValue(":DATE_ADDED", QDate::currentDate());
     
@@ -505 +505 @@
         year = query.value(5).toInt();
         tracknum = query.value(6).toInt();
         length = query.value(7).toInt();
-        filename = QString::fromUtf8(query.value(8).toString());
+        filename = QString::fromAscii(query.value(8).toString());
         id = query.value(9).toUInt();
         rating = query.value(10).toInt();
         playcount = query.value(11).toInt();
@@ -541 +541 @@
         year = query.value(6).toInt();
         tracknum = query.value(7).toInt();
         length = query.value(8).toInt();
-        filename = QString::fromUtf8(query.value(9).toString());
+        filename = QString::fromAscii(query.value(9).toString());
         rating = query.value(10).toInt();
         playcount = query.value(11).toInt();
         lastplay = query.value(12).toString();
@@ -690 +690 @@
     {
         while (query.next())
         {
-            filename = QString::fromUtf8(query.value(9).toString());
+            filename = QString::fromAscii(query.value(9).toString());
             if (!filename.contains("://"))
                 filename = startdir + filename;