Get rid of buggy "drop B frame" speedup feature

[kdenlive] / src / kdenlivesettingsdialog.cpp

diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp
index 035408a3319f380fefe8e6e61e3f940a12acac08..e997fa76fab527a423d20a99c4f663667a64f854 100644 (file)
--- a/src/kdenlivesettingsdialog.cpp
+++ b/src/kdenlivesettingsdialog.cpp
@@ -82,7 +82,7 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent) :
     QWidget *p4 = new QWidget;
     m_configCapture.setupUi(p4);
 
-#ifndef Q_WS_MAC
+#if !defined(Q_WS_MAC) && !defined(Q_OS_FREEBSD)
     V4lCaptureHandler v4l(NULL);
     // Video 4 Linux device detection
     for (int i = 0; i < 10; i++) {
@@ -122,8 +122,6 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent) :
     QWidget *p6 = new QWidget;
     m_configSdl.setupUi(p6);
 
-    // Disable drop B frames, see Kdenlive issue #1330
-    m_configSdl.groupBox->setHidden(true);
 #if not defined(Q_WS_MAC) && not defined(USE_OPEN_GL)
     m_configSdl.kcfg_openglmonitors->setHidden(true);
 #endif
@@ -537,12 +535,6 @@ void KdenliveSettingsDialog::updateSettings()
         resetProfile = true;
     }
 
-    bool updatePreview = false;
-    if (m_configSdl.kcfg_dropbframes->isChecked() != KdenliveSettings::dropbframes()) {
-        KdenliveSettings::setDropbframes(m_configSdl.kcfg_dropbframes->isChecked());
-        updatePreview = true;
-    }
-
     if (m_modified) {
         // The transcoding profiles were modified, save.
         m_modified = false;
@@ -555,7 +547,6 @@ void KdenliveSettingsDialog::updateSettings()
 
     //KConfigDialog::updateSettings();
     if (resetProfile) emit doResetProfile();
-    if (updatePreview) emit updatePreviewSettings();
 }
 
 void KdenliveSettingsDialog::slotUpdateDisplay()
@@ -649,6 +640,7 @@ void KdenliveSettingsDialog::slotUpdatev4lDevice()
     if (!device.isEmpty()) m_configCapture.kcfg_video4vdevice->setText(device);
     QString size = m_configCapture.kcfg_detectedv4ldevices->itemData(m_configCapture.kcfg_detectedv4ldevices->currentIndex(), Qt::UserRole + 1).toString();
     if (!size.isEmpty()) m_configCapture.kcfg_video4size->setText(size);
+    rebuildVideo4Commands();
 }