Merge branch 'master' into buildsystem

[kdenlive] / src / customtrackscene.cpp

diff --git a/src/customtrackscene.cpp b/src/customtrackscene.cpp
index 13672c1f0c18da2c20e7a8b1330be442961fa952..1f8b40ae2f6de2f45f5e8483aa7c1a149b886aa7 100644 (file)
--- a/src/customtrackscene.cpp
+++ b/src/customtrackscene.cpp
@@ -25,7 +25,8 @@
 CustomTrackScene::CustomTrackScene(KdenliveDoc *doc, QObject *parent) :
         QGraphicsScene(parent),
         m_document(doc),
-        m_scale(1.0, 1.0)
+        m_scale(1.0, 1.0),
+        m_editMode(NORMALEDIT)
 {
 }
 
@@ -54,18 +55,18 @@ void CustomTrackScene::setSnapList(QList <GenTime> snaps)
     m_snapPoints = snaps;
 }
 
-GenTime CustomTrackScene::previousSnapPoint(GenTime pos)
+GenTime CustomTrackScene::previousSnapPoint(GenTime pos) const
 {
     for (int i = 0; i < m_snapPoints.size(); ++i) {
         if (m_snapPoints.at(i) >= pos) {
-            if (i == 0) i = 1;
+            if (i == 0) return GenTime();
             return m_snapPoints.at(i - 1);
         }
     }
     return GenTime();
 }
 
-GenTime CustomTrackScene::nextSnapPoint(GenTime pos)
+GenTime CustomTrackScene::nextSnapPoint(GenTime pos) const
 {
     for (int i = 0; i < m_snapPoints.size(); ++i) {
         if (m_snapPoints.at(i) > pos) {
@@ -96,4 +97,14 @@ MltVideoProfile CustomTrackScene::profile() const
     return m_document->mltProfile();
 }
 
+void CustomTrackScene::setEditMode(EDITMODE mode)
+{
+    m_editMode = mode;
+}
+
+EDITMODE CustomTrackScene::editMode() const
+{
+    return m_editMode;
+}
+
 #include "customtrackscene.moc"