X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.h;h=04e5af2d98bee6b4736d3829e70e3a2f78e5ac8e;hb=fe9316d603bb2da1f779493975ac12051f7e04b9;hp=c598dffc247527acb4e8310b76c446d824453aaa;hpb=5c90404b275f932110db0942d00233180deae0a1;p=kdenlive

diff --git a/src/monitor.h b/src/monitor.h
index c598dffc..04e5af2d 100644
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -20,37 +20,58 @@
 #ifndef MONITOR_H
 #define MONITOR_H
 
-#include <QLabel>
-
-#include <KIcon>
-#include <KAction>
-#include <KRestrictedLine>
-#include <QDomElement>
 
 #include "gentime.h"
-#include "ui_monitor_ui.h"
+#include "renderer.h"
 #include "timecodedisplay.h"
-#if defined(Q_WS_MAC) || defined(USE_OPEN_GL)
+#include "abstractmonitor.h"
+#ifdef USE_OPENGL
 #include "videoglwidget.h"
 #endif
 
-class MonitorManager;
-class Render;
+#include <QLabel>
+#include <QDomElement>
+#include <QToolBar>
+#include <QSlider>
+
+#include <KIcon>
+#include <KAction>
+#include <KRestrictedLine>
+
 class SmallRuler;
 class DocClipBase;
-class MonitorScene;
 class AbstractClipItem;
 class Transition;
 class ClipItem;
