Fix transition moving (still crashing a lot)

[kdenlive] / src / renderer.h

diff --git a/src/renderer.h b/src/renderer.h
index 90e40b0ee4571b4576c79feea8243b5d638a2af6..5a46e06bb5fde28eca36c0110aa05c5951c05584 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 -
@@ -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();
@@ -158,9 +156,9 @@ Q_OBJECT public:
     void mltEditEffect(int track, GenTime position, QMap <QString, QString> args);
     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 oldTag, QString tag, int a_track, int b_track, GenTime in, GenTime out, QMap <QString, QString> args);
+    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);
 
 
 private:   // Private attributes & methods
@@ -197,8 +195,8 @@ private:   // Private attributes & methods
     void setDescription(const QString & description);
     void closeMlt();
     void mltCheckLength();
-    mlt_tractor getTractor();
-    mlt_playlist getPlaylist(int track);
+    Mlt::Tractor* getTractor();
+    Mlt::Playlist* getPlaylist(int track);
     void replaceTimelineTractor(Mlt::Tractor t);
 private slots:  // Private slots
     /** refresh monitor display */