Fix guide snapping & stop animations on timeline zooming

[kdenlive] / src / renderer.h

diff --git a/src/renderer.h b/src/renderer.h
index fa157c606372de6fa473cfb1946cb8e148f3f568..1bdcba40c0352459fa358b334849dbe6089b3a43 100644 (file)
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -93,7 +93,7 @@ Q_OBJECT public:
     void setSceneList(QDomDocument list, int position = 0);
     void setSceneList(QString playlist, int position = 0);
     QString sceneList();
-    void saveSceneList(QString path, QDomElement addedXml = QDomElement());
+    void saveSceneList(QString path, QDomElement kdenliveData = QDomElement());
 
     /** Wraps the VEML command of the same name. Tells the renderer to
     play the current scene at the speed specified, relative to normal
@@ -142,9 +142,12 @@ Q_OBJECT public:
     void refreshDisplay();
     int resetProfile(QString profile);
     const double fps() const;
+    const int renderWidth() const;
+    const int renderHeight() const;
 
     /** Playlist manipulation */
     void mltInsertClip(int track, GenTime position, QDomElement element);
+    void mltUpdateClip(int track, GenTime position, QDomElement element);
     void mltCutClip(int track, GenTime position);
     void mltResizeClipEnd(int track, GenTime pos, GenTime in, GenTime out);
     void mltResizeClipStart(int track, GenTime pos, GenTime moveEnd, GenTime moveStart, GenTime in, GenTime out);
@@ -154,8 +157,9 @@ Q_OBJECT public:
     void mltRemoveEffect(int track, GenTime position, QString index, bool doRefresh = true);
     void mltAddEffect(int track, GenTime position, QMap <QString, QString> args, bool doRefresh = true);
     void mltEditEffect(int track, GenTime position, QMap <QString, QString> args);
+    void mltMoveEffect(int track, GenTime position, int oldPos, int newPos);
     void mltChangeTrackState(int track, bool mute, bool blind);
-    void mltMoveTransition(QString type, int startTrack, int trackOffset, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut);
+    void mltMoveTransition(QString type, int startTrack,  int newTrack, int newTransitionTrack, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut);
     void mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool refresh = true);
     void mltDeleteTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool refresh = true);
     void mltUpdateTransition(QString oldTag, QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml);
@@ -196,9 +200,6 @@ private:   // Private attributes & methods
     void setDescription(const QString & description);
     void closeMlt();
     void mltCheckLength(bool reload = true);
-    Mlt::Tractor* getTractor();
-    Mlt::Playlist* getPlaylist(int track);
-    void replaceTimelineTractor(Mlt::Tractor t);
     QMap<QString, QString> mltGetTransitionParamsFromXml(QDomElement xml);
 
 private slots:  // Private slots