X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fkdenlivesettingsdialog.cpp;h=f8eb77f24445a6353b5353410dca099d8b2ebec8;hb=b6d6c25f1bd07f11a0ceaf32a3a5bcaeab367336;hp=7afa59472bc36cbd4e965c6f0c52974499c4f92f;hpb=ba471399b55c3b761ccc7aa5008c25bd43cfe90b;p=kdenlive diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp index 7afa5947..f8eb77f2 100644 --- a/src/kdenlivesettingsdialog.cpp +++ b/src/kdenlivesettingsdialog.cpp @@ -66,6 +66,8 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(const QMap& map m_configMisc.kcfg_activatetabs->setVisible(false); // Hide avformat-novalidate trick, causes crash (bug #2205 and #2206) m_configMisc.kcfg_projectloading_avformatnovalidate->setVisible(false); + + m_configMisc.kcfg_use_exiftool->setEnabled(!KStandardDirs::findExe("exiftool").isEmpty()); QWidget *p8 = new QWidget; m_configProject.setupUi(p8); @@ -103,8 +105,8 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(const QMap& map #ifdef USE_V4L // Video 4 Linux device detection - for (int i = 0; i < 10; i++) { - QString path = "/dev/video" + QString::number(i); + for (int i = 0; i < 10; ++i) { + QString path = QLatin1String("/dev/video") + QString::number(i); if (QFile::exists(path)) { QStringList deviceInfo = V4lCaptureHandler::getDeviceName(path); if (!deviceInfo.isEmpty()) { @@ -137,11 +139,22 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(const QMap& map m_configShuttle.shuttledisabled->hide(); // Store the button pointers into an array for easier handling them in the other functions. + // TODO: impl enumerator or live with cut and paste :-))) m_shuttle_buttons.push_back(m_configShuttle.shuttle1); m_shuttle_buttons.push_back(m_configShuttle.shuttle2); m_shuttle_buttons.push_back(m_configShuttle.shuttle3); m_shuttle_buttons.push_back(m_configShuttle.shuttle4); m_shuttle_buttons.push_back(m_configShuttle.shuttle5); + m_shuttle_buttons.push_back(m_configShuttle.shuttle6); + m_shuttle_buttons.push_back(m_configShuttle.shuttle7); + m_shuttle_buttons.push_back(m_configShuttle.shuttle8); + m_shuttle_buttons.push_back(m_configShuttle.shuttle9); + m_shuttle_buttons.push_back(m_configShuttle.shuttle10); + m_shuttle_buttons.push_back(m_configShuttle.shuttle11); + m_shuttle_buttons.push_back(m_configShuttle.shuttle12); + m_shuttle_buttons.push_back(m_configShuttle.shuttle13); + m_shuttle_buttons.push_back(m_configShuttle.shuttle14); + m_shuttle_buttons.push_back(m_configShuttle.shuttle15); // populate the buttons with the current configuration. The items are sorted // according to the user-selected language, so they do not appear in random order. @@ -153,22 +166,22 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(const QMap& map QStringList actions_map = JogShuttleConfig::actionMap(KdenliveSettings::shuttlebuttons()); QMap action_pos; foreach (const QString& action_id, actions_map) { - // This loop find out at what index is the string that would map to the action_id. - for (int i = 0; i < action_names.size(); i++) { - if (mappable_actions[action_names[i]] == action_id) { - action_pos[action_id] = i; - break; - } - } + // This loop find out at what index is the string that would map to the action_id. + for (int i = 0; i < action_names.size(); ++i) { + if (mappable_actions[action_names.at(i)] == action_id) { + action_pos[action_id] = i; + break; + } + } } int i = 0; foreach (KComboBox* button, m_shuttle_buttons) { - button->addItems(action_names); - connect(button, SIGNAL(activated(int)), this, SLOT(slotShuttleModified())); - ++i; - if (i < actions_map.size()) - button->setCurrentIndex(action_pos[actions_map[i]]); + button->addItems(action_names); + connect(button, SIGNAL(activated(int)), this, SLOT(slotShuttleModified())); + ++i; + if (i < actions_map.size()) + button->setCurrentIndex(action_pos[actions_map[i]]); } #else /* ! USE_JOGSHUTTLE */ m_configShuttle.kcfg_enableshuttle->hide(); @@ -178,6 +191,8 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(const QMap& map QWidget *p6 = new QWidget; m_configSdl.setupUi(p6); + m_configSdl.reload_blackmagic->setIcon(KIcon("view-refresh")); + connect(m_configSdl.reload_blackmagic, SIGNAL(clicked(bool)), this, SLOT(slotReloadBlackMagic())); #ifndef USE_OPENGL m_configSdl.kcfg_openglmonitors->setHidden(true); @@ -190,12 +205,12 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(const QMap& map m_page7 = addPage(p7, i18n("Transcode"), "edit-copy"); connect(m_configTranscode.button_add, SIGNAL(clicked()), this, SLOT(slotAddTranscode())); connect(m_configTranscode.button_delete, SIGNAL(clicked()), this, SLOT(slotDeleteTranscode())); - connect(m_configTranscode.profiles_list, SIGNAL(itemChanged(QListWidgetItem *)), this, SLOT(slotDialogModified())); + connect(m_configTranscode.profiles_list, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(slotDialogModified())); connect(m_configTranscode.profiles_list, SIGNAL(currentRowChanged(int)), this, SLOT(slotSetTranscodeProfile())); - connect(m_configTranscode.profile_name, SIGNAL(textChanged(const QString &)), this, SLOT(slotEnableTranscodeUpdate())); - connect(m_configTranscode.profile_description, SIGNAL(textChanged(const QString &)), this, SLOT(slotEnableTranscodeUpdate())); - connect(m_configTranscode.profile_extension, SIGNAL(textChanged(const QString &)), this, SLOT(slotEnableTranscodeUpdate())); + connect(m_configTranscode.profile_name, SIGNAL(textChanged(QString)), this, SLOT(slotEnableTranscodeUpdate())); + connect(m_configTranscode.profile_description, SIGNAL(textChanged(QString)), this, SLOT(slotEnableTranscodeUpdate())); + connect(m_configTranscode.profile_extension, SIGNAL(textChanged(QString)), this, SLOT(slotEnableTranscodeUpdate())); connect(m_configTranscode.profile_parameters, SIGNAL(textChanged()), this, SLOT(slotEnableTranscodeUpdate())); connect(m_configTranscode.profile_audioonly, SIGNAL(stateChanged(int)), this, SLOT(slotEnableTranscodeUpdate())); @@ -203,10 +218,6 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(const QMap& map m_configTranscode.profile_parameters->setMaximumHeight(QFontMetrics(font()).lineSpacing() * 5); - connect(m_configCapture.kcfg_rmd_capture_audio, SIGNAL(clicked(bool)), m_configCapture.audio_group, SLOT(setVisible(bool))); - - m_configCapture.audio_group->setVisible(KdenliveSettings::rmd_capture_audio()); - connect(m_configEnv.kp_image, SIGNAL(clicked()), this, SLOT(slotEditImageApplication())); connect(m_configEnv.kp_audio, SIGNAL(clicked()), this, SLOT(slotEditAudioApplication())); connect(m_configEnv.kp_player, SIGNAL(clicked()), this, SLOT(slotEditVideoApplication())); @@ -219,9 +230,9 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(const QMap& map connect(m_configSdl.kcfg_audio_driver, SIGNAL(currentIndexChanged(int)), this, SLOT(slotCheckAlsaDriver())); initDevices(); connect(m_configProject.kcfg_profiles_list, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateDisplay())); - connect(m_configCapture.kcfg_rmd_capture_type, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateRmdRegionStatus())); + connect(m_configCapture.kcfg_grab_capture_type, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateGrabRegionStatus())); - slotUpdateRmdRegionStatus(); + slotUpdateGrabRegionStatus(); loadTranscodeProfiles(); @@ -243,7 +254,7 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(const QMap& map connect(m_configCapture.kcfg_decklink_profile, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateDecklinkProfile())); connect(m_configCapture.decklink_showprofileinfo, SIGNAL(clicked(bool)), m_configCapture.decklink_parameters, SLOT(setVisible(bool))); - // v4l profile + // ffmpeg profile m_configCapture.v4l_showprofileinfo->setIcon(KIcon("help-about")); m_configCapture.v4l_manageprofile->setIcon(KIcon("configure")); m_configCapture.v4l_parameters->setVisible(false); @@ -252,6 +263,16 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(const QMap& map connect(m_configCapture.v4l_manageprofile, SIGNAL(clicked(bool)), this, SLOT(slotManageEncodingProfile())); connect(m_configCapture.kcfg_v4l_profile, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateV4lProfile())); connect(m_configCapture.v4l_showprofileinfo, SIGNAL(clicked(bool)), m_configCapture.v4l_parameters, SLOT(setVisible(bool))); + + // screen grab profile + m_configCapture.grab_showprofileinfo->setIcon(KIcon("help-about")); + m_configCapture.grab_manageprofile->setIcon(KIcon("configure")); + m_configCapture.grab_parameters->setVisible(false); + m_configCapture.grab_parameters->setMaximumHeight(QFontMetrics(font()).lineSpacing() * 4); + m_configCapture.grab_parameters->setPlainText(KdenliveSettings::grab_parameters()); + connect(m_configCapture.grab_manageprofile, SIGNAL(clicked(bool)), this, SLOT(slotManageEncodingProfile())); + connect(m_configCapture.kcfg_grab_profile, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateGrabProfile())); + connect(m_configCapture.grab_showprofileinfo, SIGNAL(clicked(bool)), m_configCapture.grab_parameters, SLOT(setVisible(bool))); // proxy profile stuff m_configProject.proxy_showprofileinfo->setIcon(KIcon("help-about")); @@ -266,12 +287,13 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(const QMap& map slotUpdateProxyProfile(-1); slotUpdateV4lProfile(-1); + slotUpdateGrabProfile(-1); slotUpdateDecklinkProfile(-1); Render::getBlackMagicDeviceList(m_configCapture.kcfg_decklink_capturedevice); if (!Render::getBlackMagicOutputDeviceList(m_configSdl.kcfg_blackmagic_output_device)) { // No blackmagic card found - m_configSdl.kcfg_external_display->setEnabled(false); + m_configSdl.kcfg_external_display->setEnabled(false); } double dvgrabVersion = 0; @@ -293,22 +315,13 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(const QMap& map } m_configCapture.dvgrab_info->setText(i18n("dvgrab version %1 at %2", dvgrabVersion, KdenliveSettings::dvgrab_path())); } else m_configCapture.dvgrab_info->setText(i18n("dvgrab utility not found, please install it for firewire capture")); - - if (KdenliveSettings::rmd_path().isEmpty() || !QFile::exists(KdenliveSettings::rmd_path())) { - QString rmdpath = KStandardDirs::findExe("recordmydesktop"); - KdenliveSettings::setRmd_path(rmdpath); - } - if (KdenliveSettings::rmd_path().isEmpty()) - m_configCapture.rmd_info->setText(i18n("Recordmydesktop utility not found, please install it for screen grabs")); - else - m_configCapture.rmd_info->setText(i18n("Recordmydesktop found at: %1", KdenliveSettings::rmd_path())); } KdenliveSettingsDialog::~KdenliveSettingsDialog() {} -void KdenliveSettingsDialog::slotUpdateRmdRegionStatus() +void KdenliveSettingsDialog::slotUpdateGrabRegionStatus() { - m_configCapture.region_group->setHidden(m_configCapture.kcfg_rmd_capture_type->currentIndex() != 1); + m_configCapture.region_group->setHidden(m_configCapture.kcfg_grab_capture_type->currentIndex() != 1); } void KdenliveSettingsDialog::slotEnableCaptureFolder() @@ -327,7 +340,7 @@ void KdenliveSettingsDialog::checkProfile() } if (!KdenliveSettings::default_profile().isEmpty()) { - for (int i = 0; i < m_configProject.kcfg_profiles_list->count(); i++) { + for (int i = 0; i < m_configProject.kcfg_profiles_list->count(); ++i) { if (m_configProject.kcfg_profiles_list->itemData(i).toString() == KdenliveSettings::default_profile()) { m_configProject.kcfg_profiles_list->setCurrentIndex(i); KdenliveSettings::setProfiles_list(i); @@ -351,7 +364,7 @@ void KdenliveSettingsDialog::initDevices() #endif if (!KdenliveSettings::audiodrivername().isEmpty()) - for (int i = 1; i < m_configSdl.kcfg_audio_driver->count(); i++) { + for (int i = 1; i < m_configSdl.kcfg_audio_driver->count(); ++i) { if (m_configSdl.kcfg_audio_driver->itemData(i).toString() == KdenliveSettings::audiodrivername()) { m_configSdl.kcfg_audio_driver->setCurrentIndex(i); KdenliveSettings::setAudio_driver((uint) i); @@ -372,9 +385,9 @@ void KdenliveSettingsDialog::initDevices() m_configSdl.kcfg_video_driver->addItem(i18n("Ascii art library"), "aalib"); #endif - // Fill the list of audio playback devices + // Fill the list of audio playback / recording devices m_configSdl.kcfg_audio_device->addItem(i18n("Default"), QString()); - m_configCapture.kcfg_rmd_alsa_device->addItem(i18n("Default"), QString()); + m_configCapture.kcfg_v4l_alsadevice->addItem(i18n("Default"), "default"); if (!KStandardDirs::findExe("aplay").isEmpty()) { m_readProcess.setOutputChannelMode(KProcess::OnlyStdoutChannel); m_readProcess.setProgram("aplay", QStringList() << "-l"); @@ -383,24 +396,23 @@ void KdenliveSettingsDialog::initDevices() } 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)) { + if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { QTextStream stream(&file); - QString line; + QString line = stream.readLine(); QString deviceId; - while (!stream.atEnd()) { - line = stream.readLine(); + while (!line.isNull()) { if (line.contains("playback")) { 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("capture")) { deviceId = line.section(':', 0, 0); - m_configCapture.kcfg_rmd_alsa_device->addItem(line.section(':', 1, 1).simplified(), "plughw:" + QString::number(deviceId.section('-', 0, 0).toInt()) + ',' + QString::number(deviceId.section('-', 1, 1).toInt())); m_configCapture.kcfg_v4l_alsadevice->addItem(line.section(':', 1, 1).simplified(), "hw:" + QString::number(deviceId.section('-', 0, 0).toInt()) + ',' + QString::number(deviceId.section('-', 1, 1).toInt())); } + line = stream.readLine(); } file.close(); - } + } else kDebug()<<" / / / /CANNOT READ PCM"; } // Add pulseaudio capture option @@ -413,13 +425,6 @@ void KdenliveSettingsDialog::initDevices() KdenliveSettings::setAudio_device(ix); } - if (!KdenliveSettings::rmd_alsadevicename().isEmpty()) { - // Select correct alsa device - int ix = m_configCapture.kcfg_rmd_alsa_device->findData(KdenliveSettings::rmd_alsadevicename()); - m_configCapture.kcfg_rmd_alsa_device->setCurrentIndex(ix); - KdenliveSettings::setRmd_alsa_device(ix); - } - if (!KdenliveSettings::v4l_alsadevicename().isEmpty()) { // Select correct alsa device int ix = m_configCapture.kcfg_v4l_alsadevice->findData(KdenliveSettings::v4l_alsadevicename()); @@ -443,7 +448,6 @@ void KdenliveSettingsDialog::slotReadAudioDevices() 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).simplified(), "plughw:" + card + ',' + device); - m_configCapture.kcfg_rmd_alsa_device->addItem(data.section(':', -1).simplified(), "plughw:" + card + ',' + device); m_configCapture.kcfg_v4l_alsadevice->addItem(data.section(':', -1).simplified(), "hw:" + card + ',' + device); } } @@ -483,14 +487,11 @@ void KdenliveSettingsDialog::slotEditVideoApplication() { KService::Ptr service; QPointer dlg = new KOpenWithDialog(KUrl::List(), i18n("Select default video player"), m_configEnv.kcfg_defaultplayerapp->text(), this); - if (dlg->exec() != QDialog::Accepted) - { - delete dlg; - return; + if (dlg->exec() == QDialog::Accepted) { + service = dlg->service(); + m_configEnv.kcfg_defaultplayerapp->setText(service->exec()); } - service = dlg->service(); - m_configEnv.kcfg_defaultplayerapp->setText(service->exec()); delete dlg; } @@ -498,14 +499,11 @@ void KdenliveSettingsDialog::slotEditAudioApplication() { KService::Ptr service; QPointer dlg = new KOpenWithDialog(KUrl::List(), i18n("Select default audio editor"), m_configEnv.kcfg_defaultaudioapp->text(), this); - if (dlg->exec() != QDialog::Accepted) - { - delete dlg; - return; + if (dlg->exec() == QDialog::Accepted) { + service = dlg->service(); + m_configEnv.kcfg_defaultaudioapp->setText(service->exec()); } - service = dlg->service(); - m_configEnv.kcfg_defaultaudioapp->setText(service->exec()); delete dlg; } @@ -513,27 +511,24 @@ void KdenliveSettingsDialog::slotEditImageApplication() { KService::Ptr service; QPointer dlg = new KOpenWithDialog(KUrl::List(), i18n("Select default image editor"), m_configEnv.kcfg_defaultimageapp->text(), this); - if (dlg->exec() != QDialog::Accepted) - { - delete dlg; - return; + if (dlg->exec() == QDialog::Accepted) { + service = dlg->service(); + m_configEnv.kcfg_defaultimageapp->setText(service->exec()); } - service = dlg->service(); - m_configEnv.kcfg_defaultimageapp->setText(service->exec()); delete dlg; } void KdenliveSettingsDialog::slotCheckShuttle(int state) { #ifdef USE_JOGSHUTTLE - m_configShuttle.config_group->setEnabled(state); + m_configShuttle.config_group->setEnabled(state); if (m_configShuttle.shuttledevicelist->count() == 0) { // parse devices QString baseName = "/dev/input/event"; int fd; - for (int i = 0; i < 30; i++) { + for (int i = 0; i < 30; ++i) { QString filename = baseName + QString::number(i); - kDebug() << "/// CHECKING OFR: " << filename; + kDebug() << "/// CHECKING device: " << filename; char name[256] = "unknown"; fd = KDE_open((char *) filename.toUtf8().data(), O_RDONLY); @@ -563,12 +558,12 @@ void KdenliveSettingsDialog::updateWidgets() #ifdef USE_JOGSHUTTLE // revert jog shuttle device if (m_configShuttle.shuttledevicelist->count() > 0) { - for (int i = 0; i < m_configShuttle.shuttledevicelist->count(); i++) { - if (m_configShuttle.shuttledevicelist->itemData(i) == KdenliveSettings::shuttledevice()) { - m_configShuttle.shuttledevicelist->setCurrentIndex(i); - break; - } - } + for (int i = 0; i < m_configShuttle.shuttledevicelist->count(); ++i) { + if (m_configShuttle.shuttledevicelist->itemData(i) == KdenliveSettings::shuttledevice()) { + m_configShuttle.shuttledevicelist->setCurrentIndex(i); + break; + } + } } // Revert jog shuttle buttons @@ -577,19 +572,19 @@ void KdenliveSettingsDialog::updateWidgets() QStringList actions_map = JogShuttleConfig::actionMap(KdenliveSettings::shuttlebuttons()); QMap action_pos; foreach (const QString& action_id, actions_map) { - // This loop find out at what index is the string that would map to the action_id. - for (int i = 0; i < action_names.size(); i++) { - if (m_mappable_actions[action_names[i]] == action_id) { - action_pos[action_id] = i; - break; - } - } + // This loop find out at what index is the string that would map to the action_id. + for (int i = 0; i < action_names.size(); ++i) { + if (m_mappable_actions[action_names[i]] == action_id) { + action_pos[action_id] = i; + break; + } + } } int i = 0; foreach (KComboBox* button, m_shuttle_buttons) { - ++i; - if (i < actions_map.size()) - button->setCurrentIndex(action_pos[actions_map[i]]); + ++i; + if (i < actions_map.size()) + button->setCurrentIndex(action_pos[actions_map[i]]); } #endif /* USE_JOGSHUTTLE */ } @@ -605,8 +600,8 @@ void KdenliveSettingsDialog::updateSettings() bool updateCapturePath = false; /*if (m_configShuttle.shuttledevicelist->count() > 0) { - QString device = m_configShuttle.shuttledevicelist->itemData(m_configShuttle.shuttledevicelist->currentIndex()).toString(); - if (device != KdenliveSettings::shuttledevice()) KdenliveSettings::setShuttledevice(device); + QString device = m_configShuttle.shuttledevicelist->itemData(m_configShuttle.shuttledevicelist->currentIndex()).toString(); + if (device != KdenliveSettings::shuttledevice()) KdenliveSettings::setShuttledevice(device); }*/ if (m_configEnv.kcfg_capturetoprojectfolder->isChecked() != KdenliveSettings::capturetoprojectfolder()) { @@ -635,16 +630,26 @@ void KdenliveSettingsDialog::updateSettings() } // Check encoding profiles + // FFmpeg QString data = m_configCapture.kcfg_v4l_profile->itemData(m_configCapture.kcfg_v4l_profile->currentIndex()).toString(); if (!data.isEmpty() && (data.section(';', 0, 0) != KdenliveSettings::v4l_parameters() || data.section(';', 1, 1) != KdenliveSettings::v4l_extension())) { KdenliveSettings::setV4l_parameters(data.section(';', 0, 0)); KdenliveSettings::setV4l_extension(data.section(';', 1, 1)); } + // screengrab + data = m_configCapture.kcfg_grab_profile->itemData(m_configCapture.kcfg_grab_profile->currentIndex()).toString(); + if (!data.isEmpty() && (data.section(';', 0, 0) != KdenliveSettings::grab_parameters() || data.section(';', 1, 1) != KdenliveSettings::grab_extension())) { + KdenliveSettings::setGrab_parameters(data.section(';', 0, 0)); + KdenliveSettings::setGrab_extension(data.section(';', 1, 1)); + } + + // decklink data = m_configCapture.kcfg_decklink_profile->itemData(m_configCapture.kcfg_decklink_profile->currentIndex()).toString(); if (!data.isEmpty() && (data.section(';', 0, 0) != KdenliveSettings::decklink_parameters() || data.section(';', 1, 1) != KdenliveSettings::decklink_extension())) { KdenliveSettings::setDecklink_parameters(data.section(';', 0, 0)); KdenliveSettings::setDecklink_extension(data.section(';', 1, 1)); } + // proxies data = m_configProject.kcfg_proxy_profile->itemData(m_configProject.kcfg_proxy_profile->currentIndex()).toString(); if (!data.isEmpty() && (data.section(';', 0, 0) != KdenliveSettings::proxyparams() || data.section(';', 1, 1) != KdenliveSettings::proxyextension())) { KdenliveSettings::setProxyparams(data.section(';', 0, 0)); @@ -654,23 +659,11 @@ void KdenliveSettingsDialog::updateSettings() if (updateCapturePath) emit updateCaptureFolder(); - QString value = m_configCapture.kcfg_rmd_alsa_device->itemData(m_configCapture.kcfg_rmd_alsa_device->currentIndex()).toString(); - if (value != KdenliveSettings::rmd_alsadevicename()) { - KdenliveSettings::setRmd_alsadevicename(value); - } - - value = m_configCapture.kcfg_v4l_alsadevice->itemData(m_configCapture.kcfg_v4l_alsadevice->currentIndex()).toString(); + QString value = m_configCapture.kcfg_v4l_alsadevice->itemData(m_configCapture.kcfg_v4l_alsadevice->currentIndex()).toString(); if (value != KdenliveSettings::v4l_alsadevicename()) { KdenliveSettings::setV4l_alsadevicename(value); } - value = m_configCapture.kcfg_rmd_audio_freq->itemText(m_configCapture.kcfg_rmd_audio_freq->currentIndex()); - kDebug() << "// AUDIO FREQ VALUE: " << value << ", CURRENT: " << KdenliveSettings::rmd_freq() << ", IX: " << m_configCapture.kcfg_rmd_audio_freq->currentIndex(); - if (value != KdenliveSettings::rmd_freq()) { - kDebug() << "// SETTING AUDIO FREQ TO: " << value; - KdenliveSettings::setRmd_freq(value); - } - if (m_configSdl.kcfg_external_display->isChecked() != KdenliveSettings::external_display()) { KdenliveSettings::setExternal_display(m_configSdl.kcfg_external_display->isChecked()); resetProfile = true; @@ -727,7 +720,7 @@ void KdenliveSettingsDialog::updateSettings() QString maps = JogShuttleConfig::actionMap(actions); //fprintf(stderr, "Shuttle config: %s\n", JogShuttleConfig::actionMap(actions).toAscii().constData()); if (KdenliveSettings::shuttlebuttons() != maps) - KdenliveSettings::setShuttlebuttons(maps); + KdenliveSettings::setShuttlebuttons(maps); #endif KConfigDialog::settingsChangedSlot(); @@ -787,7 +780,7 @@ void KdenliveSettingsDialog::saveTranscodeProfiles() // read the entries transConfig.deleteGroup(); int max = m_configTranscode.profiles_list->count(); - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { QListWidgetItem *item = m_configTranscode.profiles_list->item(i); transConfig.writeEntry(item->text(), item->data(Qt::UserRole).toString()); } @@ -804,7 +797,7 @@ void KdenliveSettingsDialog::slotAddTranscode() QString data = m_configTranscode.profile_parameters->toPlainText(); data.append(" %1." + m_configTranscode.profile_extension->text()); data.append(';'); - if (!m_configTranscode.profile_description->text().isEmpty()) + if (!m_configTranscode.profile_description->text().isEmpty()) data.append(m_configTranscode.profile_description->text()); if (m_configTranscode.profile_audioonly->isChecked()) data.append(";audio"); item->setData(Qt::UserRole, data); @@ -915,7 +908,7 @@ void KdenliveSettingsDialog::slotUpdatev4lDevice() QString itemSize; QString pixelFormat; QStringList itemRates; - for (int i = 0; i < pixelformats.count(); i++) { + for (int i = 0; i < pixelformats.count(); ++i) { QString format = pixelformats.at(i).section(':', 0, 0); QStringList sizes = pixelformats.at(i).split(':', QString::SkipEmptyParts); pixelFormat = sizes.takeFirst(); @@ -999,8 +992,7 @@ void KdenliveSettingsDialog::slotManageEncodingProfile() { int type = 0; if (currentPage() == m_page4) { - if (m_configCapture.tabWidget->currentIndex() == 1) type = 1; - else if (m_configCapture.tabWidget->currentIndex() == 3) type = 2; + type = m_configCapture.tabWidget->currentIndex(); } QPointer d = new EncodingProfilesDialog(type); d->exec(); @@ -1010,7 +1002,7 @@ void KdenliveSettingsDialog::slotManageEncodingProfile() void KdenliveSettingsDialog::loadEncodingProfiles() { - KConfig conf("encodingprofiles.rc", KConfig::FullConfig, "appdata"); + KConfig conf("encodingprofiles.rc", KConfig::CascadeConfig, "appdata"); // Load v4l profiles m_configCapture.kcfg_v4l_profile->blockSignals(true); @@ -1025,17 +1017,31 @@ void KdenliveSettingsDialog::loadEncodingProfiles() } m_configCapture.kcfg_v4l_profile->blockSignals(false); if (!currentItem.isEmpty()) m_configCapture.kcfg_v4l_profile->setCurrentIndex(m_configCapture.kcfg_v4l_profile->findText(currentItem)); + + // Load Screen Grab profiles + m_configCapture.kcfg_grab_profile->blockSignals(true); + currentItem = m_configCapture.kcfg_grab_profile->currentText(); + m_configCapture.kcfg_grab_profile->clear(); + KConfigGroup group2(&conf, "screengrab"); + values = group2.entryMap(); + QMapIterator j(values); + while (j.hasNext()) { + j.next(); + if (!j.key().isEmpty()) m_configCapture.kcfg_grab_profile->addItem(j.key(), j.value()); + } + m_configCapture.kcfg_grab_profile->blockSignals(false); + if (!currentItem.isEmpty()) m_configCapture.kcfg_grab_profile->setCurrentIndex(m_configCapture.kcfg_grab_profile->findText(currentItem)); // Load Decklink profiles m_configCapture.kcfg_decklink_profile->blockSignals(true); currentItem = m_configCapture.kcfg_decklink_profile->currentText(); m_configCapture.kcfg_decklink_profile->clear(); - KConfigGroup group2(&conf, "decklink"); - values = group2.entryMap(); - QMapIterator j(values); - while (j.hasNext()) { - j.next(); - if (!j.key().isEmpty()) m_configCapture.kcfg_decklink_profile->addItem(j.key(), j.value()); + KConfigGroup group3(&conf, "decklink"); + values = group3.entryMap(); + QMapIterator k(values); + while (k.hasNext()) { + k.next(); + if (!k.key().isEmpty()) m_configCapture.kcfg_decklink_profile->addItem(k.key(), k.value()); } m_configCapture.kcfg_decklink_profile->blockSignals(false); if (!currentItem.isEmpty()) m_configCapture.kcfg_decklink_profile->setCurrentIndex(m_configCapture.kcfg_decklink_profile->findText(currentItem)); @@ -1044,12 +1050,12 @@ void KdenliveSettingsDialog::loadEncodingProfiles() m_configProject.kcfg_proxy_profile->blockSignals(true); currentItem = m_configProject.kcfg_proxy_profile->currentText(); m_configProject.kcfg_proxy_profile->clear(); - KConfigGroup group3(&conf, "proxy"); - values = group3.entryMap(); - QMapIterator k(values); - while (k.hasNext()) { - k.next(); - if (!k.key().isEmpty()) m_configProject.kcfg_proxy_profile->addItem(k.key(), k.value()); + KConfigGroup group4(&conf, "proxy"); + values = group4.entryMap(); + QMapIterator l(values); + while (l.hasNext()) { + l.next(); + if (!l.key().isEmpty()) m_configProject.kcfg_proxy_profile->addItem(l.key(), l.value()); } if (!currentItem.isEmpty()) m_configProject.kcfg_proxy_profile->setCurrentIndex(m_configProject.kcfg_proxy_profile->findText(currentItem)); m_configProject.kcfg_proxy_profile->blockSignals(false); @@ -1077,6 +1083,16 @@ void KdenliveSettingsDialog::slotUpdateV4lProfile(int ix) // } +void KdenliveSettingsDialog::slotUpdateGrabProfile(int ix) +{ + if (ix == -1) ix = KdenliveSettings::grab_profile(); + else ix = m_configCapture.kcfg_grab_profile->currentIndex(); + QString data = m_configCapture.kcfg_grab_profile->itemData(ix).toString(); + if (data.isEmpty()) return; + m_configCapture.grab_parameters->setPlainText(data.section(';', 0, 0)); + // +} + void KdenliveSettingsDialog::slotUpdateProxyProfile(int ix) { if (ix == -1) ix = KdenliveSettings::v4l_profile(); @@ -1098,7 +1114,15 @@ void KdenliveSettingsDialog::slotEditVideo4LinuxProfile() delete w; } - +void KdenliveSettingsDialog::slotReloadBlackMagic() +{ + Render::getBlackMagicDeviceList(m_configCapture.kcfg_decklink_capturedevice, true); + if (!Render::getBlackMagicOutputDeviceList(m_configSdl.kcfg_blackmagic_output_device), true) { + // No blackmagic card found + m_configSdl.kcfg_external_display->setEnabled(false); + } + m_configSdl.kcfg_external_display->setEnabled(KdenliveSettings::decklink_device_found()); +} #include "kdenlivesettingsdialog.moc"