Make jog shuttle buttons work, based on patch from P. Fleury,

[kdenlive] / src / clipproperties.cpp

diff --git a/src/clipproperties.cpp b/src/clipproperties.cpp
index 202d79d5da74bfd17f6d270675ed63397d8b70fa..d75400fa8bff16a301d9944cbd5facf0b2db8b17 100644 (file)
--- a/src/clipproperties.cpp
+++ b/src/clipproperties.cpp
@@ -62,13 +62,40 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg
     m_view.clip_force_out->setHidden(true);
     m_view.clip_out->setHidden(true);
 
-    if (props.contains("force_aspect_ratio") && props.value("force_aspect_ratio").toDouble() > 0) {
+    // New display aspect ratio support
+    if (props.contains("force_aspect_num") && props.value("force_aspect_num").toInt() > 0 &&
+        props.contains("force_aspect_den") && props.value("force_aspect_den").toInt() > 0) {
         m_view.clip_force_ar->setChecked(true);
-        m_view.clip_ar->setEnabled(true);
-        m_view.clip_ar->setValue(props.value("force_aspect_ratio").toDouble());
-    } else if (props.contains("aspect_ratio")) m_view.clip_ar->setValue(props.value("aspect_ratio").toDouble());
+        m_view.clip_ar_num->setEnabled(true);
+        m_view.clip_ar_den->setEnabled(true);
+        m_view.clip_ar_num->setValue(props.value("force_aspect_num").toInt());
+        m_view.clip_ar_den->setValue(props.value("force_aspect_den").toInt());
+    }
+    // Legacy support for pixel aspect ratio
+    else if (props.contains("force_aspect_ratio") && props.value("force_aspect_ratio").toDouble() > 0) {
+        m_view.clip_force_ar->setChecked(true);
+        m_view.clip_ar_num->setEnabled(true);
+        m_view.clip_ar_den->setEnabled(true);
+        if (props.contains("frame_size")) {
+            int width = props.value("force_aspect_ratio").toDouble() * props.value("frame_size").section('x', 0, 0).toInt();
+            int height = props.value("frame_size").section('x', 1, 1).toInt();
+            if (width > 0 && height > 0) {
+                if ((width / height * 100) == 133) {
+                    width = 4;
+                    height = 3;
+                }
+                else if (int(width / height * 100) == 177) {
+                    width = 16;
+                    height = 9;
+                }
+                m_view.clip_ar_num->setValue(width);
+                m_view.clip_ar_den->setValue(height);
+            }
+        }
+    }
     connect(m_view.clip_force_ar, SIGNAL(toggled(bool)), this, SLOT(slotModified()));
