X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.cpp;h=c5490a7f29c98560ddafe8425e1e7f7ba7147f70;hb=a23790875ee20326ba0fb9d30b7719979659c2cd;hp=9ad543b5f2a1a67ff2dabfb96678d352e1cd00fa;hpb=70d0af35fb70afdc544faf6eb5d49a7945c438b5;p=kdenlive

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 9ad543b5..c5490a7f 100644
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -18,34 +18,47 @@
  ***************************************************************************/
 
 
-#include <QMouseEvent>
-#include <QStylePainter>
-#include <QMenu>
-#include <QToolButton>
-#include <QToolBar>
-#include <QDesktopWidget>
-
-#include <KDebug>
-#include <KLocale>
-#include <KFileDialog>
-#include <KApplication>
-
-#include "gentime.h"
 #include "monitor.h"
 #include "renderer.h"
 #include "monitormanager.h"
 #include "smallruler.h"
 #include "docclipbase.h"
+#include "kdenlivesettings.h"
 
-Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent)
-        : QWidget(parent), render(NULL), m_monitorManager(manager), m_name(name), m_isActive(false), m_currentClip(NULL), m_dragStarted(false) {
-    ui.setupUi(this);
-    m_scale = 1;
-    m_ruler = new SmallRuler();
+#include <KDebug>
+#include <KLocale>
+#include <KFileDialog>
+#include <KApplication>
+#include <KMessageBox>
+
+#include <QMouseEvent>
+#include <QStylePainter>
+#include <QMenu>
+#include <QToolButton>
+#include <QToolBar>
+#include <QDesktopWidget>
+#include <QLabel>
+#include <QIntValidator>
+
+
+Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget *parent) :
+        QWidget(parent),
+        render(NULL),
+        m_name(name),
+        m_monitorManager(manager),
+        m_currentClip(NULL),
+        m_ruler(new SmallRuler(m_monitorManager)),
+        m_overlay(NULL),
+        m_isActive(false),
+        m_scale(1),
+        m_length(0),
+        m_dragStarted(false)
+{
+    m_ui.setupUi(this);
     QVBoxLayout *layout = new QVBoxLayout;
     layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(m_ruler);
-    ui.ruler_frame->setLayout(layout);
+    m_ui.ruler_frame->setLayout(layout);
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     setMinimumHeight(200);
     QToolBar *toolbar = new QToolBar(name, this);
@@ -55,8 +68,10 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent)
     m_playIcon = KIcon("media-playback-start");
     m_pauseIcon = KIcon("media-playback-pause");
 
-    QAction *zoneStart = toolbar->addAction(KIcon("kdenlive-zone-start"), i18n("Set zone start"), this, SLOT(slotSetZoneStart()));
-    QAction *zoneEnd = toolbar->addAction(KIcon("kdenlive-zone-end"), i18n("Set zone end"), this, SLOT(slotSetZoneEnd()));
+    if (name != "chapter") {
+        toolbar->addAction(KIcon("kdenlive-zone-start"), i18n("Set zone start"), this, SLOT(slotSetZoneStart()));
+        toolbar->addAction(KIcon("kdenlive-zone-end"), i18n("Set zone end"), this, SLOT(slotSetZoneEnd()));
+    } else m_ruler->setZone(-3, -2);
 
     toolbar->addAction(KIcon("media-seek-backward"), i18n("Rewind"), this, SLOT(slotRewind()));
     toolbar->addAction(KIcon("media-skip-backward"), i18n("Rewind 1 frame"), this, SLOT(slotRewindOneFrame()));
@@ -66,8 +81,6 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent)
     m_playAction = m_playMenu->addAction(m_playIcon, i18n("Play"));
     m_playAction->setCheckable(true);
     connect(m_playAction, SIGNAL(triggered()), this, SLOT(slotPlay()));
-    m_playMenu->addAction(m_playIcon, i18n("Play Section"), this, SLOT(slotPlayZone()));
-    m_playMenu->addAction(m_playIcon, i18n("Loop Section"), this, SLOT(slotLoopZone()));
 
     playButton->setMenu(m_playMenu);
     playButton->setPopupMode(QToolButton::MenuButtonPopup);
@@ -78,86 +91,152 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent)
 
     playButton->setDefaultAction(m_playAction);
 
