Bug#270347: Two different patches for this

[Morgon Kanter <morgon@surgo.net>]

There's really two different ways to fix this problem, though I think 
the second one I have here (kaudiocreator-albumtitle.patch) is probably 
the correct one.

For the first solution, apply the kaudiofile-albumvariable.patch 
patchfile. It adds the %album variable, which is pretty much just a 
copy of the %albumtitle variable.

For the second solution, apply the kaudiofile-albumtitle.patch 
patchfile. This changes all the old instances of plain %album into 
%albumtitle, which I think it's supposed to be and got left out or 
something by accident in some newer release.

-- Morgon

--- kdemultimedia-3.3.0/kaudiocreator/job.cpp.orig	2004-09-06 18:00:04.000000000 -0400
+++ kdemultimedia-3.3.0/kaudiocreator/job.cpp	2004-09-06 18:01:35.000000000 -0400
@@ -44,7 +44,8 @@
   map.insert("comment", sanitize(track_comment));
   map.insert("year", QString::number(year));
 	map.insert("genre", genre);
-	
+
+  map.insert("album", sanitize(album));
   map.insert("albumtitle", sanitize(album));
   map.insert("albumcomment", sanitize(comment));
   map.insert("albumartist", sanitize(group));

diff -ur kdemultimedia-3.3.0.orig/kaudiocreator/encoderconfig.ui kdemultimedia-3.3.0/kaudiocreator/encoderconfig.ui
--- kdemultimedia-3.3.0.orig/kaudiocreator/encoderconfig.ui	2004-09-06 18:18:26.000000000 -0400
+++ kdemultimedia-3.3.0/kaudiocreator/encoderconfig.ui	2004-09-06 18:17:04.000000000 -0400
@@ -193,7 +193,7 @@
                                 <cstring>kcfg_playlistFileFormat</cstring>
                             </property>
                             <property name="text">
-                                <string>~/%extension/%artist/%album/%artist - %album.m3u</string>
+                                <string>~/%extension/%artist/%albumtitle/%artist - %albumtitle.m3u</string>
                             </property>
                         </widget>
                         <widget class="QPushButton">
diff -ur kdemultimedia-3.3.0.orig/kaudiocreator/encoderconfigimp.cpp kdemultimedia-3.3.0/kaudiocreator/encoderconfigimp.cpp
--- kdemultimedia-3.3.0.orig/kaudiocreator/encoderconfigimp.cpp	2004-09-06 18:17:24.000000000 -0400
+++ kdemultimedia-3.3.0/kaudiocreator/encoderconfigimp.cpp	2004-09-06 18:16:02.000000000 -0400
@@ -45,14 +45,14 @@
     
     encPrefs = EncoderPrefs::prefs("Encoder_0");
     encPrefs->setEncoderName(i18n("OggEnc"));
-    encPrefs->setCommandLine("oggenc -o %o --artist %artist --album %album --title %title --date %year --tracknum %track --genre %genre %f");
+    encPrefs->setCommandLine("oggenc -o %o --artist %artist --album %albumtitle --title %title --date %year --tracknum %track --genre %genre %f");
     encPrefs->setExtension("ogg");
     encPrefs->setPercentLength(4);
     encPrefs->writeConfig();
 
     encPrefs = EncoderPrefs::prefs("Encoder_1");
     encPrefs->setEncoderName(i18n("Lame"));
-    encPrefs->setCommandLine("lame --preset standard --tt %title --ta %artist --tl %album --ty %year --tn %track --tg %genre %f %o");
+    encPrefs->setCommandLine("lame --preset standard --tt %title --ta %artist --tl %albumtitle --ty %year --tn %track --tg %genre %f %o");
     encPrefs->setExtension("mp3");
     encPrefs->setPercentLength(2);
     encPrefs->writeConfig();
@@ -66,7 +66,7 @@
 
     encPrefs = EncoderPrefs::prefs("Encoder_3");
     encPrefs->setEncoderName(i18n("FLAC"));
-    encPrefs->setCommandLine("flac --best -o %o --tag=Artist=%artist --tag=Album=%album --tag=Title=%title --tag=Tracknumber=%track --tag=Genre=%genre %f");
+    encPrefs->setCommandLine("flac --best -o %o --tag=Artist=%artist --tag=Album=%albumtitle --tag=Title=%title --tag=Tracknumber=%track --tag=Genre=%genre %f");
     encPrefs->setExtension("flac");
     encPrefs->setPercentLength(2);
     encPrefs->writeConfig();

Attachment: pgpDZn5aGiRSf.pgp
Description: PGP signature