-    connect(m_view.clip_ar, SIGNAL(valueChanged(double)), this, SLOT(slotModified()));
+    connect(m_view.clip_ar_num, SIGNAL(valueChanged(int)), this, SLOT(slotModified()));
+    connect(m_view.clip_ar_den, SIGNAL(valueChanged(int)), this, SLOT(slotModified()));
 
     if (props.contains("force_fps") && props.value("force_fps").toDouble() > 0) {
         m_view.clip_force_framerate->setChecked(true);
@@ -86,6 +113,16 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg
     connect(m_view.clip_force_progressive, SIGNAL(toggled(bool)), this, SLOT(slotModified()));
     connect(m_view.clip_progressive, SIGNAL(valueChanged(int)), this, SLOT(slotModified()));
 
+    m_view.clip_fieldorder->addItem(i18n("Bottom first"), 0);
+    m_view.clip_fieldorder->addItem(i18n("Top first"), 1);
+    if (props.contains("force_tff")) {
+        m_view.clip_force_fieldorder->setChecked(true);
+        m_view.clip_fieldorder->setEnabled(true);
+        m_view.clip_fieldorder->setCurrentIndex(props.value("force_tff").toInt());
+    }
+    connect(m_view.clip_force_fieldorder, SIGNAL(toggled(bool)), this, SLOT(slotModified()));
+    connect(m_view.clip_fieldorder, SIGNAL(currentIndexChanged(int)), this, SLOT(slotModified()));
+    
     if (props.contains("threads") && props.value("threads").toInt() != 1) {
         m_view.clip_force_threads->setChecked(true);
         m_view.clip_threads->setEnabled(true);
@@ -146,9 +183,11 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg
         ++i;
     }
 
-    connect(m_view.clip_force_ar, SIGNAL(toggled(bool)), m_view.clip_ar, SLOT(setEnabled(bool)));
+    connect(m_view.clip_force_ar, SIGNAL(toggled(bool)), m_view.clip_ar_num, SLOT(setEnabled(bool)));
+    connect(m_view.clip_force_ar, SIGNAL(toggled(bool)), m_view.clip_ar_den, SLOT(setEnabled(bool)));
     connect(m_view.clip_force_framerate, SIGNAL(toggled(bool)), m_view.clip_framerate, SLOT(setEnabled(bool)));
     connect(m_view.clip_force_progressive, SIGNAL(toggled(bool)), m_view.clip_progressive, SLOT(setEnabled(bool)));
+    connect(m_view.clip_force_fieldorder, SIGNAL(toggled(bool)), m_view.clip_fieldorder, SLOT(setEnabled(bool)));
     connect(m_view.clip_force_threads, SIGNAL(toggled(bool)), m_view.clip_threads, SLOT(setEnabled(bool)));
     connect(m_view.clip_force_vindex, SIGNAL(toggled(bool)), m_view.clip_vindex, SLOT(setEnabled(bool)));
     connect(m_view.clip_force_aindex, SIGNAL(toggled(bool)), m_view.clip_aindex, SLOT(setEnabled(bool)));
@@ -221,6 +260,7 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg
         m_view.image_type->addItem("BMP (*.bmp)", "bmp");
         m_view.image_type->addItem("GIF (*.gif)", "gif");
         m_view.image_type->addItem("TGA (*.tga)", "tga");
+        m_view.image_type->addItem("TIF (*.tif)", "tif");
         m_view.image_type->addItem("TIFF (*.tiff)", "tiff");
         m_view.image_type->addItem("Open EXR (*.exr)", "exr");
         m_view.animation->addItem(i18n("None"), QString());
@@ -249,7 +289,7 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg
         }
         m_view.slide_duration->setText(tc.getTimecodeFromFrames(props.value("ttl").toInt()));
 
-        m_view.slide_duration_format->addItem(i18n("hh:mm:ss::ff"));
+        m_view.slide_duration_format->addItem(i18n("hh:mm:ss:ff"));
         m_view.slide_duration_format->addItem(i18n("Frames"));
         connect(m_view.slide_duration_format, SIGNAL(activated(int)), this, SLOT(slotUpdateDurationFormat(int)));
         m_view.slide_duration_frames->setHidden(true);
