X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackscene.cpp;h=35d12061730a6662a261164e2f3d821869bcfc5d;hb=f69a24d18f8134c93e407ea485967ac31187da47;hp=eff285956c208b1c9dcc54c11ac98f6b9e3a6d47;hpb=5ee798aed90c5a3a50024e6b5bd26753e03ec7cc;p=kdenlive

diff --git a/src/customtrackscene.cpp b/src/customtrackscene.cpp
index eff28595..35d12061 100644
--- a/src/customtrackscene.cpp
+++ b/src/customtrackscene.cpp
@@ -25,9 +25,9 @@
 CustomTrackScene::CustomTrackScene(KdenliveDoc *doc, QObject *parent) :
         QGraphicsScene(parent),
         m_document(doc),
-        m_scale(1.0)
+        m_scale(1.0, 1.0),
+        m_editMode(NormalEdit)
 {
-    m_transitionPixmap = QPixmap(KStandardDirs::locate("appdata", "transition.png"));
 }
 
 CustomTrackScene::~CustomTrackScene()
@@ -38,35 +38,36 @@ double CustomTrackScene::getSnapPointForPos(double pos, bool doSnap)
 {
     double maximumOffset;
     if (doSnap) {
-        if (m_scale > 3) maximumOffset = 10 / m_scale;
-        else maximumOffset = 6 / m_scale;
+        if (m_scale.x() > 3) maximumOffset = 10 / m_scale.x();
+        else maximumOffset = 6 / m_scale.x();
         for (int i = 0; i < m_snapPoints.size(); ++i) {
             if (qAbs((int)(pos - m_snapPoints.at(i).frames(m_document->fps()))) < maximumOffset) {
                 return m_snapPoints.at(i).frames(m_document->fps());
             }
-            if (m_snapPoints.at(i).frames(m_document->fps()) > pos) break;
+            if (m_snapPoints.at(i).frames(m_document->fps()) > pos)
+                break;
         }
     }
     return GenTime(pos, m_document->fps()).frames(m_document->fps());
 }
 
-void CustomTrackScene::setSnapList(QList <GenTime> snaps)
+void CustomTrackScene::setSnapList(const QList <GenTime>& snaps)
 {
     m_snapPoints = snaps;
 }
 
-GenTime CustomTrackScene::previousSnapPoint(GenTime pos)
+GenTime CustomTrackScene::previousSnapPoint(const 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(const GenTime &pos) const
 {
     for (int i = 0; i < m_snapPoints.size(); ++i) {
         if (m_snapPoints.at(i) > pos) {
@@ -76,12 +77,13 @@ GenTime CustomTrackScene::nextSnapPoint(GenTime pos)
     return pos;
 }
 
-void CustomTrackScene::setScale(double scale)
+void CustomTrackScene::setScale(double scale, double vscale)
 {
-    m_scale = scale;
+    m_scale.setX(scale);
+    m_scale.setY(vscale);
 }
 
-double CustomTrackScene::scale() const
+QPointF CustomTrackScene::scale() const
 {
     return m_scale;
 }
@@ -91,4 +93,19 @@ int CustomTrackScene::tracksCount() const
     return m_document->tracksCount();
 }
 
+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"