[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdemultimedia/kioslave/audiocd
From:       Benjamin Meyer <benjamin () csh ! rit ! edu>
Date:       2004-09-18 21:47:21
Message-ID: 20040918214721.641A69BAF () office ! kde ! org
[Download RAW message or body]

CVS commit by bmeyer: 

Bug 89375: Extracting two tracks with identical name gives only the first 
(normal)


  M +1 -1      audiocd.cpp   1.127
  M +2 -2      kcmaudiocd/kcmaudiocd.cpp   1.43


--- kdemultimedia/kioslave/audiocd/audiocd.cpp  #1.126:1.127
@@ -1153,5 +1153,5 @@ void AudioCDProtocol::loadSettings()
         // The default track filename template
         config->setGroup("FileName");
-        d->fileNameTemplate = config->readEntry("file_name_template", \
"%{albumartist} - %{title}"); +        d->fileNameTemplate = \
                config->readEntry("file_name_template", "%{albumartist} - %{number} - \
                %{title}");
         d->albumTemplate = config->readEntry("album_template", "%{albumartist} - \
%{albumtitle}");  d->rsearch = config->readEntry("regexp_search");

--- kdemultimedia/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp  #1.42:1.43
@@ -112,5 +112,5 @@ void KAudiocdModule::defaults() {
         }
 
-        fileNameLineEdit->setText("%{albumartist} - %{title}");
+        fileNameLineEdit->setText("%{albumartist} - %{number} - %{title}");
         albumNameLineEdit->setText("%{albumartist} - %{albumtitle}");
 }
@@ -163,5 +163,5 @@ void KAudiocdModule::load() {
   {
     KConfigGroupSaver saver(config, "FileName");
-    fileNameLineEdit->setText(config->readEntry("file_name_template", \
"%{albumartist} - %{title}")); +    \
fileNameLineEdit->setText(config->readEntry("file_name_template", "%{albumartist} - \
                %{number} - %{title}"));
         albumNameLineEdit->setText(config->readEntry("album_name_template", \
"%{albumartist} - %{albumtitle}"));  \
kcfg_replaceInput->setText(config->readEntry("regexp_search"));


[prev in list] [next in list] [prev in thread] [next in thread]