Fix guide snapping & stop animations on timeline zooming

[kdenlive] / src / renderer.h

diff --git a/src/renderer.h b/src/renderer.h
index 609d953216cc359aedd129dd34e3e63b256dc71b..1bdcba40c0352459fa358b334849dbe6089b3a43 100644 (file)
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -31,8 +31,6 @@
 #include "effectdesc.h"
 #include "effectparamdescfactory.h"*/
 
-#include <mlt++/Mlt.h>
-
 /**Render encapsulates the client side of the interface to a renderer.
 From Kdenlive's point of view, you treat the Render object as the
 renderer, and simply use it as if it was local. Calls are asyncrhonous -
@@ -95,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
@@ -107,7 +105,7 @@ Q_OBJECT public:
     void stop(const GenTime & startTime);
     void setVolume(double volume);
 
-    QPixmap extractFrame(int frame_position, int width, int height);
+    QPixmap extractFrame(int frame_position, int width = -1, int height = -1);
     /** Wraps the VEML command of the same name. Tells the renderer to
     play the current scene at the speed specified, relative to normal
     playback. e.g. 1.0 is normal speed, 0.0 is paused, -1.0 means play
@@ -126,7 +124,7 @@ Q_OBJECT public:
     not playing anything. */
     double playSpeed();
     /** Returns the current seek position of the renderer. */
-    const GenTime & seekPosition() const;
+    GenTime seekPosition() const;
 
     void emitFrameNumber(double position);
     void emitConsumerStopped();
@@ -144,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);
@@ -156,11 +157,13 @@ 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 mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QMap <QString, QString> args);
-    void mltDeleteTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QMap <QString, QString> args);
-    void mltUpdateTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QMap <QString, QString> args);
+    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);
+    void mltUpdateTransitionParams(QString type, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml);
 
 
 private:   // Private attributes & methods
@@ -196,14 +199,15 @@ private:   // Private attributes & methods
     /** Sets the description of this renderer to desc. */
     void setDescription(const QString & description);
     void closeMlt();
-    void mltCheckLength();
+    void mltCheckLength(bool reload = true);
+    QMap<QString, QString> mltGetTransitionParamsFromXml(QDomElement xml);
 
 private slots:  // Private slots
     /** refresh monitor display */
     void refresh();
     void slotOsdTimeout();
     void connectPlaylist();
-    void initSceneList();
+    //void initSceneList();
 
 signals:   // Signals
     /** emitted when the renderer recieves a reply to a getFileProperties request. */