Cleanup and add mimetype for TGA images, also add EXR, TIFF and TGA to the list of...

[kdenlive] / src / renderer.h

diff --git a/src/renderer.h b/src/renderer.h
index 3940b943ef4b7df6f2b14f783d098e43ad751563..3f3fbe0d8352baad490fbabb0f4886b503ee1bf4 100644 (file)
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -31,7 +31,7 @@
 /**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 -
-you send a call out, and then recieve the return value through the
+you send a call out, and then receive the return value through the
 relevant signal that get's emitted once the call completes.
   *@author Jason Wood
   */
@@ -91,7 +91,7 @@ Q_OBJECT public:
     void setSceneList(QDomDocument list, int position = 0);
     void setSceneList(QString playlist, int position = 0);
     void setProducer(Mlt::Producer *producer, int position);
-    QString sceneList();
+    const QString sceneList();
     void saveSceneList(QString path, QDomElement kdenliveData = QDomElement());
 
     /** Wraps the VEML command of the same name. Tells the renderer to
@@ -154,10 +154,11 @@ Q_OBJECT public:
     int mltGetSpaceLength(const GenTime pos, int track, bool fromBlankStart);
     bool mltResizeClipEnd(ItemInfo info, GenTime clipDuration);
     bool mltResizeClipStart(ItemInfo info, GenTime diff);
+    bool mltResizeClipCrop(ItemInfo info, GenTime diff);
     bool mltMoveClip(int startTrack, int endTrack, GenTime pos, GenTime moveStart, Mlt::Producer *prod);
     bool mltMoveClip(int startTrack, int endTrack, int pos, int moveStart, Mlt::Producer *prod);
     bool mltRemoveClip(int track, GenTime position);
-    bool mltRemoveEffect(int track, GenTime position, QString index, bool doRefresh = true);
+    bool mltRemoveEffect(int track, GenTime position, QString index, bool updateIndex, bool doRefresh = true);
     bool mltAddEffect(int track, GenTime position, EffectsParameterList params, bool doRefresh = true);
     bool mltEditEffect(int track, GenTime position, EffectsParameterList params);
     void mltMoveEffect(int track, GenTime position, int oldPos, int newPos);
@@ -200,6 +201,7 @@ private:   // Private attributes & methods
     bool m_isZoneMode;
     bool m_isLoopMode;
     GenTime m_loopStart;
+    int m_originalOut;
 
     /** true when monitor is in split view (several tracks at the same time) */
     bool m_isSplitView;
@@ -224,6 +226,7 @@ private:   // Private attributes & methods
     QMap<QString, Mlt::Producer *> m_slowmotionProducers;
     void buildConsumer();
     void resetZoneMode();
+    void fillSlowMotionProducers();
 
 private slots:  // Private slots
     /** refresh monitor display */
@@ -234,11 +237,10 @@ private slots:  // Private slots
 
 signals:   // Signals
     /** emitted when the renderer recieves a reply to a getFileProperties request. */
-    void replyGetFileProperties(const QString &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 > &, bool);
 
     /** emitted when the renderer recieves a reply to a getImage request. */
-    void replyGetImage(const QString & , int, const QPixmap &, int, int);
-    void replyGetImage(const QString &, const QPixmap &, int, int);
+    void replyGetImage(const QString &, const QPixmap &);
 
     /** Emitted when the renderer stops, either playing or rendering. */
     void stopped();
@@ -270,7 +272,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, const QString &clipId);
+    void getFileProperties(const QDomElement &xml, const QString &clipId, bool replaceProducer = true);
 
     void exportFileToFirewire(QString srcFileName, int port, GenTime startTime, GenTime endTime);
     static char *decodedString(QString str);