connect(m_configEnv.kp_audio, SIGNAL(clicked()), this, SLOT(slotEditAudioApplication()));
connect(m_configEnv.kp_player, SIGNAL(clicked()), this, SLOT(slotEditVideoApplication()));
- QStringList profilesNames = ProfilesDialog::getProfileNames();
- m_configMisc.kcfg_profiles_list->addItems(profilesNames);
- m_defaultProfile = ProfilesDialog::getSettingsFromFile(KdenliveSettings::default_profile()).value("description");
- if (profilesNames.contains(m_defaultProfile)) {
- m_configMisc.kcfg_profiles_list->setCurrentItem(m_defaultProfile);
- KdenliveSettings::setProfiles_list(profilesNames.indexOf(m_defaultProfile));
+
+
+ QMap <QString, QString> profilesInfo = ProfilesDialog::getProfilesInfo();
+ QMapIterator<QString, QString> i(profilesInfo);
+ while (i.hasNext()) {
+ i.next();
+ m_configMisc.kcfg_profiles_list->addItem(i.key(), i.value());
+ }
+
+ if (!KdenliveSettings::default_profile().isEmpty()) {
+ for (int i = 0; i < m_configMisc.kcfg_profiles_list->count(); i++) {
+ if (m_configMisc.kcfg_profiles_list->itemData(i).toString() == KdenliveSettings::default_profile()) {
+ m_configMisc.kcfg_profiles_list->setCurrentIndex(i);
+ KdenliveSettings::setProfiles_list(i);
+ break;
+ }
+ }
}
slotUpdateDisplay();
KdenliveSettingsDialog::~KdenliveSettingsDialog() {}
-void KdenliveSettingsDialog::initDevices()
-{
+void KdenliveSettingsDialog::initDevices() {
// Fill audio drivers
m_configSdl.kcfg_audio_driver->addItem(i18n("Automatic"), QString());
m_configSdl.kcfg_audio_driver->addItem(i18n("OSS"), "dsp");
m_configSdl.kcfg_audio_driver->addItem(i18n("ARTS daemon"), "artsc");
/*if (!KdenliveSettings::audiodriver().isEmpty())
- for (uint i = 1;i < m_configDisplay.kcfg_audio_driver->count(); i++) {
- if (m_configDisplay.kcfg_audio_driver->itemData(i).toString() == KdenliveSettings::audiodriver())
- m_configDisplay.kcfg_audio_driver->setCurrentIndex(i);
- }*/
-
- // Fill video drivers
+ for (uint i = 1;i < m_configDisplay.kcfg_audio_driver->count(); i++) {
+ if (m_configDisplay.kcfg_audio_driver->itemData(i).toString() == KdenliveSettings::audiodriver())
+ m_configDisplay.kcfg_audio_driver->setCurrentIndex(i);
+ }*/
+
+ // Fill video drivers
m_configSdl.kcfg_video_driver->addItem(i18n("Automatic"), QString());
- m_configSdl.kcfg_video_driver->addItem(i18n("X11"), "x11");
+ m_configSdl.kcfg_video_driver->addItem(i18n("XVideo"), "x11");
+ m_configSdl.kcfg_video_driver->addItem(i18n("X11"), "x11_noaccel");
m_configSdl.kcfg_video_driver->addItem(i18n("XFREE86 DGA 2.0"), "dga");
m_configSdl.kcfg_video_driver->addItem(i18n("Nano X"), "nanox");
m_configSdl.kcfg_video_driver->addItem(i18n("Framebuffer console"), "fbcon");
m_configSdl.kcfg_video_driver->addItem(i18n("General graphics interface"), "ggi");
m_configSdl.kcfg_video_driver->addItem(i18n("Ascii art library"), "aalib");
- // Fill the list of audio playback devices
+ // Fill the list of audio playback devices
m_configSdl.kcfg_audio_device->addItem(i18n("Default"), QString());
if (KStandardDirs::findExe("aplay") != QString::null) {
- m_readProcess.setOutputChannelMode(KProcess::OnlyStdoutChannel);
- m_readProcess.setProgram("aplay", QStringList() << "-l");
- connect(&m_readProcess, SIGNAL(readyReadStandardOutput()) ,this, SLOT(slotReadAudioDevices()));
- m_readProcess.execute(5000);
- }
- else {
- // If aplay is not installed on the system, parse the /proc/asound/pcm file
- QFile file("/proc/asound/pcm");
- if ( file.open( QIODevice::ReadOnly ) ) {
- QTextStream stream( &file );
- QString line;
- while ( !stream.atEnd() ) {
+ m_readProcess.setOutputChannelMode(KProcess::OnlyStdoutChannel);
+ m_readProcess.setProgram("aplay", QStringList() << "-l");
+ connect(&m_readProcess, SIGNAL(readyReadStandardOutput()) , this, SLOT(slotReadAudioDevices()));
+ m_readProcess.execute(5000);
+ } else {
+ // If aplay is not installed on the system, parse the /proc/asound/pcm file
+ QFile file("/proc/asound/pcm");
+ if (file.open(QIODevice::ReadOnly)) {
+ QTextStream stream(&file);
+ QString line;
+ while (!stream.atEnd()) {
line = stream.readLine();
- if (line.contains("playback")) {
- QString deviceId = line.section(":", 0, 0);
- m_configSdl.kcfg_audio_device->addItem(line.section(":", 1, 1), "plughw:" + QString::number(deviceId.section("-", 0, 0).toInt()) + "," + QString::number(deviceId.section("-", 1, 1).toInt()));
- }
- }
+ if (line.contains("playback")) {
+ QString deviceId = line.section(":", 0, 0);
+ m_configSdl.kcfg_audio_device->addItem(line.section(":", 1, 1), "plughw:" + QString::number(deviceId.section("-", 0, 0).toInt()) + "," + QString::number(deviceId.section("-", 1, 1).toInt()));
+ }
+ }
file.close();
- }
+ }
}
}
-void KdenliveSettingsDialog::slotReadAudioDevices()
-{
+void KdenliveSettingsDialog::slotReadAudioDevices() {
QString result = QString(m_readProcess.readAllStandardOutput());
- kDebug()<<"// / / / / / READING APLAY: ";
- kDebug()<< result;
+ kDebug() << "// / / / / / READING APLAY: ";
+ kDebug() << result;
QStringList lines = result.split('\n');
- foreach (QString data, lines) {
- kDebug()<<"// READING LINE: "<<data;
- if (data.simplified().startsWith("card")) {
- QString card = data.section(":", 0, 0).section(" ", -1);
- QString device = data.section(":", 1, 1).section(" ", -1);
- m_configSdl.kcfg_audio_device->addItem(data.section(":", -1), "plughw:" + card + "," + device);
- }
+ foreach(QString data, lines) {
+ kDebug() << "// READING LINE: " << data;
+ if (data.simplified().startsWith("card")) {
+ QString card = data.section(":", 0, 0).section(" ", -1);
+ QString device = data.section(":", 1, 1).section(" ", -1);
+ m_configSdl.kcfg_audio_device->addItem(data.section(":", -1), "plughw:" + card + "," + device);
+ }
}
}
bool resetProfile = false;
QString value = m_configSdl.kcfg_audio_device->itemData(m_configSdl.kcfg_audio_device->currentIndex()).toString();
if (value != KdenliveSettings::audiodevicename()) {
- KdenliveSettings::setAudiodevicename(value);
- resetProfile = true;
+ KdenliveSettings::setAudiodevicename(value);
+ resetProfile = true;
}
value = m_configSdl.kcfg_audio_driver->itemData(m_configSdl.kcfg_audio_driver->currentIndex()).toString();
if (value != KdenliveSettings::audiodrivername()) {
- KdenliveSettings::setAudiodrivername(value);
- resetProfile = true;
+ KdenliveSettings::setAudiodrivername(value);
+ resetProfile = true;
}
value = m_configSdl.kcfg_video_driver->itemData(m_configSdl.kcfg_video_driver->currentIndex()).toString();
if (value != KdenliveSettings::videodrivername()) {
- KdenliveSettings::setVideodrivername(value);
- resetProfile = true;
+ KdenliveSettings::setVideodrivername(value);
+ resetProfile = true;
}
KConfigDialog::updateSettings();
}
void KdenliveSettingsDialog::slotUpdateDisplay() {
- QString currentProfile = m_configMisc.kcfg_profiles_list->currentText();
- QMap< QString, QString > values = ProfilesDialog::getSettingsForProfile(currentProfile);
+ QString currentProfile = m_configMisc.kcfg_profiles_list->itemData(m_configMisc.kcfg_profiles_list->currentIndex()).toString();
+ QMap< QString, QString > values = ProfilesDialog::getSettingsFromFile(currentProfile);
m_configMisc.p_size->setText(values.value("width") + "x" + values.value("height"));
m_configMisc.p_fps->setText(values.value("frame_rate_num") + "/" + values.value("frame_rate_den"));
m_configMisc.p_aspect->setText(values.value("sample_aspect_num") + "/" + values.value("sample_aspect_den"));
m_configMisc.p_display->setText(values.value("display_aspect_num") + "/" + values.value("display_aspect_den"));
if (values.value("progressive").toInt() == 0) m_configMisc.p_progressive->setText(i18n("Interlaced"));
else m_configMisc.p_progressive->setText(i18n("Progressive"));
- m_defaultPath = values.value("path");
+ m_defaultProfile = m_configMisc.kcfg_profiles_list->itemText(m_configMisc.kcfg_profiles_list->currentIndex());
+ m_defaultPath = currentProfile;
}
projects / kdenlive / blobdiff