X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frecmonitor.h;h=325d1489cfa97406affd3f5b40194f44847fa6c6;hb=db489a6c63ab0ee1c67fad35e422b746749b7c58;hp=d8de070ebd581e6071584e843caddf1d62b03b6a;hpb=659a2e372472c513a5dd794be5467a7930033cee;p=kdenlive

diff --git a/src/recmonitor.h b/src/recmonitor.h
index d8de070e..325d1489 100644
--- a/src/recmonitor.h
+++ b/src/recmonitor.h
@@ -27,7 +27,7 @@
 #define RECMONITOR_H
 
 #include "abstractmonitor.h"
-#include "blackmagic/capture.h"
+#include "definitions.h"
 #include "ui_recmonitor_ui.h"
 
 #include <QToolBar>
@@ -41,10 +41,7 @@
 #include <KDateTime>
 #include <kdeversion.h>
 #include <KComboBox>
-
-#if KDE_IS_VERSION(4,2,0)
 #include <kcapacitybar.h>
-#endif
 
 class MonitorManager;
 class MltDeviceCapture;
@@ -55,10 +52,9 @@ class RecMonitor : public AbstractMonitor, public Ui::RecMonitor_UI
     Q_OBJECT
 
 public:
-    explicit RecMonitor(QString name, MonitorManager *manager, QWidget *parent = 0);
+    explicit RecMonitor(Kdenlive::MONITORID name, MonitorManager *manager, QWidget *parent = 0);
     virtual ~RecMonitor();
 
-    const QString name() const;
     AbstractRender *abstractRender();
     void analyseFrames(bool analyse);
     enum CAPTUREDEVICE {FIREWIRE = 0, VIDEO4LINUX = 1, SCREENGRAB = 2, BLACKMAGIC = 3};
@@ -67,7 +63,6 @@ protected:
     virtual void mousePressEvent(QMouseEvent * event);
 
 private:
-    QString m_name;
     KDateTime m_captureTime;
     /** @brief Provide feedback about dvgrab operations */
     QLabel m_dvinfo;
@@ -77,10 +72,8 @@ private:
     KComboBox m_logger;
     QString m_capturePath;
 
-#if KDE_IS_VERSION(4,2,0)
     KCapacityBar *m_freeSpace;
     QTimer m_spaceTimer;
-#endif
 
     KUrl m_captureFile;
     KIcon m_playIcon;
@@ -101,17 +94,20 @@ private:
     QAction *m_stopAction;
     QAction *m_discAction;
 
-
-    CaptureHandler *m_bmCapture;
-    /** @brief Indicates whether we are currently capturing from BLACKMAGIC. */
-    bool m_blackmagicCapturing;
     MonitorManager *m_manager;
     MltDeviceCapture *m_captureDevice;
     VideoPreviewContainer *m_videoBox;
+    QAction *m_addCapturedClip;
+    QAction *m_previewSettings;
+    
     bool m_analyse;
     void checkDeviceAvailability();
-    QPixmap mergeSideBySide(const QPixmap& pix, const QString txt);
+    QPixmap mergeSideBySide(const QPixmap& pix, const QString &txt);
     void manageCapturedFiles();
+    /** @brief Build MLT producer for device, using path as profile. */
+    void buildMltDevice(const QString &path);
+    /** @brief Create string containing an XML playlist for v4l capture. */
+    const QString getV4lXmlPlaylist(MltVideoProfile profile);
 
 private slots:
     void slotStartPreview(bool play = true);
@@ -125,9 +121,10 @@ private slots:
     void slotConfigure();
     void slotReadDvgrabInfo();
     void slotUpdateFreeSpace();
-    void slotGotBlackmagicFrameNumber(ulong ix);
     void slotSetInfoMessage(const QString &message);
     void slotDroppedFrames(int dropped);
+    /** @brief Change setting for preview while recording. */
+    void slotChangeRecordingPreview(bool enable);
 
 public slots:
     void refreshRecMonitor(bool visible);
@@ -135,12 +132,13 @@ public slots:
     void stop();
     void start();
     void slotStopCapture();
-    void slotUpdateCaptureFolder(const QString currentProjectFolder);
+    void slotUpdateCaptureFolder(const QString &currentProjectFolder);
 
 signals:
     void renderPosition(int);
     void durationChanged(int);
     void addProjectClip(KUrl);
+    void addProjectClipList(KUrl::List);
     void showConfigDialog(int, int);
 };