Remember & save monitor zone for each clip:

[kdenlive] / src / monitor.cpp

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 067efe3f39743f355fc87c0af9ce317e9b6fa897..0d055d75e0fda93a9604901c1907f937c409db09 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -67,8 +67,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);
@@ -116,7 +114,6 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent)
 
 
     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)));
@@ -130,6 +127,9 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent)
     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)));
     }
     m_monitorRefresh->show();
     kDebug() << "/////// BUILDING MONITOR, ID: " << ui.video_frame->winId();
@@ -146,10 +146,14 @@ 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 (markerMenu) m_contextMenu->addMenu(markerMenu);
+
+    m_playMenu->addAction(playZone);
+    m_playMenu->addAction(loopZone);
 
     //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 +214,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 +226,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();
@@ -249,18 +261,21 @@ GenTime Monitor::getSnapForPos(bool previous) {
 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);
     emit zoneUpdated(m_ruler->zone());
     checkOverlay();
+    setClipZone(m_ruler->zone());
 }
 
 void Monitor::slotSetZoneEnd() {
     m_ruler->setZone(-1, m_position);
     emit zoneUpdated(m_ruler->zone());
     checkOverlay();
+    setClipZone(m_ruler->zone());
 }
 
 // virtual
@@ -384,7 +399,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 +408,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 +431,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 +440,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 +449,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 +458,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 +467,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 +478,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,32 +488,33 @@ 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--;
-    checkOverlay();
+    m_position -= diff;
+    m_position = qMax(m_position, 0);
     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++;
-    checkOverlay();
+    m_position += diff;
+    m_position = qMin(m_position, m_length);
     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);
 }
@@ -507,6 +523,7 @@ void Monitor::rendererStopped(int pos) {
     //int rulerPos = (int)(pos * m_scale);
     m_ruler->slotNewValue(pos);
     m_position = pos;
+    checkOverlay();
     m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
     m_playAction->setChecked(false);
     m_playAction->setIcon(m_playIcon);
@@ -527,6 +544,10 @@ void Monitor::initMonitor() {
 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() {
@@ -543,14 +564,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,15 +579,20 @@ void Monitor::pause() {
 
 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() {
     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 +601,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,21 +610,22 @@ void Monitor::slotLoopZone() {
 
 void Monitor::slotSetXml(DocClipBase *clip, 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 && 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()));
 }
 
 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);
@@ -634,6 +661,12 @@ QDomDocument Monitor::sceneList() {
     return doc;
 }
 
+
+void Monitor::setClipZone(QPoint pos) {
+    if (m_currentClip == NULL) return;
+    m_currentClip->setZone(pos);
+}
+
 MonitorRefresh::MonitorRefresh(QWidget* parent): QWidget(parent), m_renderer(NULL) {
     setAttribute(Qt::WA_PaintOnScreen);
     setAttribute(Qt::WA_OpaquePaintEvent); //setAttribute(Qt::WA_NoSystemBackground);
@@ -650,7 +683,7 @@ void MonitorRefresh::paintEvent(QPaintEvent * event) {
 
 Overlay::Overlay(QWidget* parent): QLabel(parent) {
     setAttribute(Qt::WA_TransparentForMouseEvents);
-    //setAttribute(Qt::WA_OpaquePaintEvent); //
+    setAttribute(Qt::WA_OpaquePaintEvent);
     //setAttribute(Qt::WA_NoSystemBackground);
     setAutoFillBackground(false);
 }