Complete rewrite of the video4linux capture to use MLT, in progress.

[kdenlive] / src / monitor.h

diff --git a/src/monitor.h b/src/monitor.h
index faaf50213c7681bed426ba2bf955cc54d78494b4..6e06f685bf08f9ec8558b92179643f55571fc39c 100644 (file)
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -22,7 +22,9 @@
 
 
 #include "gentime.h"
+#include "renderer.h"
 #include "timecodedisplay.h"
+#include "abstractmonitor.h"
 #if defined(Q_WS_MAC) || defined(USE_OPEN_GL)
 #include "videoglwidget.h"
 #endif
@@ -36,17 +38,14 @@
 #include <KAction>
 #include <KRestrictedLine>
 
-
-class MonitorManager;
-class Render;
 class SmallRuler;
 class DocClipBase;
 class AbstractClipItem;
 class Transition;
 class ClipItem;
 class MonitorEditWidget;
-
 class Monitor;
+class MonitorManager;
 
 class VideoContainer : public QFrame
 {
@@ -91,23 +90,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;
+    AbstractRender *abstractRender();
     void resetProfile(const QString profile);
-    QString name() const;
+    const QString name() const;
     void resetSize();
     bool isActive() const;
     void pause();
@@ -146,7 +154,6 @@ private:
     DocClipBase *m_currentClip;
     SmallRuler *m_ruler;
     Overlay *m_overlay;
-    bool m_isActive;
     double m_scale;
     int m_length;
     bool m_dragStarted;
@@ -179,6 +186,7 @@ private:
     QToolBar *m_toolbar;
     QWidget *m_volumeWidget;
     QSlider *m_audioSlider;
+    QAction *m_editMarker;
 
 private slots:
     void seekCursor(int pos);
@@ -195,6 +203,7 @@ private slots:
     void slotGoToMarker(QAction *action);
     void slotSetVolume(int volume);
     void slotShowVolume();
+    void slotEditMarker();
 
 public slots:
     void slotOpenFile(const QString &);
@@ -240,7 +249,7 @@ public slots:
 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);