Bug#257196: Patch sort of

[Morgon Kanter <morgon@surgo.net>]

"When "%track" option is specified from wizard, the characters "%track" 
is added instead of track number."

I had the same problem with %album - it's not the right variable 
anymore. %track should be %number now (why the name change I do not 
know). The attached patch will change the default values for this, but 
if you have anything besides the default you'll probably have to change 
%track to %number manually (which isn't really that hard).

-- Morgon

--- kdemultimedia-3.3.0/kaudiocreator/encoderconfigimp.cpp.orig	2004-09-06 18:17:24.000000000 -0400
+++ kdemultimedia-3.3.0/kaudiocreator/encoderconfigimp.cpp	2004-09-06 18:34:21.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 %album --title %title --date %year --tracknum %number --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 %album --ty %year --tn %number --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=%album --tag=Title=%title --tag=Tracknumber=%number --tag=Genre=%genre %f");
     encPrefs->setExtension("flac");
     encPrefs->setPercentLength(2);
     encPrefs->writeConfig();

Attachment: pgpN7qYMhblYC.pgp
Description: PGP signature