Go to one second forward / backword:

[kdenlive] / src / monitor.cpp

diff --git a/src/monitor.cpp b/src/monitor.cpp
index d28b905f21776f3e632ef59e5a833719dfe19ec1..4de7d7dfc9120f136b9ea3f52a41d839b0f72666 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -32,7 +32,6 @@
 #include <KApplication>
 #include <KMessageBox>
 
-#include "gentime.h"
 #include "monitor.h"
 #include "renderer.h"
 #include "monitormanager.h"
@@ -147,10 +146,11 @@ QString Monitor::name() const {
     return m_name;
 }
 
-void Monitor::setupMenu(QMenu *goMenu) {
+void Monitor::setupMenu(QMenu *goMenu, QMenu *markerMenu) {
     m_contextMenu = new QMenu(this);
     m_contextMenu->addMenu(m_playMenu);
     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()));
@@ -211,6 +211,50 @@ void Monitor::resetSize() {
     ui.video_frame->setMinimumSize(0, 0);
 }
 
+DocClipBase *Monitor::activeClip() {
+    return m_currentClip;
+}
+
+void Monitor::slotSeekToPreviousSnap() {
+    if (m_currentClip) slotSeek(getSnapForPos(true).frames(m_monitorManager->timecode().fps()));
+}
+
+void Monitor::slotSeekToNextSnap() {
+    if (m_currentClip) slotSeek(getSnapForPos(false).frames(m_monitorManager->timecode().fps()));
+}
+
+GenTime Monitor::position() {
+    return GenTime(m_position, m_monitorManager->timecode().fps());
+}
+
+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(m_position, m_monitorManager->timecode().fps());
+    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();
@@ -349,7 +393,7 @@ bool Monitor::isActive() const {
 }
 
 void Monitor::activateMonitor() {
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+    if (!m_isActive) m_monitorManager->switchMonitors(); //m_monitorManager->activateMonitor(m_name);
 }
 
 void Monitor::slotSeek() {
@@ -358,25 +402,30 @@ void Monitor::slotSeek() {
 }
 
 void Monitor::slotSeek(int pos) {
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+    activateMonitor();
     if (render == NULL) return;
-    render->seekToFrame(pos);
     m_position = pos;
+    checkOverlay();
+    render->seekToFrame(pos);
     emit renderPosition(m_position);
     m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
-    checkOverlay();
 }
 
 void Monitor::checkOverlay() {
     QPoint zone = m_ruler->zone();
-    //kDebug()<<"RUL: "<<pos<<", ZONE: "<<zone;
     if (m_position == zone.x()) m_overlay->setOverlayText(i18n("In Point"));
     else if (m_position == zone.y()) m_overlay->setOverlayText(i18n("Out Point"));
-    else m_overlay->setHidden(true);
+    else {
+        if (m_currentClip) {
+            QString markerComment = m_currentClip->markerComment(GenTime(m_position, 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);
+    activateMonitor();
     render->play(0);
     m_position = 0;
     render->seekToFrame(m_position);
@@ -385,7 +434,7 @@ void Monitor::slotStart() {
 }
 
 void Monitor::slotEnd() {
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+    activateMonitor();
     render->play(0);
     m_position = render->getLength();
     render->seekToFrame(m_position);
@@ -394,7 +443,7 @@ void Monitor::slotEnd() {
 }
 
 void Monitor::slotZoneStart() {
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+    activateMonitor();
     render->play(0);
     m_position = m_ruler->zone().x();
     render->seekToFrame(m_position);
@@ -403,7 +452,7 @@ void Monitor::slotZoneStart() {
 }
 
 void Monitor::slotZoneEnd() {
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+    activateMonitor();
     render->play(0);
     m_position = m_ruler->zone().y();
     render->seekToFrame(m_position);
@@ -412,7 +461,7 @@ void Monitor::slotZoneEnd() {
 }
 
 void Monitor::slotRewind(double speed) {
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+    activateMonitor();
     if (speed == 0) {
         double currentspeed = render->playSpeed();
         if (currentspeed >= 0) render->play(-2);
@@ -423,7 +472,7 @@ void Monitor::slotRewind(double speed) {
 }
 
 void Monitor::slotForward(double speed) {
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+    activateMonitor();
     if (speed == 0) {
         double currentspeed = render->playSpeed();
         if (currentspeed <= 1) render->play(2);
@@ -433,34 +482,36 @@ 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--;
+    m_position -= diff;
+    m_position = qMax(m_position, 0);
+    checkOverlay();
     render->seekToFrame(m_position);
     emit renderPosition(m_position);
     m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
-    checkOverlay();
 }
 
-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++;
+    m_position += diff;
+    m_position = qMin(m_position, m_length);
+    checkOverlay();
     render->seekToFrame(m_position);
     emit renderPosition(m_position);
     m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
-    checkOverlay();
 }
 
 void Monitor::seekCursor(int pos) {
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+    activateMonitor();
     m_position = pos;
+    //checkOverlay();
     m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
     m_ruler->slotNewValue(pos);
-    checkOverlay();
 }
 
 void Monitor::rendererStopped(int pos) {
@@ -503,14 +554,14 @@ void Monitor::start() {
 
 void Monitor::refreshMonitor(bool visible) {
     if (visible && render) {
-        if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+        activateMonitor();
         render->doRefresh(); //askForRefresh();
     }
 }
 
 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);
@@ -518,7 +569,7 @@ void Monitor::pause() {
 
 void Monitor::slotPlay() {
     if (render == NULL) return;
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+    activateMonitor();
     render->switchPlay();
     m_playAction->setChecked(true);
     m_playAction->setIcon(m_pauseIcon);
@@ -526,7 +577,7 @@ void Monitor::slotPlay() {
 
 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()));
     m_playAction->setChecked(true);
@@ -535,7 +586,7 @@ void Monitor::slotPlayZone() {
 
 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()));
     m_playAction->setChecked(true);
@@ -544,7 +595,7 @@ void Monitor::slotLoopZone() {
 
 void Monitor::slotSetXml(DocClipBase *clip, const int position) {
     if (render == NULL) return;
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+    activateMonitor();
     if (!clip) return;
     if (clip != m_currentClip && clip->producer() != NULL) {
         m_currentClip = clip;
@@ -558,7 +609,7 @@ void Monitor::slotSetXml(DocClipBase *clip, const int position) {
 
 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);
@@ -608,7 +659,7 @@ void MonitorRefresh::paintEvent(QPaintEvent * event) {
 }
 
 
-Overlay::Overlay(QWidget* parent): QWidget(parent) {
+Overlay::Overlay(QWidget* parent): QLabel(parent) {
     setAttribute(Qt::WA_TransparentForMouseEvents);
     //setAttribute(Qt::WA_OpaquePaintEvent); //
     //setAttribute(Qt::WA_NoSystemBackground);
@@ -617,14 +668,20 @@ Overlay::Overlay(QWidget* parent): QWidget(parent) {
 
 void Overlay::paintEvent(QPaintEvent * event) {
     QPainter painter(this);
-    painter.fillRect(event->rect(), QColor(200, 0, 0));
-    painter.drawText(event->rect(), Qt::AlignCenter, m_text);
-    //if (m_renderer) m_renderer->doRefresh();
+    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) {
-    kDebug() << "///////  SET OVERLAY: " << text;
-    m_text = text;
+
+
+void Overlay::setOverlayText(const QString &text, bool isZone) {
+    setHidden(true);
+    m_isZone = isZone;
+    setText(' ' + text + ' ');
     setHidden(false);
     update();
 }