Fix issues with OpenGL aspect ration / corruption and DVD wizard monitor

[kdenlive] / src / monitor.h

diff --git a/src/monitor.h b/src/monitor.h
index 45f0179a823fe8e8ba924a281a04fb3ff3eda74e..84a8b9b368bc8ad3361598945de0b7d4675cb602 100644 (file)
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -23,9 +23,10 @@
 
 #include "gentime.h"
 #include "renderer.h"
+#include "definitions.h"
 #include "timecodedisplay.h"
 #include "abstractmonitor.h"
-#if defined(Q_WS_MAC) || defined(USE_OPEN_GL)
+#ifdef USE_OPENGL
 #include "videoglwidget.h"
 #endif
 
@@ -47,44 +48,6 @@ class MonitorEditWidget;
 class Monitor;
 class MonitorManager;
 
-class VideoContainer : public QFrame
-{
-    Q_OBJECT
-public:
-    VideoContainer(Monitor *parent = 0);
-    void switchFullScreen();
-
-protected:
-    virtual void mouseDoubleClickEvent(QMouseEvent * event);
-    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:
-    Qt::WindowFlags m_baseFlags;
-    Monitor *m_monitor;
-};
-
-class MonitorRefresh : public QWidget
-{
-    Q_OBJECT
-public:
-    MonitorRefresh(QWidget *parent = 0);
-    void setRenderer(Render* render);
-
-protected:
-    virtual void resizeEvent(QResizeEvent *event);
-
-private:
-    Render *m_renderer;
-
-signals:
-    void switchFullScreen();
-    void switchPlay();
-    void mouseSeek(int, bool);
-};
 
 class Overlay : public QLabel
 {
@@ -93,9 +56,6 @@ public:
     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 );
@@ -110,15 +70,15 @@ class Monitor : public AbstractMonitor
     Q_OBJECT
 
 public:
-    Monitor(QString name, MonitorManager *manager, QString profile = QString(), QWidget *parent = 0);
+    Monitor(Kdenlive::MONITORID id, MonitorManager *manager, QString profile = QString(), QWidget *parent = 0);
     ~Monitor();
     Render *render;
     AbstractRender *abstractRender();
     void resetProfile(const QString &profile);
-    const QString name() const;
+    void setCustomProfile(const QString &profile, Timecode tc);
     void resetSize();
-    bool isActive() const;
     void pause();
+    void unpause();
     void setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMenu *markerMenu = NULL, QAction *loopClip = NULL);
     const QString sceneList();
     DocClipBase *activeClip();
@@ -128,11 +88,16 @@ public:
     void updateMarkers(DocClipBase *source);
     MonitorEditWidget *getEffectEdit();
     QWidget *container();
+    void reloadProducer(const QString &id);
     QFrame *m_volumePopup;
+    /** @brief Reimplemented from QWidget, updates the palette colors. */
+    void setPalette ( const QPalette & p);
 
 protected:
     virtual void mousePressEvent(QMouseEvent * event);
     virtual void mouseReleaseEvent(QMouseEvent * event);
+    virtual void mouseDoubleClickEvent(QMouseEvent * event);
+    virtual void resizeEvent(QResizeEvent *event);
 
     /** @brief Move to another position on mouse wheel event.
      *
@@ -142,6 +107,7 @@ protected:
     virtual void wheelEvent(QWheelEvent * event);
     virtual void mouseMoveEvent(QMouseEvent *event);
     virtual QStringList mimeTypes() const;
+   
     /*virtual void dragMoveEvent(QDragMoveEvent * event);
     virtual Qt::DropActions supportedDropActions() const;*/
 
@@ -149,15 +115,13 @@ protected:
     //virtual void paintEvent(QPaintEvent * event);
 
 private:
-    QString m_name;
-    MonitorManager *m_monitorManager;
+    Kdenlive::MONITORID m_name;
     DocClipBase *m_currentClip;
     SmallRuler *m_ruler;
     Overlay *m_overlay;
     double m_scale;
     int m_length;
     bool m_dragStarted;
-    MonitorRefresh *m_monitorRefresh;
     KIcon m_playIcon;
     KIcon m_pauseIcon;
     TimecodeDisplay *m_timePos;
@@ -176,7 +140,8 @@ private:
     /** true if selected clip is transition, false = selected clip is clip.
      *  Necessary because sometimes we get two signals, e.g. we get a clip and we get selected transition = NULL. */
     bool m_loopClipTransition;
-#if defined(Q_WS_MAC) || defined(USE_OPEN_GL)
+
+#ifdef USE_OPENGL
     VideoGLWidget *m_glWidget;
     bool createOpenGlWidget(QWidget *parent, const QString profile);
 #endif
@@ -204,16 +169,17 @@ private slots:
     void slotSetVolume(int volume);
     void slotShowVolume();
     void slotEditMarker();
+    void slotExtractCurrentZone();
 
 public slots:
     void slotOpenFile(const QString &);
-    void slotSetXml(DocClipBase *clip, QPoint zone = QPoint(), const int position = -1);
+    void slotSetClipProducer(DocClipBase *clip, QPoint zone = QPoint(), bool forceUpdate = false, int position = -1);
+    void updateClipProducer(Mlt::Producer *prod);
     void refreshMonitor(bool visible);
     void refreshMonitor();
     void slotSeek(int pos);
     void stop();
     void start();
-    void activateMonitor();
     void slotPlay();
     void slotPlayZone();
     void slotLoopZone();
@@ -236,7 +202,8 @@ public slots:
     void adjustRulerSize(int length);
     void setTimePos(const QString &pos);
     QStringList getZoneInfo() const;
-    void slotEffectScene(bool show = true);
+    /** @brief Display the on monitor effect scene (to adjust geometry over monitor). */
+    void slotShowEffectScene(bool show = true, bool manuallyTriggered = false);
     bool effectSceneDisplayed();
 
     /** @brief Sets m_selectedClip to @param item. Used for looping it. */
@@ -256,6 +223,8 @@ signals:
     /** @brief  Editing transitions / effects over the monitor requires the renderer to send frames as QImage.
      *      This causes a major slowdown, so we only enable it if required */
     void requestFrameForAnalysis(bool);
+    /** @brief Request a zone extraction (ffmpeg transcoding). */
+    void extractZone(const QString &id, QPoint zone);
 };
 
 #endif