Allow importing of clips into project from command line:

[kdenlive] / src / renderer.h

diff --git a/src/renderer.h b/src/renderer.h
index 3036d08f59cc2fb9900645428818d371a52a8993..d0960e3e0a8b5c01a9d678330b3ba50ce23eed20 100644 (file)
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -161,6 +161,7 @@ Q_OBJECT public:
     GenTime seekPosition() const;
     int seekFramePosition() const;
 
+    void emitFrameUpdated(Mlt::Frame&);
     void emitFrameNumber(double position);
     void emitConsumerStopped();
 
@@ -176,7 +177,12 @@ Q_OBJECT public:
     void refreshDisplay();
     int resetProfile(const QString profileName);
     double fps() const;
+
+    /** @brief Returns the width of a frame for this profile. */
+    int frameRenderWidth() const;
+    /** @brief Returns the display width of a frame for this profile. */
     int renderWidth() const;
+    /** @brief Returns the height of a frame for this profile. */
     int renderHeight() const;
 
     /** @brief Returns display aspect ratio. */
@@ -201,12 +207,16 @@ Q_OBJECT public:
 
     /** @brief Deletes an effect from a clip in MLT's playlist. */
     bool mltRemoveEffect(int track, GenTime position, QString index, bool updateIndex, bool doRefresh = true);
+    bool mltRemoveTrackEffect(int track, QString index, bool updateIndex);
 
     /** @brief Adds an effect to a clip in MLT's playlist. */
     bool mltAddEffect(int track, GenTime position, EffectsParameterList params, bool doRefresh = true);
+    bool mltAddEffect(Mlt::Service service, EffectsParameterList params, int duration, bool doRefresh);
+    bool mltAddTrackEffect(int track, EffectsParameterList params);
 
     /** @brief Edits an effect parameters in MLT's playlist. */
     bool mltEditEffect(int track, GenTime position, EffectsParameterList params);
+    bool mltEditTrackEffect(int track, EffectsParameterList params);
 
     /** @brief Updates the "kdenlive_ix" (index) value of an effect. */
     void mltUpdateEffectPosition(int track, GenTime position, int oldPos, int newPos);
@@ -216,6 +226,7 @@ Q_OBJECT public:
      * It switches effects from oldPos and newPos, updating the "kdenlive_ix"
      * (index) value. */
     void mltMoveEffect(int track, GenTime position, int oldPos, int newPos);
+    void mltMoveTrackEffect(int track, int oldPos, int newPos);
 
     /** @brief Enables/disables audio/video in a track. */
     void mltChangeTrackState(int track, bool mute, bool blind);
@@ -238,7 +249,7 @@ Q_OBJECT public:
      *
      * It creates a new "framebuffer" producer, which must have its "resource"
      * property set to "video.mpg?0.6", where "video.mpg" is the path to the
-     * clip and "0.6" is the speed in percentile. The newly created producer
+     * clip and "0.6" is the speed in percentage. The newly created producer
      * will have its "id" property set to "slowmotion:parentid:speed", where
      * "parentid" is the id of the original clip in the ClipManager list and
      * "speed" is the current speed. */
@@ -251,7 +262,10 @@ Q_OBJECT public:
 #ifdef Q_WS_MAC
     void showFrame(Mlt::Frame&);
 #endif
+    /** @brief This property is used to decide if the renderer should convert it's frames to QImage for use in other Kdenlive widgets. */
+    bool sendFrameForAnalysis;
     QList <int> checkTrackSequence(int);
+    void sendFrameUpdate();
 
 private:
 
@@ -323,7 +337,9 @@ signals:
     /** @brief The renderer started rendering. */
     void rendering(const GenTime &);
 
-    /** @brief The rendering has finished. */
+    /** @brief The rendering has finished.
+        @see consumer_frame_show
+        This signal seems to be useless; use renderPosition(int) instead --Granjow */
     void renderFinished();
 
     /* @brief The current seek position has been changed by the renderer.
@@ -341,6 +357,8 @@ signals:
      *
      * Used in Mac OS X. */
     void showImageSignal(QImage);
+    /** @brief The renderer refreshed the current frame, but no seeking was done. */
+    void frameUpdated(QImage);
 
 public slots: