Fix #227 jittery behavior, and do not scrub/refresh when trim in on

timeline.
mltframework · Apr 24, 2016 · 8f25da7 · 8f25da7
1 parent c9ecc29
commit 8f25da7
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 15 deletions.
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -274,6 +274,7 @@ MainWindow::MainWindow()
     connect(m_timelineDock->model(), SIGNAL(closed()), SLOT(onMultitrackClosed()));
     connect(m_timelineDock->model(), SIGNAL(modified()), SLOT(onMultitrackModified()));
     connect(m_timelineDock->model(), SIGNAL(modified()), SLOT(updateAutoSave()));
+    connect(m_timelineDock->model(), SIGNAL(durationChanged()), SLOT(onMultitrackDurationChanged()));
     connect(m_timelineDock, SIGNAL(clipOpened(void*)), SLOT(openCut(void*)));
     connect(m_timelineDock->model(), SIGNAL(seeked(int)), SLOT(seekTimeline(int)));
     connect(m_playlistDock, SIGNAL(addAllTimeline(Mlt::Playlist*)), SLOT(onTimelineDockTriggered()));
@@ -2033,7 +2034,7 @@ void MainWindow::onPlaylistModified()
 {
     setWindowModified(true);
     if (MLT.producer() && playlist() && (void*) MLT.producer()->get_producer() == (void*) playlist()->get_playlist())
-        m_player->onProducerModified();
+        m_player->onDurationChanged();
     updateMarkers();
     m_player->enableTab(Player::ProjectTabIndex, true);
 }
@@ -2058,9 +2059,12 @@ void MainWindow::onMultitrackClosed()
 void MainWindow::onMultitrackModified()
 {
     setWindowModified(true);
+}
+
+void MainWindow::onMultitrackDurationChanged()
+{
     if (MLT.producer() && (void*) MLT.producer()->get_producer() == (void*) multitrack()->get_producer())
-        m_player->onProducerModified();
-    updateMarkers();
+        m_player->onDurationChanged();
 }
 
 void MainWindow::onCutModified()

diff --git a/src/mainwindow.h b/src/mainwindow.h
@@ -184,6 +184,7 @@ private slots:
     void onMultitrackCreated();
     void onMultitrackClosed();
     void onMultitrackModified();
+    void onMultitrackDurationChanged();
     void onCutModified();
     void onFilterModelChanged();
     void updateMarkers();

diff --git a/src/models/multitrackmodel.cpp b/src/models/multitrackmodel.cpp
@@ -1789,8 +1789,7 @@ void MultitrackModel::addTransitionByTrimIn(int trackIndex, int clipIndex, int d
         } else if (m_isMakingTransition) {
             // Adjust a transition addition already in progress.
             // m_isMakingTransition will be set false when mouse button released via notifyClipOut().
-            delta = playlist.clip_start(clipIndex - 1) - (playlist.clip_start(clipIndex) + delta);
-            trimTransitionIn(trackIndex, clipIndex - 2, delta);
+            trimTransitionIn(trackIndex, clipIndex - 2, -delta);
         }
     }
 }
@@ -2156,11 +2155,14 @@ void MultitrackModel::adjustBackgroundDuration()
         Mlt::Playlist playlist(*track);
         Mlt::Producer* clip = playlist.get_clip(0);
         if (clip) {
-            clip->parent().set("length", n);
-            clip->parent().set_in_and_out(0, n - 1);
-            clip->set("length", n);
-            clip->set_in_and_out(0, n - 1);
-            playlist.resize_clip(0, 0, n - 1);
+            if (n != clip->parent().get_length()) {
+                clip->parent().set("length", n);
+                clip->parent().set_in_and_out(0, n - 1);
+                clip->set("length", n);
+                clip->set_in_and_out(0, n - 1);
+                playlist.resize_clip(0, 0, n - 1);
+                emit durationChanged();
+            }
             delete clip;
         }
         delete track;

diff --git a/src/models/multitrackmodel.h b/src/models/multitrackmodel.h
@@ -114,6 +114,7 @@ class MultitrackModel : public QAbstractItemModel
     void trackHeightChanged();
     void scaleFactorChanged();
     void showStatusMessage(QString);
+    void durationChanged();
 
 public slots:
     void refreshTrackList();

diff --git a/src/player.cpp b/src/player.cpp
@@ -506,7 +506,7 @@ void Player::onMeltedUnitOpened()
     setFocus();
 }
 
-void Player::onProducerModified()
+void Player::onDurationChanged()
 {
     m_duration = MLT.producer()->get_length();
     m_isSeekable = MLT.isSeekable();

diff --git a/src/player.h b/src/player.h
@@ -88,7 +88,7 @@ public slots:
     void onProducerOpened(bool play = true);
     void postProducerOpened();
     void onMeltedUnitOpened();
-    void onProducerModified();
+    void onDurationChanged();
     void onShowFrame(int position, double fps, int in, int out, int length, bool isPlaying);
     void onFrameDisplayed(const SharedFrame& frame);
     void onVolumeChanged(int);

diff --git a/src/qml/timeline/Clip.qml b/src/qml/timeline/Clip.qml
@@ -482,11 +482,11 @@ Rectangle {
             cursorShape: Qt.SizeHorCursor
             drag.target: parent
             drag.axis: Drag.XAxis
-            property int startX
+            property double startX
 
             onPressed: {
                 root.stopScrolling = true
-                startX = parent.x
+                startX = mapToItem(null, x, y).x
                 originalX = 0 // reusing originalX to accumulate delta for bubble help
                 parent.anchors.left = undefined
             }
@@ -498,11 +498,13 @@ Rectangle {
             }
             onPositionChanged: {
                 if (mouse.buttons === Qt.LeftButton) {
-                    var delta = Math.round((parent.x - startX) / timeScale)
+                    var newX = mapToItem(null, x, y).x
+                    var delta = Math.round((newX - startX) / timeScale)
                     if (Math.abs(delta) > 0) {
                         if (clipDuration + originalX + delta > 0)
                             originalX += delta
                         clipRoot.trimmingIn(clipRoot, delta, mouse)
+                        startX = newX
                     }
                 }
             }