Go to one second forward / backword:

[kdenlive] / src / monitor.cpp

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 067efe3f39743f355fc87c0af9ce317e9b6fa897..4de7d7dfc9120f136b9ea3f52a41d839b0f72666 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -146,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()));
@@ -210,6 +211,10 @@ 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()));
 }
@@ -218,6 +223,10 @@ 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();
@@ -384,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() {
@@ -393,7 +402,7 @@ void Monitor::slotSeek() {
 }
 
 void Monitor::slotSeek(int pos) {
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+    activateMonitor();
     if (render == NULL) return;
     m_position = pos;
     checkOverlay();
@@ -416,7 +425,7 @@ void Monitor::checkOverlay() {
 }
 
 void Monitor::slotStart() {
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+    activateMonitor();
     render->play(0);
     m_position = 0;
     render->seekToFrame(m_position);
@@ -425,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);
@@ -434,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);
@@ -443,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);
@@ -452,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);
@@ -463,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);
@@ -473,22 +482,24 @@ 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));
 }
 
-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);
@@ -496,9 +507,9 @@ void Monitor::slotForwardOneFrame() {
 }
 
 void Monitor::seekCursor(int pos) {
-    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+    activateMonitor();
     m_position = pos;
-    checkOverlay();
+    //checkOverlay();
     m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
     m_ruler->slotNewValue(pos);
 }
@@ -543,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);
@@ -558,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);
@@ -566,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);
@@ -575,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);
@@ -584,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;
@@ -598,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);