-class QGraphicsView;
-class QGraphicsPixmapItem;
+class MonitorEditWidget;
+class Monitor;
+class MonitorManager;
+
+class VideoContainer : public QFrame
+{
+    Q_OBJECT
+public:
+    VideoContainer(Monitor *parent = 0);
+    void switchFullScreen();
+
+protected:
+    virtual void mouseDoubleClickEvent(QMouseEvent * event);
+    virtual void mousePressEvent(QMouseEvent * event);
+    virtual void mouseReleaseEvent(QMouseEvent *event);
+    virtual void mouseMoveEvent(QMouseEvent *event);
+    void keyPressEvent(QKeyEvent *event);
+    virtual void wheelEvent(QWheelEvent * event);
+
+private:
+    Qt::WindowFlags m_baseFlags;
+    Monitor *m_monitor;
+};
 
 class MonitorRefresh : public QWidget
 {
     Q_OBJECT
 public:
     MonitorRefresh(QWidget *parent = 0);
-    virtual void paintEvent(QPaintEvent *event);
     void setRenderer(Render* render);
 
 private:
@@ -61,23 +82,32 @@ class Overlay : public QLabel
 {
     Q_OBJECT
 public:
-    Overlay(QWidget* parent);
+    Overlay(QWidget* parent = 0);
     void setOverlayText(const QString &, bool isZone = true);
 
 private:
     bool m_isZone;
+
+protected:
+    virtual void mouseDoubleClickEvent ( QMouseEvent * event );
+    virtual void mousePressEvent ( QMouseEvent * event );
+    virtual void mouseReleaseEvent ( QMouseEvent * event );
+    
+signals:
+    void editMarker();
 };
 
-class Monitor : public QWidget
+class Monitor : public AbstractMonitor
 {
     Q_OBJECT
 
 public:
     Monitor(QString name, MonitorManager *manager, QString profile = QString(), QWidget *parent = 0);
-    virtual ~Monitor();
+    ~Monitor();
     Render *render;
-    void resetProfile(const QString profile);
-    QString name() const;
+    AbstractRender *abstractRender();
+    void resetProfile(const QString &profile);
+    const QString name() const;
     void resetSize();
     bool isActive() const;
     void pause();
@@ -88,11 +118,15 @@ public:
     void checkOverlay();
     void updateTimecodeFormat();
     void updateMarkers(DocClipBase *source);
-    MonitorScene *getEffectScene();
+    MonitorEditWidget *getEffectEdit();
+    QWidget *container();
+    void reloadProducer(const QString &id);
+    QFrame *m_volumePopup;
 
 protected:
     virtual void mousePressEvent(QMouseEvent * event);
     virtual void mouseReleaseEvent(QMouseEvent * event);
+    virtual void resizeEvent(QResizeEvent *event);
 
     /** @brief Move to another position on mouse wheel event.
      *
@@ -109,13 +143,11 @@ protected:
     //virtual void paintEvent(QPaintEvent * event);
 
 private:
-    Ui::Monitor_UI m_ui;
     QString m_name;
     MonitorManager *m_monitorManager;
     DocClipBase *m_currentClip;
     SmallRuler *m_ruler;
     Overlay *m_overlay;
-    bool m_isActive;
     double m_scale;
     int m_length;
     bool m_dragStarted;
@@ -131,19 +163,25 @@ private:
     QMenu *m_playMenu;
     QMenu *m_markerMenu;
     QPoint m_DragStartPosition;
-    MonitorScene *m_effectScene;
-    QGraphicsView *m_effectView;
+    MonitorEditWidget *m_effectWidget;
+    VideoContainer *m_videoBox;
     /** Selected clip/transition in timeline. Used for looping it. */
     AbstractClipItem *m_selectedClip;
     /** true if selected clip is transition, false = selected clip is clip.
      *  Necessary because sometimes we get two signals, e.g. we get a clip and we get selected transition = NULL. */
     bool m_loopClipTransition;
-#if defined(Q_WS_MAC) || defined(USE_OPEN_GL)
+
+#ifdef USE_OPENGL
     VideoGLWidget *m_glWidget;
-    bool createOpenGlWidget(QVBoxLayout *rendererBox, const QString profile);
+    bool createOpenGlWidget(QWidget *parent, const QString profile);
 #endif
 
     GenTime getSnapForPos(bool previous);
+    Qt::WindowFlags m_baseFlags;
+    QToolBar *m_toolbar;
+    QWidget *m_volumeWidget;
+    QSlider *m_audioSlider;
+    QAction *m_editMarker;
 
 private slots:
     void seekCursor(int pos);
@@ -158,15 +196,20 @@ private slots:
     void slotSwitchMonitorInfo(bool show);
     void slotSwitchDropFrames(bool show);
     void slotGoToMarker(QAction *action);
+    void slotSetVolume(int volume);
+    void slotShowVolume();
+    void slotEditMarker();
 
 public slots:
     void slotOpenFile(const QString &);
-    void slotSetXml(DocClipBase *clip, QPoint zone = QPoint(), const int position = -1);
-    void refreshMonitor(bool visible = true);
+    void slotSetClipProducer(DocClipBase *clip, QPoint zone = QPoint(), bool forceUpdate = false, int position = -1);
+    void updateClipProducer(Mlt::Producer *prod);
+    void refreshMonitor(bool visible);
+    void refreshMonitor();
     void slotSeek(int pos);
     void stop();
     void start();
-    void activateMonitor();
+    bool activateMonitor();
     void slotPlay();
     void slotPlayZone();
     void slotLoopZone();
@@ -196,14 +239,16 @@ public slots:
     void slotSetSelectedClip(AbstractClipItem *item);
     void slotSetSelectedClip(ClipItem *item);
     void slotSetSelectedClip(Transition *item);
+    void slotMouseSeek(int eventDelta, bool fast);
+    void slotSwitchFullScreen();
 
 signals:
     void renderPosition(int);
     void durationChanged(int);
-    void refreshClipThumbnail(const QString &);
+    void refreshClipThumbnail(const QString &, bool);
     void adjustMonitorSize();
     void zoneUpdated(QPoint);
-    void saveZone(Render *, QPoint);
+    void saveZone(Render *, QPoint, DocClipBase *);
     /** @brief  Editing transitions / effects over the monitor requires the renderer to send frames as QImage.
      *      This causes a major slowdown, so we only enable it if required */
     void requestFrameForAnalysis(bool);