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 31a56ccb3825d9ab771ebafd2f7b82670e602658..6e06f685bf08f9ec8558b92179643f55571fc39c 100644 (file)
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -20,31 +20,32 @@
 #ifndef MONITOR_H
 #define MONITOR_H
 
-#include <QLabel>
-
-#include <KIcon>
-#include <KAction>
-#include <KRestrictedLine>
-#include <QDomElement>
 
 #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
 
-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
 {
@@ -58,6 +59,7 @@ protected:
     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:
@@ -88,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();
@@ -115,8 +126,9 @@ public:
     void checkOverlay();
     void updateTimecodeFormat();
     void updateMarkers(DocClipBase *source);
-    MonitorScene *getEffectScene();
+    MonitorEditWidget *getEffectEdit();
     QWidget *container();
+    QFrame *m_volumePopup;
 
 protected:
     virtual void mousePressEvent(QMouseEvent * event);
@@ -142,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;
@@ -158,8 +169,7 @@ 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;
@@ -173,6 +183,10 @@ private:
 
     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);
@@ -187,6 +201,9 @@ 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 &);
@@ -232,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);