-    QToolButton *configButton = new QToolButton(toolbar);
-    m_configMenu = new QMenu(i18n("Misc..."), this);
-    configButton->setIcon(KIcon("system-run"));
-    configButton->setMenu(m_configMenu);
-    configButton->setPopupMode(QToolButton::QToolButton::InstantPopup);
-    toolbar->addWidget(configButton);
+    if (name != "chapter") {
+        QToolButton *configButton = new QToolButton(toolbar);
+        m_configMenu = new QMenu(i18n("Misc..."), this);
+        configButton->setIcon(KIcon("system-run"));
+        configButton->setMenu(m_configMenu);
+        configButton->setPopupMode(QToolButton::QToolButton::InstantPopup);
+        toolbar->addWidget(configButton);
+
+        if (name == "clip") {
+            m_markerMenu = new QMenu(i18n("Go to marker..."), this);
+            m_markerMenu->setEnabled(false);
+            m_configMenu->addMenu(m_markerMenu);
+            connect(m_markerMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotGoToMarker(QAction *)));
+        }
+        m_configMenu->addAction(KIcon("transform-scale"), i18n("Resize (100%)"), this, SLOT(slotSetSizeOneToOne()));
+        m_configMenu->addAction(KIcon("transform-scale"), i18n("Resize (50%)"), this, SLOT(slotSetSizeOneToTwo()));
+    }
 
     QWidget *spacer = new QWidget(this);
     spacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
     toolbar->addWidget(spacer);
     m_timePos = new KRestrictedLine(this);
     m_timePos->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::MinimumExpanding);
-    m_timePos->setInputMask("99:99:99:99");
+    m_frametimecode = KdenliveSettings::frametimecode();
+    if (m_frametimecode) {
+        m_timePos->setInputMask(QString());
+        m_timePos->setValidator(new QIntValidator(this));
+    } else m_timePos->setInputMask("99:99:99:99");
     toolbar->addWidget(m_timePos);
 
     connect(m_timePos, SIGNAL(editingFinished()), this, SLOT(slotSeek()));
 
     layout2->addWidget(toolbar);
-    ui.button_frame->setLayout(layout2);
+    m_ui.button_frame->setLayout(layout2);
     const int toolHeight = toolbar->height();
-    ui.button_frame->setMinimumHeight(toolHeight);
+    m_ui.button_frame->setMinimumHeight(toolHeight);
 
     //m_ruler->setPixelPerMark(3);
 
-    QVBoxLayout *rendererBox = new QVBoxLayout(ui.video_frame);
+    if (profile.isEmpty()) profile = KdenliveSettings::current_profile();
+
+    QVBoxLayout *rendererBox = new QVBoxLayout(m_ui.video_frame);
     rendererBox->setContentsMargins(0, 0, 0, 0);
-    m_monitorRefresh = new MonitorRefresh(ui.video_frame);
+#ifdef Q_WS_MAC
+    m_glWidget = new VideoGLWidget(m_ui.video_frame);
+    rendererBox->addWidget(m_glWidget);
+    render = new Render(m_name, (int) m_ui.video_frame->winId(), -1, profile, this);
+    m_glWidget->setImageAspectRatio(render->dar());
+    m_glWidget->setBackgroundColor(KdenliveSettings::window_background());
+    m_glWidget->resize(m_ui.video_frame->size());
+    connect(render, SIGNAL(showImageSignal(QImage)), m_glWidget, SLOT(showImage(QImage)));
+    m_monitorRefresh = 0;
+#else
+    m_monitorRefresh = new MonitorRefresh(m_ui.video_frame);
     rendererBox->addWidget(m_monitorRefresh);
-    render = new Render(m_name, (int) m_monitorRefresh->winId(), -1, this);
+    render = new Render(m_name, (int) m_monitorRefresh->winId(), -1, profile, this);
     m_monitorRefresh->setRenderer(render);
-
-
+#endif
 
     connect(m_ruler, SIGNAL(seekRenderer(int)), this, SLOT(slotSeek(int)));
-    connect(m_ruler, SIGNAL(zoneChanged(QPoint)), this, SIGNAL(zoneUpdated(QPoint)));
     connect(render, SIGNAL(durationChanged(int)), this, SLOT(adjustRulerSize(int)));
     connect(render, SIGNAL(rendererPosition(int)), this, SLOT(seekCursor(int)));
     connect(render, SIGNAL(rendererStopped(int)), this, SLOT(rendererStopped(int)));
+    connect(render, SIGNAL(blockMonitors()), this, SIGNAL(blockMonitors()));
 
-    m_configMenu->addSeparator();
-    m_configMenu->addAction(KIcon("transform-scale"), i18n("Resize (100%)"), this, SLOT(slotSetSizeOneToOne()));
-    m_configMenu->addAction(KIcon("transform-scale"), i18n("Resize (50%)"), this, SLOT(slotSetSizeOneToTwo()));
-    //render->createVideoXWindow(ui.video_frame->winId(), -1);
-    m_length = 0;
+    //render->createVideoXWindow(m_ui.video_frame->winId(), -1);
 
     if (name != "clip") {
         connect(render, SIGNAL(rendererPosition(int)), this, SIGNAL(renderPosition(int)));
         connect(render, SIGNAL(durationChanged(int)), this, SIGNAL(durationChanged(int)));
+        connect(m_ruler, SIGNAL(zoneChanged(QPoint)), this, SIGNAL(zoneUpdated(QPoint)));
+    } else {
+        connect(m_ruler, SIGNAL(zoneChanged(QPoint)), this, SLOT(setClipZone(QPoint)));
     }
