X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.h;h=faaf50213c7681bed426ba2bf955cc54d78494b4;hb=548782dfe8b4ec1edc0c15f0062f5a976f1c6ee3;hp=c7f6468c7c14bb9d0835cac0eb2fa3e1a4d3e3b3;hpb=efe8d9bd95254f319b102f970600618b18e73492;p=kdenlive

diff --git a/src/monitor.h b/src/monitor.h
index c7f6468c..faaf5021 100644
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -20,12 +20,6 @@
 #ifndef MONITOR_H
 #define MONITOR_H
 
-#include <QLabel>
-
-#include <KIcon>
-#include <KAction>
-#include <KRestrictedLine>
-#include <QDomElement>
 
 #include "gentime.h"
 #include "timecodedisplay.h"
@@ -33,16 +27,24 @@
 #include "videoglwidget.h"
 #endif
 
+#include <QLabel>
+#include <QDomElement>
+#include <QToolBar>
+#include <QSlider>
+
+#include <KIcon>
+#include <KAction>
+#include <KRestrictedLine>
+
+
 class MonitorManager;
 class Render;
 class SmallRuler;
 class DocClipBase;
-class MonitorScene;
 class AbstractClipItem;
 class Transition;
 class ClipItem;
-class QGraphicsView;
-class QGraphicsPixmapItem;
+class MonitorEditWidget;
 
 class Monitor;
 
@@ -116,8 +118,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);
@@ -159,8 +162,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;
@@ -174,6 +176,9 @@ private:
 
     GenTime getSnapForPos(bool previous);
     Qt::WindowFlags m_baseFlags;
+    QToolBar *m_toolbar;
+    QWidget *m_volumeWidget;
+    QSlider *m_audioSlider;
 
 private slots:
     void seekCursor(int pos);
@@ -188,6 +193,8 @@ private slots:
     void slotSwitchMonitorInfo(bool show);
     void slotSwitchDropFrames(bool show);
     void slotGoToMarker(QAction *action);
+    void slotSetVolume(int volume);
+    void slotShowVolume();
 
 public slots:
     void slotOpenFile(const QString &);