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 ca2b52952b936dfac2621aeecc6f5e6830d8f3b1..6e989dc96af03e7c6faa70274e705f6c1f4d6a81 100644 (file)
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -39,6 +39,7 @@ public:
     MonitorRefresh(QWidget* parent);
     virtual void paintEvent(QPaintEvent * event);
     void setRenderer(Render* render);
+
 private:
     Render *m_renderer;
 };
@@ -52,10 +53,20 @@ public:
     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 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);
 
@@ -74,7 +85,11 @@ private:
     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);
@@ -84,6 +99,8 @@ private slots:
     void slotSetThumbFrame();
     void slotSetSizeOneToOne();
     void slotSetSizeOneToTwo();
+    void slotSaveZone();
+    void slotSeek();
 
 public slots:
     void slotOpenFile(const QString &);
@@ -95,6 +112,8 @@ public slots:
     void start();
     void activateMonitor();
     void slotPlay();
+    void slotPlayZone();
+    void slotLoopZone();
     void slotForward(double speed = 0);
     void slotRewind(double speed = 0);
     void slotRewindOneFrame();
@@ -102,12 +121,19 @@ public slots:
     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(int);
+    void refreshClipThumbnail(const QString &);
     void adjustMonitorSize();
+    void zoneUpdated(QPoint);
+    void saveZone(Render *, QPoint);
 };
 
 #endif