Less debug

[kdenlive] / src / clipproperties.cpp

diff --git a/src/clipproperties.cpp b/src/clipproperties.cpp
index 616ce400f53c091c76c137dbc4e3138a9581a097..d1adbba1ccb4bb5ed61e1b12ab0a21d9bcbfa791 100644 (file)
--- a/src/clipproperties.cpp
+++ b/src/clipproperties.cpp
@@ -48,13 +48,44 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg
     m_view.clip_path->setText(url.path());
     m_view.clip_description->setText(m_clip->description());
     QMap <QString, QString> props = m_clip->properties();
-    // disable advanced properties until implemented
-    //m_view.tabWidget->widget(ADVANCEDTAB)->setEnabled(false);
+
     if (props.contains("force_aspect_ratio") && props.value("force_aspect_ratio").toDouble() > 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());
     }
 
+    if (props.contains("threads") && props.value("threads").toInt() != 1) {
+        m_view.clip_force_threads->setChecked(true);
+        m_view.clip_threads->setEnabled(true);
+        m_view.clip_threads->setValue(props.value("threads").toInt());
+    }
+
+    if (props.contains("video_index") && props.value("video_index").toInt() != 0) {
+        m_view.clip_force_vindex->setChecked(true);
+        m_view.clip_vindex->setEnabled(true);
+        m_view.clip_vindex->setValue(props.value("video_index").toInt());
+    }
+
+    if (props.contains("audio_index") && props.value("audio_index").toInt() != 0) {
+        m_view.clip_force_aindex->setChecked(true);
+        m_view.clip_aindex->setEnabled(true);
+        m_view.clip_aindex->setValue(props.value("audio_index").toInt());
+    }
+
+    if (props.contains("audio_max")) {
+        m_view.clip_aindex->setMaximum(props.value("audio_max").toInt());
+    }
+
+    if (props.contains("video_max")) {
+        m_view.clip_vindex->setMaximum(props.value("video_max").toInt());
+    }
+
+    connect(m_view.clip_force_ar, SIGNAL(toggled(bool)), m_view.clip_ar, 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)));
+
     if (props.contains("audiocodec"))
         m_view.clip_acodec->setText(props.value("audiocodec"));
     if (props.contains("frequency"))
@@ -63,6 +94,14 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg
         m_view.clip_channels->setText(props.value("channels"));
 
     CLIPTYPE t = m_clip->clipType();
+    if (t != AUDIO && t != AV) {
+        m_view.clip_force_aindex->setEnabled(false);
+    }
+
+    if (t != VIDEO && t != AV) {
+        m_view.clip_force_vindex->setEnabled(false);
+    }
+
     if (t == IMAGE) {
         m_view.tabWidget->removeTab(SLIDETAB);
         m_view.tabWidget->removeTab(COLORTAB);
@@ -147,11 +186,12 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg
         m_view.tabWidget->removeTab(VIDEOTAB);
         m_view.clip_thumb->setHidden(true);
     }
-    if (t != IMAGE && t != COLOR && t != TEXT) m_view.clip_duration->setReadOnly(true);
 
     KFileItem f(KFileItem::Unknown, KFileItem::Unknown, url, true);
     m_view.clip_filesize->setText(KIO::convertSize(f.size()));
     m_view.clip_duration->setText(tc.getTimecode(m_clip->duration(), m_fps));
+    if (t != IMAGE && t != COLOR && t != TEXT) m_view.clip_duration->setReadOnly(true);
+    else connect(m_view.clip_duration, SIGNAL(editingFinished()), this, SLOT(slotCheckMaxLength()));
 
     // markers
     m_view.marker_new->setIcon(KIcon("document-new"));
@@ -183,7 +223,7 @@ void ClipProperties::slotFillMarkersList() {
 
 void ClipProperties::slotAddMarker() {
     CommentedTime marker(GenTime(), i18n("Marker"));
-    MarkerDialog d(m_clip, marker, m_tc, this);
+    MarkerDialog d(m_clip, marker, m_tc, i18n("Add Marker"), this);
     if (d.exec() == QDialog::Accepted) {
         emit addMarker(m_clip->getId(), d.newMarker().time(), d.newMarker().comment());
     }
@@ -194,7 +234,7 @@ void ClipProperties::slotEditMarker() {
     QList < CommentedTime > marks = m_clip->commentedSnapMarkers();
     int pos = m_view.markers_list->currentIndex().row();
     if (pos < 0 || pos > marks.count() - 1) return;
-    MarkerDialog d(m_clip, marks.at(pos), m_tc, this);
+    MarkerDialog d(m_clip, marks.at(pos), m_tc, i18n("Edit Marker"), this);
     if (d.exec() == QDialog::Accepted) {
         emit addMarker(m_clip->getId(), d.newMarker().time(), d.newMarker().comment());
     }
@@ -217,9 +257,12 @@ const QString &ClipProperties::clipId() const {
 
 QMap <QString, QString> ClipProperties::properties() {
     QMap <QString, QString> props;
-    props["description"] = m_view.clip_description->text();
     CLIPTYPE t = m_clip->clipType();
     QMap <QString, QString> old_props = m_clip->properties();
+
+    if (old_props.value("description") != m_view.clip_description->text())
+        props["description"] = m_view.clip_description->text();
+
     double aspect = m_view.clip_ar->value();
     if (m_view.clip_force_ar->isChecked()) {
         if (aspect != old_props.value("force_aspect_ratio").toDouble()) {
@@ -230,17 +273,53 @@ QMap <QString, QString> ClipProperties::properties() {
         props["force_aspect_ratio"] = QString();
         m_clipNeedsRefresh = true;
     }
+
+    int threads = m_view.clip_threads->value();
+    if (m_view.clip_force_threads->isChecked()) {
+        if (threads != old_props.value("threads").toInt()) {
+            props["threads"] = QString::number(threads);
+        }
+    } else if (old_props.contains("threads")) {
+        props["threads"] = QString();
+    }
+
+    int vindex = m_view.clip_vindex->value();
+    if (m_view.clip_force_vindex->isChecked()) {
+        if (vindex != old_props.value("video_index").toInt()) {
+            props["video_index"] = QString::number(vindex);
+        }
+    } else if (old_props.contains("video_index")) {
+        props["video_index"] = QString();
+    }
+
+    int aindex = m_view.clip_aindex->value();
+    if (m_view.clip_force_aindex->isChecked()) {
+        if (aindex != old_props.value("audio_index").toInt()) {
+            props["audio_index"] = QString::number(aindex);
+        }
+    } else if (old_props.contains("audio_index")) {
+        props["audio_index"] = QString();
+    }
+
     if (t == COLOR) {
         QString new_color = m_view.clip_color->color().name();
         if (new_color != QString("#" + old_props.value("colour").right(8).left(6))) {
             m_clipNeedsRefresh = true;
             props["colour"] = "0x" + new_color.right(6) + "ff";
         }
+        int duration = m_tc.getFrameCount(m_view.clip_duration->text(), m_fps);
+        if (duration != m_clip->duration().frames(m_fps)) {
+            props["out"] = QString::number(duration);
+        }
     } else if (t == IMAGE) {
         if ((int) m_view.image_transparency->isChecked() != old_props.value("transparency").toInt()) {
             props["transparency"] = QString::number((int)m_view.image_transparency->isChecked());
             m_clipNeedsRefresh = true;
         }
+        int duration = m_tc.getFrameCount(m_view.clip_duration->text(), m_fps);
+        if (duration != m_clip->duration().frames(m_fps)) {
+            props["out"] = QString::number(duration);
+        }
     } else if (t == SLIDESHOW) {
         QString value = QString::number((int) m_view.slide_loop->isChecked());
         if (old_props.value("loop") != value) props["loop"] = value;
@@ -345,6 +424,13 @@ void ClipProperties::parseFolder() {
     m_view.clip_thumb->setPixmap(pix);
 }
 
+void ClipProperties::slotCheckMaxLength() {
+    int duration = m_tc.getFrameCount(m_view.clip_duration->text(), m_fps);
+    if (duration > m_clip->maxDuration().frames(m_fps)) {
+        m_view.clip_duration->setText(m_tc.getTimecode(m_clip->maxDuration(), m_fps));
+    }
+}
+
 #include "clipproperties.moc"