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

List:       kde-commits
Subject:    extragear/multimedia/kaudiocreator
From:       Gerd Fleischer <gerdfleischer () web ! de>
Date:       2009-03-29 15:18:52
Message-ID: 1238339932.391709.16440.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 946540 by geflei:

Check for a valid default encoder at application start.

 M  +3 -4      encoderconfigimp.cpp  
 M  +14 -11    kaudiocreator.cpp  


--- trunk/extragear/multimedia/kaudiocreator/encoderconfigimp.cpp #946539:946540
@@ -81,10 +81,9 @@
 
 	// Make sure that the default encoder is valid.
 	QString groupName = QString("Encoder_").append(Prefs::defaultEncoder());
-	if (!list.contains(groupName) && currentEncoderList->count() > 0) {
-		QList<QListWidgetItem *> items = currentEncoderList->findItems(QString("WAV"), \
                Qt::MatchExactly); //should be only one
-		currentEncoderList->setCurrentItem(items.at(0));
-		Prefs::setDefaultEncoder((currentEncoderList->currentItem())->text());
+	if (!list.contains(groupName)) {
+		Prefs::setDefaultEncoder("WAV");
+		Prefs::self()->writeConfig();
 	}
 	kcfg_defaultEncoder->setText(Prefs::defaultEncoder());
 }
--- trunk/extragear/multimedia/kaudiocreator/kaudiocreator.cpp #946539:946540
@@ -223,22 +223,25 @@
 		encPrefs->setPercentLength(2);
 		encPrefs->writeConfig();
 
-		Prefs::setDefaultEncoder("WAV");
 		Prefs::setInputTypesList(QStringList("wav"));
 		Prefs::self()->writeConfig();
 	} else {
-		if (list.contains(QString("Encoder_WAV")))
-			return;
+		if (list.contains(QString("Encoder_WAV"))) {
+			EncoderPrefs *encPrefs;
+			encPrefs = EncoderPrefs::prefs("Encoder_WAV");
+			encPrefs->setEncoderName(i18n("WAV"));
+			encPrefs->setCommandLine("mv %f %o");
+			encPrefs->setExtension("wav");
+			encPrefs->setPercentLength(2);
+			encPrefs->writeConfig();
+		}
+	}
 
-		EncoderPrefs *encPrefs;
-		encPrefs = EncoderPrefs::prefs("Encoder_WAV");
-		encPrefs->setEncoderName(i18n("WAV"));
-		encPrefs->setCommandLine("mv %f %o");
-		encPrefs->setExtension("wav");
-		encPrefs->setPercentLength(2);
-		encPrefs->writeConfig();
+	QString groupName = QString("Encoder_").append(Prefs::defaultEncoder());
+	if (!list.contains(groupName)) {
+		Prefs::setDefaultEncoder("WAV");
+		Prefs::self()->writeConfig();
 	}
-
 }
 
 void KAudioCreator::setupRipMenu(){


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