+#ifndef Q_WS_MAC
     m_monitorRefresh->show();
-    kDebug() << "/////// BUILDING MONITOR, ID: " << ui.video_frame->winId();
+#endif
+    kDebug() << "/////// BUILDING MONITOR, ID: " << m_ui.video_frame->winId();
+}
+
+Monitor::~Monitor()
+{
+    delete m_ruler;
+    delete m_timePos;
+    delete m_overlay;
+    delete m_monitorRefresh;
+    delete render;
 }
 
-QString Monitor::name() const {
+QString Monitor::name() const
+{
     return m_name;
 }
 
-void Monitor::setupMenu(QMenu *goMenu) {
+void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMenu *markerMenu)
+{
     m_contextMenu = new QMenu(this);
     m_contextMenu->addMenu(m_playMenu);
-    m_contextMenu->addMenu(goMenu);
+    if (goMenu) m_contextMenu->addMenu(goMenu);
+    if (markerMenu) m_contextMenu->addMenu(markerMenu);
 
-    //TODO: add save zone to timeline monitor when fixed
-    if (m_name == "clip") m_contextMenu->addAction(KIcon("document-save"), i18n("Save zone"), this, SLOT(slotSaveZone()));
+    m_playMenu->addAction(playZone);
+    m_playMenu->addAction(loopZone);
 
+    //TODO: add save zone to timeline monitor when fixed
+    if (m_name == "clip") {
+        m_contextMenu->addMenu(m_markerMenu);
+        m_contextMenu->addAction(KIcon("document-save"), i18n("Save zone"), this, SLOT(slotSaveZone()));
+    }
     QAction *extractFrame = m_configMenu->addAction(KIcon("document-new"), i18n("Extract frame"), this, SLOT(slotExtractCurrentFrame()));
     m_contextMenu->addAction(extractFrame);
 
     if (m_name != "clip") {
-        QAction *splitView = m_contextMenu->addAction(KIcon("document-new"), i18n("Split view"), render, SLOT(slotSplitView(bool)));
+#ifndef Q_WS_MAC
+        QAction *splitView = m_contextMenu->addAction(KIcon("view-split-left-right"), i18n("Split view"), render, SLOT(slotSplitView(bool)));
         splitView->setCheckable(true);
         m_configMenu->addAction(splitView);
+#endif
     } else {
         QAction *setThumbFrame = m_contextMenu->addAction(KIcon("document-new"), i18n("Set current image as thumbnail"), this, SLOT(slotSetThumbFrame()));
         m_configMenu->addAction(setThumbFrame);
     }
 
+    QAction *showTips = m_contextMenu->addAction(KIcon("help-hint"), i18n("Monitor overlay infos"));
+    showTips->setCheckable(true);
+    connect(showTips, SIGNAL(toggled(bool)), this, SLOT(slotSwitchMonitorInfo(bool)));
+    showTips->setChecked(KdenliveSettings::displayMonitorInfo());
+
+    QAction *dropFrames = m_contextMenu->addAction(KIcon(), i18n("Real time (drop frames)"));
+    dropFrames->setCheckable(true);
+    dropFrames->setChecked(true);
+    connect(dropFrames, SIGNAL(toggled(bool)), this, SLOT(slotSwitchDropFrames(bool)));
+
+    m_configMenu->addAction(showTips);
+    m_configMenu->addAction(dropFrames);
+
+}
+
+void Monitor::slotGoToMarker(QAction *action)
+{
+    int pos = action->data().toInt();
+    slotSeek(pos);
 }
 
-void Monitor::slotSetSizeOneToOne() {
+void Monitor::slotSetSizeOneToOne()
+{
     QRect r = QApplication::desktop()->screenGeometry();
     const int maxWidth = r.width() - 20;
     const int maxHeight = r.height() - 20;
@@ -169,14 +248,15 @@ void Monitor::slotSetSizeOneToOne() {
         height = height * 0.8;
     }
     kDebug() << "// MONITOR; set SIZE: " << width << ", " << height;
-    ui.video_frame->setFixedSize(width, height);
+    m_ui.video_frame->setFixedSize(width, height);
     updateGeometry();
     adjustSize();
-    //ui.video_frame->setMinimumSize(0, 0);
+    //m_ui.video_frame->setMinimumSize(0, 0);
     emit adjustMonitorSize();
 }
 
-void Monitor::slotSetSizeOneToTwo() {
+void Monitor::slotSetSizeOneToTwo()
+{
     QRect r = QApplication::desktop()->screenGeometry();
     const int maxWidth = r.width() - 20;
     const int maxHeight = r.height() - 20;
@@ -188,35 +268,115 @@ void Monitor::slotSetSizeOneToTwo() {
         height = height * 0.8;
     }
     kDebug() << "// MONITOR; set SIZE: " << width << ", " << height;
-    ui.video_frame->setFixedSize(width, height);
+    m_ui.video_frame->setFixedSize(width, height);
     updateGeometry();
     adjustSize();
-    //ui.video_frame->setMinimumSize(0, 0);
+    //m_ui.video_frame->setMinimumSize(0, 0);
     emit adjustMonitorSize();
 }
 
-void Monitor::resetSize() {
-    ui.video_frame->setMinimumSize(0, 0);
+void Monitor::resetSize()
+{
+    m_ui.video_frame->setMinimumSize(0, 0);
+}
+
+DocClipBase *Monitor::activeClip()
+{
+    return m_currentClip;
+}
+
+void Monitor::updateMarkers(DocClipBase *source)
+{
+    if (source == m_currentClip && source != NULL) {
+        m_markerMenu->clear();
+        QList <CommentedTime> markers = m_currentClip->commentedSnapMarkers();
+        if (!markers.isEmpty()) {
+            QList <int> marks;
+            for (int i = 0; i < markers.count(); i++) {
+                int pos = (int) markers.at(i).time().frames(m_monitorManager->timecode().fps());
+                marks.append(pos);
+                QString position = m_monitorManager->timecode().getTimecode(markers.at(i).time()) + ' ' + markers.at(i).comment();
+                QAction *go = m_markerMenu->addAction(position);
+                go->setData(pos);
+            }
+            m_ruler->setMarkers(marks);
+        } else m_ruler->setMarkers(QList <int>());
+        m_markerMenu->setEnabled(!m_markerMenu->isEmpty());
+    }
+}
+
+void Monitor::slotSeekToPreviousSnap()
+{
+    if (m_currentClip) slotSeek(getSnapForPos(true).frames(m_monitorManager->timecode().fps()));
 }
 
-void Monitor::slotZoneMoved(int start, int end) {
+void Monitor::slotSeekToNextSnap()
+{
+    if (m_currentClip) slotSeek(getSnapForPos(false).frames(m_monitorManager->timecode().fps()));
+}
+
+GenTime Monitor::position()
+{
+    return render->seekPosition();
+}
+
+GenTime Monitor::getSnapForPos(bool previous)
+{
+    QList <GenTime> snaps;
+    QList < GenTime > markers = m_currentClip->snapMarkers();
+    for (int i = 0; i < markers.size(); ++i) {
+        GenTime t = markers.at(i);
+        snaps.append(t);
+    }
+    QPoint zone = m_ruler->zone();
+    snaps.append(GenTime(zone.x(), m_monitorManager->timecode().fps()));
+    snaps.append(GenTime(zone.y(), m_monitorManager->timecode().fps()));
+    snaps.append(GenTime());
+    snaps.append(m_currentClip->duration());
+    qSort(snaps);
+
+    const GenTime pos = render->seekPosition();
+    for (int i = 0; i < snaps.size(); ++i) {
+        if (previous && snaps.at(i) >= pos) {
+            if (i == 0) i = 1;
+            return snaps.at(i - 1);
+        } else if (!previous && snaps.at(i) > pos) {
+            return snaps.at(i);
+        }
+    }
+    return GenTime();
+}
+
+
+
+void Monitor::slotZoneMoved(int start, int end)
+{
     m_ruler->setZone(start, end);
+    checkOverlay();
+    setClipZone(m_ruler->zone());
 }
 
-void Monitor::slotSetZoneStart() {
-    m_ruler->setZone(m_position, -1);
+void Monitor::slotSetZoneStart()
+{
+    m_ruler->setZone(render->seekFramePosition(), -1);
     emit zoneUpdated(m_ruler->zone());
+    checkOverlay();
+    setClipZone(m_ruler->zone());
 }
 
-void Monitor::slotSetZoneEnd() {
-    m_ruler->setZone(-1, m_position);
+void Monitor::slotSetZoneEnd()
+{
+    m_ruler->setZone(-1, render->seekFramePosition());
     emit zoneUpdated(m_ruler->zone());
+    checkOverlay();
+    setClipZone(m_ruler->zone());
 }
 
 // virtual
-void Monitor::mousePressEvent(QMouseEvent * event) {
+void Monitor::mousePressEvent(QMouseEvent * event)
+{
     if (event->button() != Qt::RightButton) {
-        if (ui.video_frame->underMouse()) {
+        if (m_ui.video_frame->underMouse()) {
             m_dragStarted = true;
             m_DragStartPosition = event->pos();
         }
@@ -224,10 +384,12 @@ void Monitor::mousePressEvent(QMouseEvent * event) {
 }
 
 // virtual
-void Monitor::mouseReleaseEvent(QMouseEvent * event) {
+void Monitor::mouseReleaseEvent(QMouseEvent * event)
+{
     if (m_dragStarted) {
-        if (ui.video_frame->underMouse()) {
-            slotPlay();
+        if (m_ui.video_frame->underMouse()) {
+            if (isActive()) slotPlay();
+            else activateMonitor();
         } else QWidget::mouseReleaseEvent(event);
         m_dragStarted = false;
     }
@@ -235,8 +397,9 @@ void Monitor::mouseReleaseEvent(QMouseEvent * event) {
 
 
 // virtual
-void Monitor::mouseMoveEvent(QMouseEvent *event) {
-    kDebug() << "// DRAG STARTED, MOUSE MOVED: ";
+void Monitor::mouseMoveEvent(QMouseEvent *event)
+{
+    // kDebug() << "// DRAG STARTED, MOUSE MOVED: ";
     if (!m_dragStarted || m_currentClip == NULL) return;
 
     if ((event->pos() - m_DragStartPosition).manhattanLength()
@@ -257,7 +420,6 @@ void Monitor::mouseMoveEvent(QMouseEvent *event) {
         mimeData->setData("kdenlive/clip", data);
         drag->setMimeData(mimeData);
         QPixmap pix = m_currentClip->thumbnail();
-        kDebug() << "/ / / /CLIP DRAGGED PIXMAP: " << pix.width() << "x" << pix.height();
         drag->setPixmap(pix);
         drag->setHotSpot(QPoint(0, 50));
         drag->start(Qt::MoveAction);
@@ -284,7 +446,8 @@ Qt::DropActions Monitor::supportedDropActions() const {
     return Qt::MoveAction;
 }*/
 
-QStringList Monitor::mimeTypes() const {
+QStringList Monitor::mimeTypes() const
+{
     QStringList qstrList;
     // list of accepted mime types for drop
     qstrList.append("kdenlive/clip");
@@ -301,91 +464,132 @@ QStringList Monitor::mimeTypes() const {
  * Ctrl+wheel moves single frame, without Ctrl moves a second.
  *
  * See also http://www.kdenlive.org/mantis/view.php?id=265 */
-void Monitor::wheelEvent(QWheelEvent * event) {
+void Monitor::wheelEvent(QWheelEvent * event)
+{
     if (event->modifiers() == Qt::ControlModifier) {
         int delta = m_monitorManager->timecode().fps();
-        if (event->delta() < 0) delta = 0 - delta;
-        slotSeek(m_position - delta);
+        if (event->delta() > 0) delta = 0 - delta;
+        slotSeek(render->seekFramePosition() - delta);
     } else {
-        if (event->delta() <= 0) slotForwardOneFrame();
+        if (event->delta() >= 0) slotForwardOneFrame();
         else slotRewindOneFrame();
     }
 }
 
-void Monitor::slotSetThumbFrame() {
+void Monitor::slotSetThumbFrame()
+{
     if (m_currentClip == NULL) {
         return;
     }
-    m_currentClip->setClipThumbFrame((uint) m_position);
+    m_currentClip->setClipThumbFrame((uint) render->seekFramePosition());
     emit refreshClipThumbnail(m_currentClip->getId());
 }
 
-void Monitor::slotExtractCurrentFrame() {
-    QPixmap frame = render->extractFrame(m_position);
-    QString outputFile = KFileDialog::getSaveFileName(KUrl(), "image/png");
-    if (!outputFile.isEmpty()) frame.save(outputFile);
+void Monitor::slotExtractCurrentFrame()
+{
+    QImage frame = render->extractFrame(render->seekFramePosition());
+    KFileDialog *fs = new KFileDialog(KUrl(), "image/png", this);
+    fs->setOperationMode(KFileDialog::Saving);
+    fs->setMode(KFile::File);
+#if KDE_IS_VERSION(4,2,0)
+    fs->setConfirmOverwrite(true);
+#endif
+    fs->setKeepLocation(true);
+    fs->exec();
+    QString path = fs->selectedFile();
+    delete fs;
+    if (!path.isEmpty()) {
+        frame.save(path);
+    }
 }
 
-bool Monitor::isActive() const {
+bool Monitor::isActive() const
+{
     return m_isActive;
 }
 
-void Monitor::activateMonitor() {
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+void Monitor::activateMonitor()
+{
+    if (!m_isActive) m_monitorManager->switchMonitors(); //m_monitorManager->activateMonitor(m_name);
 }
 
-void Monitor::slotSeek() {
-    const int frames = m_monitorManager->timecode().getFrameCount(m_timePos->text(), m_monitorManager->timecode().fps());
+void Monitor::setTimePos(const QString &pos)
+{
+    if (m_frametimecode) {
+        int frames = m_monitorManager->timecode().getFrameCount(pos);
+        m_timePos->setText(QString::number(frames));
+    } else m_timePos->setText(pos);
+    slotSeek();
+}
+
+void Monitor::slotSeek()
+{
+    int frames;
+    if (m_frametimecode) frames = m_timePos->text().toInt();
+    else frames = m_monitorManager->timecode().getFrameCount(m_timePos->text());
+    //kDebug() << "// / / SEEK TO: " << frames;
     slotSeek(frames);
 }
 
-void Monitor::slotSeek(int pos) {
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+void Monitor::slotSeek(int pos)
+{
+    activateMonitor();
     if (render == NULL) return;
     render->seekToFrame(pos);
-    m_position = pos;
-    emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
+    emit renderPosition(render->seekFramePosition());
+}
+
+void Monitor::checkOverlay()
+{
+    if (m_overlay == NULL) return;
+    int pos = render->seekFramePosition();
+    QPoint zone = m_ruler->zone();
+    if (pos == zone.x()) m_overlay->setOverlayText(i18n("In Point"));
+    else if (pos == zone.y()) m_overlay->setOverlayText(i18n("Out Point"));
+    else {
+        if (m_currentClip) {
+            QString markerComment = m_currentClip->markerComment(GenTime(pos, m_monitorManager->timecode().fps()));
+            if (markerComment.isEmpty()) m_overlay->setHidden(true);
+            else m_overlay->setOverlayText(markerComment, false);
+        } else m_overlay->setHidden(true);
+    }
 }
 
-void Monitor::slotStart() {
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+void Monitor::slotStart()
+{
+    activateMonitor();
     render->play(0);
-    m_position = 0;
-    render->seekToFrame(m_position);
-    emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
+    render->seekToFrame(0);
+    emit renderPosition(0);
 }
 
-void Monitor::slotEnd() {
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+void Monitor::slotEnd()
+{
+    activateMonitor();
     render->play(0);
-    m_position = render->getLength();
-    render->seekToFrame(m_position);
-    emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
+    render->seekToFrame(render->getLength());
+    emit renderPosition(render->seekFramePosition());
 }
 
-void Monitor::slotZoneStart() {
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+void Monitor::slotZoneStart()
+{
+    activateMonitor();
     render->play(0);
-    m_position = m_ruler->zone().x();
-    render->seekToFrame(m_position);
-    emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
+    render->seekToFrame(m_ruler->zone().x());
+    emit renderPosition(render->seekFramePosition());
 }
 
-void Monitor::slotZoneEnd() {
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+void Monitor::slotZoneEnd()
+{
+    activateMonitor();
     render->play(0);
-    m_position = m_ruler->zone().y();
-    render->seekToFrame(m_position);
-    emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
+    render->seekToFrame(m_ruler->zone().y());
+    emit renderPosition(render->seekFramePosition());
 }
 
-void Monitor::slotRewind(double speed) {
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+void Monitor::slotRewind(double speed)
+{
+    activateMonitor();
     if (speed == 0) {
         double currentspeed = render->playSpeed();
         if (currentspeed >= 0) render->play(-2);
@@ -395,8 +599,9 @@ void Monitor::slotRewind(double speed) {
     m_playAction->setIcon(m_pauseIcon);
 }
 
-void Monitor::slotForward(double speed) {
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+void Monitor::slotForward(double speed)
+{
+    activateMonitor();
     if (speed == 0) {
         double currentspeed = render->playSpeed();
         if (currentspeed <= 1) render->play(2);
@@ -406,44 +611,51 @@ void Monitor::slotForward(double speed) {
     m_playAction->setIcon(m_pauseIcon);
 }
 
-void Monitor::slotRewindOneFrame() {
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+void Monitor::slotRewindOneFrame(int diff)
+{
+    activateMonitor();
     render->play(0);
-    if (m_position < 1) return;
-    m_position--;
-    render->seekToFrame(m_position);
-    emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
+    render->seekToFrameDiff(-diff);
+    emit renderPosition(render->seekFramePosition());
 }
 
-void Monitor::slotForwardOneFrame() {
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+void Monitor::slotForwardOneFrame(int diff)
+{
+    activateMonitor();
     render->play(0);
-    if (m_position >= m_length) return;
-    m_position++;
-    render->seekToFrame(m_position);
-    emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
+    render->seekToFrameDiff(diff);
+    emit renderPosition(render->seekFramePosition());
 }
 
-void Monitor::seekCursor(int pos) {
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
-    m_position = pos;
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
+void Monitor::seekCursor(int pos)
+{
+    activateMonitor();
+    checkOverlay();
+    if (m_frametimecode) m_timePos->setText(QString::number(pos));
+    else m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
     m_ruler->slotNewValue(pos);
 }
 
-void Monitor::rendererStopped(int pos) {
-    //int rulerPos = (int)(pos * m_scale);
+void Monitor::rendererStopped(int pos)
+{
+    if (m_currentClip != NULL && m_playAction->isChecked()) {
+        // Clip monitor
+        if (pos >= m_length - 1) {
+            slotStart();
+            return;
+        }
+    }
     m_ruler->slotNewValue(pos);
-    m_position = pos;
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
+    checkOverlay();
+    if (m_frametimecode) m_timePos->setText(QString::number(pos));
+    else m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
     m_playAction->setChecked(false);
     m_playAction->setIcon(m_playIcon);
 }
 
-void Monitor::initMonitor() {
-    kDebug() << "/////// INITING MONITOR, ID: " << ui.video_frame->winId();
+void Monitor::initMonitor()
+{
+    kDebug() << "/////// INITING MONITOR, ID: " << m_ui.video_frame->winId();
 }
 
 // virtual
@@ -454,92 +666,120 @@ void Monitor::initMonitor() {
     //
 }*/
 
-void Monitor::adjustRulerSize(int length) {
+void Monitor::adjustRulerSize(int length)
+{
     if (length > 0) m_length = length;
     m_ruler->adjustScale(m_length);
+    if (m_currentClip != NULL) {
+        QPoint zone = m_currentClip->zone();
+        m_ruler->setZone(zone.x(), zone.y());
+    }
 }
 
-void Monitor::stop() {
+void Monitor::stop()
+{
     m_isActive = false;
     if (render) render->stop();
     //kDebug()<<"/// MONITOR RENDER STOP";
 }
 
-void Monitor::start() {
+void Monitor::start()
+{
     m_isActive = true;
     if (render) render->start();
     //kDebug()<<"/// MONITOR RENDER START";
 }
 
-void Monitor::refreshMonitor(bool visible) {
+void Monitor::refreshMonitor(bool visible)
+{
     if (visible && render) {
-        if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+        activateMonitor();
         render->doRefresh(); //askForRefresh();
     }
 }
 
-void Monitor::pause() {
+void Monitor::pause()
+{
     if (render == NULL) return;
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+    activateMonitor();
     render->pause();
     //m_playAction->setChecked(true);
     //m_playAction->setIcon(m_pauseIcon);
 }
 
-void Monitor::slotPlay() {
+void Monitor::slotPlay()
+{
     if (render == NULL) return;
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+    activateMonitor();
+    if (render->playSpeed() == 0) {
+        m_playAction->setChecked(true);
+        m_playAction->setIcon(m_pauseIcon);
+    } else {
+        m_playAction->setChecked(false);
+        m_playAction->setIcon(m_playIcon);
+    }
     render->switchPlay();
-    m_playAction->setChecked(true);
-    m_playAction->setIcon(m_pauseIcon);
 }
 
-void Monitor::slotPlayZone() {
+void Monitor::slotPlayZone()
+{
     if (render == NULL) return;
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+    activateMonitor();
     QPoint p = m_ruler->zone();
-    render->playZone(GenTime(p.x(), render->fps()), GenTime(p.y(), render->fps()));
+    render->playZone(GenTime(p.x(), m_monitorManager->timecode().fps()), GenTime(p.y(), m_monitorManager->timecode().fps()));
     m_playAction->setChecked(true);
     m_playAction->setIcon(m_pauseIcon);
 }
 
-void Monitor::slotLoopZone() {
+void Monitor::slotLoopZone()
+{
     if (render == NULL) return;
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+    activateMonitor();
     QPoint p = m_ruler->zone();
-    render->loopZone(GenTime(p.x(), render->fps()), GenTime(p.y(), render->fps()));
+    render->loopZone(GenTime(p.x(), m_monitorManager->timecode().fps()), GenTime(p.y(), m_monitorManager->timecode().fps()));
     m_playAction->setChecked(true);
     m_playAction->setIcon(m_pauseIcon);
 }
 
-void Monitor::slotSetXml(DocClipBase *clip, const int position) {
+void Monitor::slotSetXml(DocClipBase *clip, QPoint zone, const int position)
+{
     if (render == NULL) return;
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
-    if (!clip) return;
-    if (clip != m_currentClip && clip->producer() != NULL) {
+    activateMonitor();
+    if (clip == NULL && m_currentClip != NULL) {
+        m_currentClip = NULL;
+        render->setProducer(NULL, -1);
+        return;
+    }
+    if (clip != m_currentClip) {
         m_currentClip = clip;
-        render->setProducer(clip->producer(), position);
-        //m_ruler->slotNewValue(0);
-        //adjustRulerSize(clip->producer()->get_playtime());
-        //m_timePos->setText("00:00:00:00");
-        m_position = position;
-    } else if (position != -1) render->seek(GenTime(position, render->fps()));
+        updateMarkers(clip);
+        if (render->setProducer(clip->producer(), position) == -1) {
+            // MLT CONSUMER is broken
+            emit blockMonitors();
+        }
+    } else if (position != -1) render->seek(GenTime(position, m_monitorManager->timecode().fps()));
+    if (!zone.isNull()) {
+        m_ruler->setZone(zone.x(), zone.y());
+        render->seek(GenTime(zone.x(), m_monitorManager->timecode().fps()));
+    }
 }
 
-void Monitor::slotOpenFile(const QString &file) {
+void Monitor::slotOpenFile(const QString &file)
+{
     if (render == NULL) return;
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+    activateMonitor();
     QDomDocument doc;
-    QDomElement westley = doc.createElement("westley");
-    doc.appendChild(westley);
+    QDomElement mlt = doc.createElement("mlt");
+    doc.appendChild(mlt);
     QDomElement prod = doc.createElement("producer");
-    westley.appendChild(prod);
+    mlt.appendChild(prod);
     prod.setAttribute("mlt_service", "avformat");
     prod.setAttribute("resource", file);
     render->setSceneList(doc, 0);
 }
 
-void Monitor::slotSaveZone() {
+void Monitor::slotSaveZone()
+{
     if (render == NULL) return;
     emit saveZone(render, m_ruler->zone());
 
@@ -547,27 +787,130 @@ void Monitor::slotSaveZone() {
 }
 
 
-void Monitor::resetProfile() {
+void Monitor::resetProfile(const QString profile)
+{
     if (render == NULL) return;
-    render->resetProfile();
+    render->resetProfile(profile);
 }
 
-void Monitor::saveSceneList(QString path, QDomElement info) {
+void Monitor::saveSceneList(QString path, QDomElement info)
+{
     if (render == NULL) return;
     render->saveSceneList(path, info);
 }
 
-MonitorRefresh::MonitorRefresh(QWidget* parent): QWidget(parent), m_renderer(NULL) {
+const QString Monitor::sceneList()
+{
+    if (render == NULL) return QString();
+    return render->sceneList();
+}
+
+
+void Monitor::setClipZone(QPoint pos)
+{
+    if (m_currentClip == NULL) return;
+    m_currentClip->setZone(pos);
+}
+
+void Monitor::slotSwitchDropFrames(bool show)
+{
+    render->setDropFrames(show);
+}
+
+void Monitor::slotSwitchMonitorInfo(bool show)
+{
+    KdenliveSettings::setDisplayMonitorInfo(show);
+    if (show) {
+        if (m_overlay) return;
+#ifndef Q_WS_MAC
+        m_overlay = new Overlay(m_monitorRefresh);
+        m_overlay->raise();
+        m_overlay->setHidden(true);
+#else
+        m_overlay = new Overlay(m_glWidget);
+#endif
+    } else {
+        delete m_overlay;
+        m_overlay = NULL;
+    }
+}
+
+void Monitor::updateTimecodeFormat()
+{
+    m_frametimecode = KdenliveSettings::frametimecode();
+    if (m_frametimecode) {
+        int frames = m_monitorManager->timecode().getFrameCount(m_timePos->text());
+        m_timePos->setValidator(new QIntValidator(this));
+        m_timePos->setInputMask(QString());
+        m_timePos->setText(QString::number(frames));
+    } else {
+        int pos = m_timePos->text().toInt();
+        m_timePos->setValidator(0);
+        m_timePos->setInputMask("99:99:99:99");
+        m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
+    }
+}
+
+QStringList Monitor::getZoneInfo() const
+{
+    QStringList result;
+    if (m_currentClip == NULL) return result;
+    result << m_currentClip->getId();
+    QPoint zone = m_ruler->zone();
+    result << QString::number(zone.x()) << QString::number(zone.y());
+    return result;
+}
+
+
+MonitorRefresh::MonitorRefresh(QWidget* parent) : \
+        QWidget(parent),
+        m_renderer(NULL)
+{
     setAttribute(Qt::WA_PaintOnScreen);
-    setAttribute(Qt::WA_OpaquePaintEvent); //setAttribute(Qt::WA_NoSystemBackground);
+    setAttribute(Qt::WA_OpaquePaintEvent);
+    //setAttribute(Qt::WA_NoSystemBackground);
 }
 
-void MonitorRefresh::setRenderer(Render* render) {
+void MonitorRefresh::setRenderer(Render* render)
+{
     m_renderer = render;
 }
 
-void MonitorRefresh::paintEvent(QPaintEvent * event) {
+void MonitorRefresh::paintEvent(QPaintEvent * /*event*/)
+{
     if (m_renderer) m_renderer->doRefresh();
 }
 
+
+Overlay::Overlay(QWidget* parent) :
+        QLabel(parent)
+{
+    setAttribute(Qt::WA_TransparentForMouseEvents);
+    setAttribute(Qt::WA_OpaquePaintEvent);
+    //setAttribute(Qt::WA_NoSystemBackground);
+    setAutoFillBackground(false);
+}
+
+void Overlay::paintEvent(QPaintEvent * /*event*/)
+{
+    QPainter painter(this);
+    QColor col;
+    painter.setPen(Qt::white);
+    if (m_isZone) col = QColor(200, 0, 0);
+    else col = QColor(0, 0, 200);
+    painter.fillRect(rect(), col);
+    painter.drawText(rect(), Qt::AlignCenter, text());
+}
+
+
+
+void Overlay::setOverlayText(const QString &text, bool isZone)
+{
+    setHidden(true);
+    m_isZone = isZone;
+    setText(' ' + text + ' ');
+    setHidden(false);
+    update();
+}
+
 #include "monitor.moc"