@@ -401,10 +441,12 @@ ClipProperties::ClipProperties(QList <DocClipBase *>cliplist, Timecode tc, QMap
     QMap <QString, QString> props = cliplist.at(0)->properties();
     m_old_props = commonproperties;
 
-    if (commonproperties.contains("force_aspect_ratio") && !commonproperties.value("force_aspect_ratio").isEmpty() && commonproperties.value("force_aspect_ratio").toDouble() > 0) {
+    if (commonproperties.contains("force_aspect_num") && !commonproperties.value("force_aspect_num").isEmpty() && commonproperties.value("force_aspect_den").toInt() > 0) {
         m_view.clip_force_ar->setChecked(true);
-        m_view.clip_ar->setEnabled(true);
-        m_view.clip_ar->setValue(commonproperties.value("force_aspect_ratio").toDouble());
+        m_view.clip_ar_num->setEnabled(true);
+        m_view.clip_ar_den->setEnabled(true);
+        m_view.clip_ar_num->setValue(commonproperties.value("force_aspect_num").toInt());
+        m_view.clip_ar_den->setValue(commonproperties.value("force_aspect_den").toInt());
     }
 
     if (commonproperties.contains("force_fps") && !commonproperties.value("force_fps").isEmpty() && commonproperties.value("force_fps").toDouble() > 0) {
@@ -419,6 +461,12 @@ ClipProperties::ClipProperties(QList <DocClipBase *>cliplist, Timecode tc, QMap
         m_view.clip_progressive->setValue(commonproperties.value("force_progressive").toInt());
     }
 
+    if (commonproperties.contains("force_tff") && !commonproperties.value("force_tff").isEmpty()) {
+        m_view.clip_force_fieldorder->setChecked(true);
+        m_view.clip_fieldorder->setEnabled(true);
+        m_view.clip_fieldorder->setCurrentIndex(commonproperties.value("force_tff").toInt());
+    }
+    
     if (commonproperties.contains("threads") && !commonproperties.value("threads").isEmpty() && commonproperties.value("threads").toInt() != 1) {
         m_view.clip_force_threads->setChecked(true);
         m_view.clip_threads->setEnabled(true);
@@ -455,7 +503,8 @@ ClipProperties::ClipProperties(QList <DocClipBase *>cliplist, Timecode tc, QMap
         m_view.clip_full_luma->setChecked(true);
     }
 
-    connect(m_view.clip_force_ar, SIGNAL(toggled(bool)), m_view.clip_ar, SLOT(setEnabled(bool)));
+    connect(m_view.clip_force_ar, SIGNAL(toggled(bool)), m_view.clip_ar_num, SLOT(setEnabled(bool)));
+    connect(m_view.clip_force_ar, SIGNAL(toggled(bool)), m_view.clip_ar_den, SLOT(setEnabled(bool)));
     connect(m_view.clip_force_progressive, SIGNAL(toggled(bool)), m_view.clip_progressive, SLOT(setEnabled(bool)));
     connect(m_view.clip_force_threads, SIGNAL(toggled(bool)), m_view.clip_threads, SLOT(setEnabled(bool)));
     connect(m_view.clip_force_vindex, SIGNAL(toggled(bool)), m_view.clip_vindex, SLOT(setEnabled(bool)));
@@ -604,15 +653,25 @@ QMap <QString, QString> ClipProperties::properties()
         m_old_props = m_clip->properties();
     }
 
-    double aspect = m_view.clip_ar->value();
+    int aspectNumerator = m_view.clip_ar_num->value();
+    int aspectDenominator = m_view.clip_ar_den->value();
     if (m_view.clip_force_ar->isChecked()) {
-        if (aspect != m_old_props.value("force_aspect_ratio").toDouble()) {
-            props["force_aspect_ratio"] = QString::number(aspect);
+        if (aspectNumerator != m_old_props.value("force_aspect_num").toInt() ||
+            aspectDenominator != m_old_props.value("force_aspect_den").toInt()) {
+            props["force_aspect_num"] = QString::number(aspectNumerator);
+            props["force_aspect_den"] = QString::number(aspectDenominator);
+            props["force_aspect_ratio"].clear();
+            m_clipNeedsRefresh = true;
+        }
+    } else {
+        if (m_old_props.contains("force_aspect_num")) {
+            props["force_aspect_num"].clear();
+            m_clipNeedsRefresh = true;
+        }
+        if (m_old_props.contains("force_aspect_den")) {
+            props["force_aspect_den"].clear();
             m_clipNeedsRefresh = true;
         }
-    } else if (m_old_props.contains("force_aspect_ratio")) {
-        props["force_aspect_ratio"].clear();
-        m_clipNeedsRefresh = true;
     }
 
     double fps = m_view.clip_framerate->value();
@@ -635,6 +694,15 @@ QMap <QString, QString> ClipProperties::properties()
         props["force_progressive"].clear();
     }
 
+    int fieldOrder = m_view.clip_fieldorder->currentIndex();
+    if (m_view.clip_force_fieldorder->isChecked()) {
+        if (fieldOrder != m_old_props.value("force_tff").toInt()) {
+            props["force_tff"] = QString::number(fieldOrder);
+        }
+    } else if (m_old_props.contains("force_tff")) {
+        props["force_tff"].clear();
+    }
+
     int threads = m_view.clip_threads->value();
     if (m_view.clip_force_threads->isChecked()) {
         if (threads != m_old_props.value("threads").toInt()) {