Try to fix audio mixing bug ( http://www.kdenlive.org:80/mantis/view.php?id=228 )

[kdenlive] / src / monitor.h

diff --git a/src/monitor.h b/src/monitor.h
index 3ae530b4e14b921ba8ee94911fa79dc9cb9742fb..6e989dc96af03e7c6faa70274e705f6c1f4d6a81 100644 (file)
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -24,13 +24,14 @@
 #include <KIcon>
 #include <KAction>
 #include <KRestrictedLine>
+#include <QDomElement>
 
 #include "ui_monitor_ui.h"
-#include "renderer.h"
-#include "monitormanager.h"
-#include "smallruler.h"
 
 class MonitorManager;
+class Render;
+class SmallRuler;
+class DocClipBase;
 
 class MonitorRefresh : public QWidget {
     Q_OBJECT
@@ -38,6 +39,7 @@ public:
     MonitorRefresh(QWidget* parent);
     virtual void paintEvent(QPaintEvent * event);
     void setRenderer(Render* render);
+
 private:
     Render *m_renderer;
 };
@@ -48,14 +50,24 @@ class Monitor : public QWidget {
 public:
     Monitor(QString name, MonitorManager *manager, QWidget *parent = 0);
     Render *render;
-    void resetProfile(QString prof);
+    void resetProfile();
     QString name() const;
-
+    void resetSize();
+    bool isActive() const;
+    void pause();
+    void setupMenu(QMenu *goMenu);
+    QDomDocument sceneList();
 
 protected:
     virtual void mousePressEvent(QMouseEvent * event);
+    virtual void mouseReleaseEvent(QMouseEvent * event);
     virtual void wheelEvent(QWheelEvent * event);
-    virtual void resizeEvent(QResizeEvent * event);
+    virtual void mouseMoveEvent(QMouseEvent *event);
+    virtual QStringList mimeTypes() const;
+    /*    virtual void dragMoveEvent(QDragMoveEvent * event);
+        virtual Qt::DropActions supportedDropActions() const;*/
+
+//    virtual void resizeEvent(QResizeEvent * event);
 //    virtual void paintEvent(QPaintEvent * event);
 
 private:
@@ -72,16 +84,27 @@ private:
     bool m_isActive;
     KRestrictedLine *m_timePos;
     QAction *m_playAction;
+    QMenu *m_contextMenu;
+    QMenu *m_configMenu;
+    QMenu *m_playMenu;
+    DocClipBase *m_currentClip;
+    QPoint m_DragStartPosition;
+    bool m_dragStarted;
 
 private slots:
     void adjustRulerSize(int length);
     void seekCursor(int pos);
     void rendererStopped(int pos);
-
+    void slotExtractCurrentFrame();
+    void slotSetThumbFrame();
+    void slotSetSizeOneToOne();
+    void slotSetSizeOneToTwo();
+    void slotSaveZone();
+    void slotSeek();
 
 public slots:
     void slotOpenFile(const QString &);
-    void slotSetXml(const QDomElement &e);
+    void slotSetXml(DocClipBase *clip, const int position = -1);
     void initMonitor();
     void refreshMonitor(bool visible);
     void slotSeek(int pos);
@@ -89,15 +112,28 @@ public slots:
     void start();
     void activateMonitor();
     void slotPlay();
+    void slotPlayZone();
+    void slotLoopZone();
     void slotForward(double speed = 0);
     void slotRewind(double speed = 0);
     void slotRewindOneFrame();
     void slotForwardOneFrame();
-    void saveSceneList(QString path, QDomElement e = QDomElement());
+    void saveSceneList(QString path, QDomElement info = QDomElement());
+    void slotStart();
+    void slotEnd();
+    void slotSetZoneStart();
+    void slotSetZoneEnd();
+    void slotZoneStart();
+    void slotZoneEnd();
+    void slotZoneMoved(int start, int end);
 
 signals:
     void renderPosition(int);
     void durationChanged(int);
+    void refreshClipThumbnail(const QString &);
+    void adjustMonitorSize();
+    void zoneUpdated(QPoint);
+    void saveZone(Render *, QPoint);
 };
 
 #endif