Merge branch 'master' into next

[kdenlive] / src / stopmotion / stopmotion.h

diff --git a/src/stopmotion/stopmotion.h b/src/stopmotion/stopmotion.h
index dcdfa39e79124948b67041af7e755b563b9fd93e..3e115276c5d3102d80d2ca1b185f1fc518ce0a24 100644 (file)
--- a/src/stopmotion/stopmotion.h
+++ b/src/stopmotion/stopmotion.h
@@ -19,7 +19,6 @@
 #define STOPMOTION_H
 
 #include "ui_stopmotion_ui.h"
-#include "../blackmagic/capture.h"
 
 #include <KUrl>
 #include <QLabel>
@@ -31,6 +30,7 @@
 class MltDeviceCapture;
 class MonitorManager;
 class VideoPreviewContainer;
+class MltVideoProfile;
 
 class MyLabel : public QLabel
 {
@@ -103,8 +103,6 @@ private:
     MltDeviceCapture *m_captureDevice;
 
     VideoPreviewContainer *m_videoBox;
-    
-    //CaptureHandler* m_bmCapture;
 
     /** @brief Holds the name of the current sequence.
      * Files will be saved in project folder with name: sequence001.png */
@@ -150,12 +148,18 @@ private:
 
     MonitorManager *m_manager;
 
+    /** @brief The monitor is used to control the v4l capture device from the monitormanager class. */
     StopmotionMonitor *m_monitor;
 
+    /** @brief Create the XML playlist. */
+    const QString createProducer(MltVideoProfile profile, const QString &service, const QString &resource);
+
+    /** @brief A new frame arrived, reload overlay. */
+    void reloadOverlay();
 
-#ifdef QIMAGEBLITZ
+    /** @brief Holds the index of the effect to be applied to the video feed. */
     int m_effectIndex;
-#endif
+
 
 public slots:
     /** @brief Display the live feed from capture device.
@@ -212,7 +216,7 @@ private slots:
     void slotPrepareThumbs();
 
     /** @brief Called when user switches the video capture backend. */
-    void slotUpdateHandler();
+    void slotUpdateDeviceHandler();
 
     /** @brief Show / hide sequence thumbnails. */
     void slotShowThumbs(bool show);
@@ -221,7 +225,7 @@ private slots:
     void slotConfigure();
 
     /** @brief Prepare to crete thumb for newly captured frame. */
-    void slotNewThumb(const QString path);
+    void slotNewThumb(const QString &path);
 
     /** @brief Set the effect to be applied to overlay frame. */
     void slotUpdateOverlayEffect(QAction* act);
@@ -234,13 +238,16 @@ private slots:
     
     /** @brief Enable / disable frame analysis (in color scopes). */
     void slotSwitchAnalyse(bool isOn);
+
+    /** @brief Enable / disable horizontal mirror effect. */
+    void slotSwitchMirror(bool isOn);
     
     /** @brief Send a notification a few seconds before capturing. */
     void slotPreNotify();
 
 signals:
     /** @brief Ask to add sequence to current project. */
-    void addOrUpdateSequence(const QString);
+    void addOrUpdateSequence(const QString &);
 
     void doCreateThumbs(QImage, int);
     void gotFrame(QImage);