Merge branch 'master' of git://anongit.kde.org/kdenlive

[kdenlive] / src / renderer.h

diff --git a/src/renderer.h b/src/renderer.h
index 87edd1925613153663ba005f7a0eb4dc41ee7ec5..637ba0c924d5535ebfc3be497b2c59f145805ac4 100644 (file)
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -215,7 +215,7 @@ Q_OBJECT public:
 
     bool mltResizeClipEnd(ItemInfo info, GenTime clipDuration);
     bool mltResizeClipStart(ItemInfo info, GenTime diff);
-    bool mltResizeClipCrop(ItemInfo info, GenTime diff);
+    bool mltResizeClipCrop(ItemInfo info, GenTime newCropStart);
     bool mltMoveClip(int startTrack, int endTrack, GenTime pos, GenTime moveStart, Mlt::Producer *prod, bool overwrite = false, bool insert = false);
     bool mltMoveClip(int startTrack, int endTrack, int pos, int moveStart, Mlt::Producer *prod, bool overwrite = false, bool insert = false);
     bool mltRemoveClip(int track, GenTime position);
@@ -318,6 +318,8 @@ Q_OBJECT public:
     /** @brief Fill a combobox with the found blackmagic devices */
     static bool getBlackMagicDeviceList(KComboBox *devicelist);
     static bool getBlackMagicOutputDeviceList(KComboBox *devicelist);
+    /** @brief Frame rendering is handeled by Kdenlive, don't show video through SDL display */
+    void disablePreview(bool disable);
 
 private: