Add automatic scene split (requires MLT patch): http://kdenlive.org/mantis/view.php...

[kdenlive] / src / geometrywidget.cpp

diff --git a/src/geometrywidget.cpp b/src/geometrywidget.cpp
index b75909a3fc4d3fa34ac7d0639fc2c83708d20581..0dbd932c947a9e9fd6a3ac6d3ed460ef6b2f952a 100644 (file)
--- a/src/geometrywidget.cpp
+++ b/src/geometrywidget.cpp
@@ -57,7 +57,7 @@ GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos,
     edit->removeCustomControls();
     edit->addCustomButton(KIcon("transform-crop"), i18n("Show previous keyframe"), this, SLOT(slotShowPreviousKeyFrame(bool)), true, KdenliveSettings::onmonitoreffects_geometryshowprevious());
     m_scene = edit->getScene();
-
+    m_scene->cleanup();
 
     /*
         Setup of timeline and keyframe controls
@@ -88,7 +88,7 @@ GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos,
     m_ui.buttonSync->setChecked(KdenliveSettings::transitionfollowcursor());
     m_ui.buttonSync->setIconSize(iconSize);
 
-    connect(m_timeline, SIGNAL(positionChanged(int)), this, SLOT(slotPositionChanged(int)));
+    connect(m_timeline, SIGNAL(requestSeek(int)), this, SLOT(slotRequestSeek(int)));
     connect(m_timeline, SIGNAL(keyframeMoved(int)),   this, SLOT(slotKeyframeMoved(int)));
     connect(m_timeline, SIGNAL(addKeyframe(int)),     this, SLOT(slotAddKeyframe(int)));
     connect(m_timeline, SIGNAL(removeKeyframe(int)),  this, SLOT(slotDeleteKeyframe(int)));
@@ -110,6 +110,8 @@ GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos,
     m_spinHeight = new DragValue(i18nc("Frame height", "H"), m_monitor->render->renderHeight(), 0, 1, 99000, -1, QString(), false, this);
     m_ui.horizontalLayout->addWidget(m_spinHeight, 0, 3);
 
+    m_ui.horizontalLayout->setColumnStretch(4, 10);
+
     QMenu *menu = new QMenu(this);
     QAction *adjustSize = new QAction(i18n("Adjust to original size"), this);
     connect(adjustSize, SIGNAL(triggered()), this, SLOT(slotAdjustToFrameSize()));
@@ -209,7 +211,7 @@ GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos,
     connect(m_spinWidth,        SIGNAL(valueChanged(double)), this, SLOT(slotSetWidth(double)));
     connect(m_spinHeight,       SIGNAL(valueChanged(double)), this, SLOT(slotSetHeight(double)));
 
-    connect(m_spinSize,         SIGNAL(valueChanged(double)), this, SLOT(slotResize(double)));
+    connect(m_spinSize, SIGNAL(valueChanged(double)), this, SLOT(slotResize(double)));
 
     connect(m_opacity, SIGNAL(valueChanged(double)), this, SLOT(slotSetOpacity(double)));
     
@@ -276,7 +278,7 @@ QString GeometryWidget::getExtraValue(const QString &name) const
         QStringList list = val.split(';', QString::SkipEmptyParts);
         val.clear();
         val.append(list.takeFirst().section('/', 0, 0));
-        foreach (const QString value, list) {
+        foreach (const QString &value, list) {
             val.append(';' + value.section('/', 0, 0));
         }
     }
@@ -287,7 +289,6 @@ void GeometryWidget::setupParam(const QDomElement elem, int minframe, int maxfra
 {
     m_inPoint = minframe;
     m_outPoint = maxframe;
-    m_scene->cleanup();
 
     if (m_geometry)
         m_geometry->parse(elem.attribute("value").toUtf8().data(), maxframe - minframe, m_monitor->render->frameRenderWidth(), m_monitor->render->renderHeight());
@@ -343,6 +344,12 @@ void GeometryWidget::slotSyncPosition(int relTimelinePos)
     }
 }
 
+void GeometryWidget::slotRequestSeek(int pos)
+{
+    if (KdenliveSettings::transitionfollowcursor())
+        emit seekToPos(m_clipPos + pos);
+}
+
 
 void GeometryWidget::slotPositionChanged(int pos, bool seek)
 {
@@ -351,9 +358,9 @@ void GeometryWidget::slotPositionChanged(int pos, bool seek)
     else
         m_timePos->setValue(pos);
 
-    m_timeline->blockSignals(true);
+    //m_timeline->blockSignals(true);
     m_timeline->setValue(pos);
-    m_timeline->blockSignals(false);
+    //m_timeline->blockSignals(false);
 
     Mlt::GeometryItem item;
     Mlt::GeometryItem previousItem;