X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.h;h=9e6c92d73705ab8ceaf5008a97b9d1bc0d6d5284;hb=7fff167fb95bb6b13b138b8d3f7b68da8a030473;hp=4f0d8427e52e3cb7cf694eb112a0b61bab09295f;hpb=9c59a265a6ded9306fa7afa13b18c96e25d45f77;p=kdenlive

diff --git a/src/renderer.h b/src/renderer.h
index 4f0d8427..9e6c92d7 100644
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -140,7 +140,7 @@ Q_OBJECT public:
 
     /** Turn on or off on screen display */
     void refreshDisplay();
-    int resetProfile(QString profile);
+    int resetProfile();
     const double fps() const;
     const int renderWidth() const;
     const int renderHeight() const;
@@ -151,14 +151,14 @@ Q_OBJECT public:
     void mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod);
     void mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *prod);
     void mltCutClip(int track, GenTime position);
-    void mltResizeClipEnd(int track, GenTime pos, GenTime in, GenTime out);
-    bool mltResizeClipStart(int track, GenTime pos, GenTime moveEnd, GenTime moveStart, GenTime in, GenTime out);
+    bool mltResizeClipEnd(ItemInfo info, GenTime clipDuration);
+    bool mltResizeClipStart(ItemInfo info, GenTime diff);
     bool mltMoveClip(int startTrack, int endTrack, GenTime pos, GenTime moveStart);
     bool mltMoveClip(int startTrack, int endTrack, int pos, int moveStart);
-    void mltRemoveClip(int track, GenTime position);
+    bool mltRemoveClip(int track, GenTime position);
     bool mltRemoveEffect(int track, GenTime position, QString index, bool doRefresh = true);
-    bool mltAddEffect(int track, GenTime position, QMap <QString, QString> args, bool doRefresh = true);
-    bool mltEditEffect(int track, GenTime position, QMap <QString, QString> args);
+    bool mltAddEffect(int track, GenTime position, QHash <QString, QString> args, bool doRefresh = true);
+    bool mltEditEffect(int track, GenTime position, QHash <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 newTrack, int newTransitionTrack, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut);
@@ -172,10 +172,10 @@ Q_OBJECT public:
     void mltResizeTransparency(int oldStart, int newStart, int newEnd, int track, int id);
 
     /** Change speed of a clip in playlist. To do this, we create a new "framebuffer" producer.
-	This new producer must have its "resource" param set to: video.mpg?0.6 where video.mpg is the path
-	to the clip and 0.6 is the speed in percents. The newly created producer will have it's
-	"id" parameter set to: "slowmotion:parentid:speed", where parentid is the id of the original clip
-	in the ClipManager list and speed is the current speed */
+    This new producer must have its "resource" param set to: video.mpg?0.6 where video.mpg is the path
+    to the clip and 0.6 is the speed in percents. The newly created producer will have it's
+    "id" parameter set to: "slowmotion:parentid:speed", where parentid is the id of the original clip
+    in the ClipManager list and speed is the current speed */
     int mltChangeClipSpeed(ItemInfo info, double speed, Mlt::Producer *prod);
 
 private:   // Private attributes & methods
@@ -215,6 +215,7 @@ private:   // Private attributes & methods
     void mltCheckLength(bool reload = true);
     QMap<QString, QString> mltGetTransitionParamsFromXml(QDomElement xml);
     QMap<QString, Mlt::Producer *> m_slowmotionProducers;
+    void buildConsumer();
 
 private slots:  // Private slots
     /** refresh monitor display */
@@ -225,11 +226,11 @@ private slots:  // Private slots
 
 signals:   // Signals
     /** emitted when the renderer recieves a reply to a getFileProperties request. */
-    void replyGetFileProperties(int clipId, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &);
+    void replyGetFileProperties(const QString &clipId, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &);
 
     /** emitted when the renderer recieves a reply to a getImage request. */
-    void replyGetImage(int , int, const QPixmap &, int, int);
-    void replyGetImage(int, const QPixmap &, int, int);
+    void replyGetImage(const QString & , int, const QPixmap &, int, int);
+    void replyGetImage(const QString &, const QPixmap &, int, int);
 
     /** Emitted when the renderer stops, either playing or rendering. */
     void stopped();
@@ -246,7 +247,7 @@ signals:   // Signals
     void durationChanged(int);
     void rendererPosition(int);
     void rendererStopped(int);
-    void removeInvalidClip(int);
+    void removeInvalidClip(const QString &);
 
 public slots:  // Public slots
     /** Start Consumer */
@@ -261,7 +262,7 @@ public slots:  // Public slots
     /** Wraps the VEML command of the same name. Requests the file properties
     for the specified url from the renderer. Upon return, the result will be emitted
     via replyGetFileProperties(). */
-    void getFileProperties(const QDomElement &xml, int clipId);
+    void getFileProperties(const QDomElement &xml, const QString &clipId);
 
     void exportFileToFirewire(QString srcFileName, int port, GenTime startTime, GenTime endTime);
     static char *decodedString(QString str);