Revert commit 5845. The consumer producer does not automatically get invoked.

[kdenlive] / src / customtrackscene.cpp

diff --git a/src/customtrackscene.cpp b/src/customtrackscene.cpp
index 76ae1def2d61c30229b3d34fbbdfd3fd40d0094a..1f8b40ae2f6de2f45f5e8483aa7c1a149b886aa7 100644 (file)
--- a/src/customtrackscene.cpp
+++ b/src/customtrackscene.cpp
@@ -22,10 +22,12 @@
 
 #include <KStandardDirs>
 
-CustomTrackScene::CustomTrackScene(KdenliveDoc *doc, QObject *parent)
-        : QGraphicsScene(parent), m_document(doc), m_scale(1.0)
+CustomTrackScene::CustomTrackScene(KdenliveDoc *doc, QObject *parent) :
+        QGraphicsScene(parent),
+        m_document(doc),
+        m_scale(1.0, 1.0),
+        m_editMode(NORMALEDIT)
 {
-    m_transitionPixmap = QPixmap(KStandardDirs::locate("appdata", "transition.png"));
 }
 
 CustomTrackScene::~CustomTrackScene()
@@ -36,8 +38,8 @@ 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());
@@ -53,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) {
@@ -74,12 +76,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;
 }
@@ -89,4 +92,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"