X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.h;h=1d7b54cb3fa5e0d4252a6eca2cce2090706f029c;hb=bf85ada7922e7e71efe54ca62c86fb53e265e3a6;hp=c041bccb8b3047551080dac6ae46ae578e52736e;hpb=45adaf0e93ffa28bfeb3425a099ca95e70fd0d79;p=kdenlive diff --git a/src/monitor.h b/src/monitor.h index c041bccb..1d7b54cb 100644 --- a/src/monitor.h +++ b/src/monitor.h @@ -25,19 +25,16 @@ #include "renderer.h" #include "definitions.h" #include "timecodedisplay.h" -#include "abstractmonitor.h" +#include "widgets/abstractmonitor.h" #ifdef USE_OPENGL -#include "videoglwidget.h" +#include "widgets/videoglwidget.h" #endif #include #include #include -#include #include -#include -#include class SmallRuler; class DocClipBase; @@ -47,6 +44,7 @@ class ClipItem; class MonitorEditWidget; class Monitor; class MonitorManager; +class QSlider; class Overlay : public QLabel @@ -57,9 +55,9 @@ public: void setOverlayText(const QString &, bool isZone = true); protected: - virtual void mouseDoubleClickEvent ( QMouseEvent * event ); - virtual void mousePressEvent ( QMouseEvent * event ); - virtual void mouseReleaseEvent ( QMouseEvent * event ); + void mouseDoubleClickEvent ( QMouseEvent * event ); + void mousePressEvent ( QMouseEvent * event ); + void mouseReleaseEvent ( QMouseEvent * event ); signals: void editMarker(); @@ -70,12 +68,12 @@ class Monitor : public AbstractMonitor Q_OBJECT public: - Monitor(Kdenlive::MONITORID id, 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); - void setCustomProfile(const QString &profile, Timecode tc); + void setCustomProfile(const QString &profile, const Timecode &tc); void resetSize(); void pause(); void unpause();