X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.h;h=c7821273f87f231cf22a1f95cf91395ca933bfff;hb=e0fa1332f109b6455207ea701da386b2fddddf09;hp=2bdf65f45a73ed5c7d290578c7c15265af786c8e;hpb=51e9f7bb72508ed1c8eff3e31c6cd98ba9118fe8;p=kdenlive

diff --git a/src/monitor.h b/src/monitor.h
index 2bdf65f4..c7821273 100644
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -75,6 +75,7 @@ public:
     Render *render;
     AbstractRender *abstractRender();
     void resetProfile(const QString &profile);
+    void setCustomProfile(const QString &profile, Timecode tc);
     void resetSize();
     void pause();
     void unpause();
@@ -85,12 +86,19 @@ public:
     void checkOverlay();
     void updateTimecodeFormat();
     void updateMarkers(DocClipBase *source);
+    void setMarkers(QList <CommentedTime> markers);
     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);
+    /** @brief Returns a hh:mm:ss timecode from a frame number. */
+    QString getTimecodeFromFrames(int pos);
+    /** @brief Returns current project's fps. */
+    double fps() const;
+    /** @brief Get url for the clip's thumbnail */
+    QString getMarkerThumb(GenTime pos);
 
 protected:
     virtual void mousePressEvent(QMouseEvent * event);
@@ -106,6 +114,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;*/
 
@@ -113,7 +122,6 @@ protected:
     //virtual void paintEvent(QPaintEvent * event);
 
 private:
-    Kdenlive::MONITORID m_name;
     DocClipBase *m_currentClip;
     SmallRuler *m_ruler;
     Overlay *m_overlay;
@@ -132,7 +140,6 @@ private:
     QMenu *m_markerMenu;
     QPoint m_DragStartPosition;
     MonitorEditWidget *m_effectWidget;
-    VideoContainer *m_videoBox;
     /** Selected clip/transition in timeline. Used for looping it. */
     AbstractClipItem *m_selectedClip;
     /** true if selected clip is transition, false = selected clip is clip.
@@ -200,7 +207,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. */