X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fabstractmonitor.h;h=537f5d74d470ccedc3db9158b0de880698f424f4;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=8a6922048f745941a21f6706a6a1205738eb4d19;hpb=db489a6c63ab0ee1c67fad35e422b746749b7c58;p=kdenlive

diff --git a/src/abstractmonitor.h b/src/abstractmonitor.h
index 8a692204..537f5d74 100644
--- a/src/abstractmonitor.h
+++ b/src/abstractmonitor.h
@@ -26,47 +26,12 @@
 #include <QVector>
 #include <QWidget>
 #include <QImage>
-#include <QPainter>
 #include <QFrame>
-#include <QTimer>
 
 #include <stdint.h>
 
-class VideoPreviewContainer : public QFrame
-{
-    Q_OBJECT
-public:
-    VideoPreviewContainer(QWidget *parent = 0);
-    ~VideoPreviewContainer();
-    /** @brief Set the image to be displayed, will be put in the queue. */
-    void setImage(QImage img);
-    /** @brief Start the display refresh timer. */
-    void start();
-    /** @brief Stop the display refresh timer. */
-    void stop();
-    /** @brief Set the display ratio for this display. */
-    void setRatio(double ratio);
-
-protected:
-    virtual void paintEvent(QPaintEvent */*event*/);
-    virtual void resizeEvent(QResizeEvent * event);
-
-private:
-    /** @brief The display aspect ratio for profile. */
-    double m_dar;
-    /** @brief When true, the whole widget surface will be repainted, useful when resizing widget. */
-    bool m_refresh;
-    /** @brief The rectangle defining the area for painting our image. */
-    QRect m_displayRect;
-    /** @brief The queue of images to be displayed. */
-    QList <QImage *> m_imageQueue;
-    /** @brief We refresh the image with a timer, since this widget is only for preview during capture. */
-    QTimer m_refreshTimer;
-    /** @brief Re-calculate the display zone after a resize or aspect ratio change. */
-    void updateDisplayZone();
-};
-
-
+class MonitorManager;
+class VideoContainer;
 
 class AbstractRender: public QObject
 {
@@ -76,10 +41,16 @@ Q_OBJECT public:
      *  @param name A unique identifier for this renderer
      *  @param winid The parent widget identifier (required for SDL display). Set to 0 for OpenGL rendering
      *  @param profile The MLT profile used for the renderer (default one will be used if empty). */
-    AbstractRender(Kdenlive::MONITORID name, QWidget *parent = 0):QObject(parent), sendFrameForAnalysis(false), m_name(name) {};
+    explicit AbstractRender(Kdenlive::MONITORID name, QWidget *parent = 0)
+        : QObject(parent),
+          sendFrameForAnalysis(false),
+          analyseAudio(false),
+          m_name(name)
+    {
+    }
 
     /** @brief Destroy the MLT Renderer. */
-    virtual ~AbstractRender() {};
+    virtual ~AbstractRender() {}
 
     /** @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;
@@ -87,7 +58,7 @@ Q_OBJECT public:
     /** @brief This property is used to decide if the renderer should send audio data for monitoring. */
     bool analyseAudio;
     
-    const QString &name() const {return m_name;};
+    const QString &name() const {return m_name;}
 
     /** @brief Someone needs us to send again a frame. */
     virtual void sendFrameUpdate() = 0;
@@ -97,27 +68,71 @@ private:
     
 signals:
     /** @brief The renderer refreshed the current frame. */
-    void frameUpdated(QImage);
+    void frameUpdated(const QImage &);
 
     /** @brief This signal contains the audio of the current frame. */
-    void audioSamplesSignal(QVector<int16_t>,int,int,int);
+    void audioSamplesSignal(const QVector<int16_t>&,int,int,int);
+};
+
+
+
+class VideoSurface : public QWidget
+{
+    Q_OBJECT
+public:
+    VideoSurface(QWidget *parent = 0);
+    
+signals:
+    void refreshMonitor();
+
+protected:
+    virtual void paintEvent ( QPaintEvent * event );
 };
 
+
 class AbstractMonitor : public QWidget
 {
     Q_OBJECT
 public:
-    AbstractMonitor(Kdenlive::MONITORID id, QWidget *parent = 0): QWidget(parent) {m_id = id;};
-    Kdenlive::MONITORID id() {return m_id;};
-    virtual ~AbstractMonitor() {};
+    AbstractMonitor(Kdenlive::MONITORID id, MonitorManager *manager, QWidget *parent = 0);
+    Kdenlive::MONITORID id() {return m_id;}
+    virtual ~AbstractMonitor();
     virtual AbstractRender *abstractRender() = 0;
-
+    bool isActive() const;
+    VideoContainer *videoBox;
+    VideoSurface *videoSurface;
+    void createVideoSurface();
+    
+    
 public slots:
     virtual void stop() = 0;
     virtual void start() = 0;
+    virtual void slotPlay() = 0;
+    virtual void slotMouseSeek(int eventDelta, bool fast) = 0;
+    bool slotActivateMonitor(bool forceRefresh = false);
+    virtual void slotSwitchFullScreen() = 0;
 
 protected:
     Kdenlive::MONITORID m_id;
+    MonitorManager *m_monitorManager;
+};
+
+class VideoContainer : public QFrame
+{
+    Q_OBJECT
+public:
+    explicit VideoContainer(AbstractMonitor *monitor, QWidget *parent = 0);
+    void switchFullScreen();
+
+protected:
+    virtual void mouseDoubleClickEvent(QMouseEvent * event);
+    virtual void mouseReleaseEvent(QMouseEvent *event);
+    void keyPressEvent(QKeyEvent *event);
+    virtual void wheelEvent(QWheelEvent * event);
+
+private:
+    Qt::WindowFlags m_baseFlags;
+    AbstractMonitor *m_monitor;
 };
 
 #endif