X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.cpp;h=73d3448f28faf1e3d83b50e78ebe7a2318e17379;hb=7d1f818376b25f793ad6e8960b73a24a39605945;hp=bc3cd477fef30aeeda426a94079541251311f61d;hpb=31634a60eb8ff1dcaa6d329ea88e2d6985293528;p=kdenlive

diff --git a/src/monitor.cpp b/src/monitor.cpp
index bc3cd477..73d3448f 100644
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -38,6 +38,7 @@
 #include <QToolBar>
 #include <QDesktopWidget>
 #include <QLabel>
+#include <QIntValidator>
 
 
 Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) :
@@ -51,7 +52,6 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) :
         m_isActive(false),
         m_scale(1),
         m_length(0),
-        m_position(-1),
         m_dragStarted(false)
 {
     m_ui.setupUi(this);
@@ -107,7 +107,11 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) :
     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()));
@@ -121,15 +125,27 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) :
 
     QVBoxLayout *rendererBox = new QVBoxLayout(m_ui.video_frame);
     rendererBox->setContentsMargins(0, 0, 0, 0);
+#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, 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);
     m_monitorRefresh->setRenderer(render);
+#endif
 
     connect(m_ruler, SIGNAL(seekRenderer(int)), this, SLOT(slotSeek(int)));
     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()));
 
     //render->createVideoXWindow(m_ui.video_frame->winId(), -1);
 
@@ -140,7 +156,9 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) :
     } else {
         connect(m_ruler, SIGNAL(zoneChanged(QPoint)), this, SLOT(setClipZone(QPoint)));
     }
+#ifndef Q_WS_MAC
     m_monitorRefresh->show();
+#endif
     kDebug() << "/////// BUILDING MONITOR, ID: " << m_ui.video_frame->winId();
 }
 
@@ -150,6 +168,7 @@ Monitor::~Monitor()
     delete m_timePos;
     delete m_overlay;
     delete m_monitorRefresh;
+    delete render;
 }
 
 QString Monitor::name() const
@@ -174,9 +193,11 @@ void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMe
     m_contextMenu->addAction(extractFrame);
 
     if (m_name != "clip") {
+#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);
@@ -259,7 +280,7 @@ void Monitor::slotSeekToNextSnap()
 
 GenTime Monitor::position()
 {
-    return GenTime(m_position, m_monitorManager->timecode().fps());
+    return render->seekPosition();
 }
 
 GenTime Monitor::getSnapForPos(bool previous)
@@ -277,7 +298,7 @@ GenTime Monitor::getSnapForPos(bool previous)
     snaps.append(m_currentClip->duration());
     qSort(snaps);
 
-    const GenTime pos(m_position, m_monitorManager->timecode().fps());
+    const GenTime pos = render->seekPosition();
     for (int i = 0; i < snaps.size(); ++i) {
         if (previous && snaps.at(i) >= pos) {
             if (i == 0) i = 1;
@@ -300,7 +321,7 @@ void Monitor::slotZoneMoved(int start, int end)
 
 void Monitor::slotSetZoneStart()
 {
-    m_ruler->setZone(m_position, -1);
+    m_ruler->setZone(render->seekFramePosition(), -1);
     emit zoneUpdated(m_ruler->zone());
     checkOverlay();
     setClipZone(m_ruler->zone());
@@ -308,7 +329,7 @@ void Monitor::slotSetZoneStart()
 
 void Monitor::slotSetZoneEnd()
 {
-    m_ruler->setZone(-1, m_position);
+    m_ruler->setZone(-1, render->seekFramePosition());
     emit zoneUpdated(m_ruler->zone());
     checkOverlay();
     setClipZone(m_ruler->zone());
@@ -410,10 +431,10 @@ 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();
     }
 }
@@ -423,13 +444,13 @@ 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);
+    QPixmap frame = render->extractFrame(render->seekFramePosition());
     QString outputFile = KFileDialog::getSaveFileName(KUrl(), "image/png");
     if (!outputFile.isEmpty()) {
         if (QFile::exists(outputFile) && KMessageBox::questionYesNo(this, i18n("File already exists.\nDo you want to overwrite it?")) == KMessageBox::No) return;
@@ -449,13 +470,19 @@ void Monitor::activateMonitor()
 
 void Monitor::setTimePos(const QString &pos)
 {
-    m_timePos->setText(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()
 {
-    const int frames = m_monitorManager->timecode().getFrameCount(m_timePos->text(), m_monitorManager->timecode().fps());
+    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);
 }
 
@@ -463,20 +490,20 @@ void Monitor::slotSeek(int pos)
 {
     activateMonitor();
     if (render == NULL) return;
-    m_position = pos;
     render->seekToFrame(pos);
-    emit renderPosition(m_position);
+    emit renderPosition(render->seekFramePosition());
 }
 
 void Monitor::checkOverlay()
 {
     if (m_overlay == NULL) return;
+    int pos = render->seekFramePosition();
     QPoint zone = m_ruler->zone();
-    if (m_position == zone.x()) m_overlay->setOverlayText(i18n("In Point"));
-    else if (m_position == zone.y()) m_overlay->setOverlayText(i18n("Out Point"));
+    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(m_position, m_monitorManager->timecode().fps()));
+            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);
@@ -487,36 +514,32 @@ void Monitor::slotStart()
 {
     activateMonitor();
     render->play(0);
-    m_position = 0;
-    render->seekToFrame(m_position);
-    emit renderPosition(m_position);
+    render->seekToFrame(0);
+    emit renderPosition(0);
 }
 
 void Monitor::slotEnd()
 {
     activateMonitor();
     render->play(0);
-    m_position = render->getLength();
-    render->seekToFrame(m_position);
-    emit renderPosition(m_position);
+    render->seekToFrame(render->getLength());
+    emit renderPosition(render->seekFramePosition());
 }
 
 void Monitor::slotZoneStart()
 {
     activateMonitor();
     render->play(0);
-    m_position = m_ruler->zone().x();
-    render->seekToFrame(m_position);
-    emit renderPosition(m_position);
+    render->seekToFrame(m_ruler->zone().x());
+    emit renderPosition(render->seekFramePosition());
 }
 
 void Monitor::slotZoneEnd()
 {
     activateMonitor();
     render->play(0);
-    m_position = m_ruler->zone().y();
-    render->seekToFrame(m_position);
-    emit renderPosition(m_position);
+    render->seekToFrame(m_ruler->zone().y());
+    emit renderPosition(render->seekFramePosition());
 }
 
 void Monitor::slotRewind(double speed)
@@ -547,34 +570,24 @@ void Monitor::slotRewindOneFrame(int diff)
 {
     activateMonitor();
     render->play(0);
-    if (m_position < 1) return;
-    /*
-     * freebsd needs this hack to upgrade m_position value:
-     * http://www.kdenlive.org/mantis/view.php?id=491
-     */
-    int position = m_position - diff;
-    m_position = qMax(position, 0);
-    render->seekToFrame(m_position);
-    emit renderPosition(m_position);
+    render->seekToFrameDiff(-diff);
+    emit renderPosition(render->seekFramePosition());
 }
 
 void Monitor::slotForwardOneFrame(int diff)
 {
     activateMonitor();
     render->play(0);
-    if (m_position >= m_length) return;
-    m_position += diff;
-    m_position = qMin(m_position, m_length);
-    render->seekToFrame(m_position);
-    emit renderPosition(m_position);
+    render->seekToFrameDiff(diff);
+    emit renderPosition(render->seekFramePosition());
 }
 
 void Monitor::seekCursor(int pos)
 {
     activateMonitor();
     checkOverlay();
-    m_position = pos;
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
+    if (m_frametimecode) m_timePos->setText(QString::number(pos));
+    else m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
     m_ruler->slotNewValue(pos);
 }
 
@@ -588,9 +601,9 @@ void Monitor::rendererStopped(int pos)
         }
     }
     m_ruler->slotNewValue(pos);
-    m_position = pos;
     checkOverlay();
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
+    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);
 }
@@ -694,8 +707,10 @@ void Monitor::slotSetXml(DocClipBase *clip, const int position)
     }
     if (clip != m_currentClip) {
         m_currentClip = clip;
-        render->setProducer(clip->producer(), position);
-        m_position = position;
+        if (render->setProducer(clip->producer(), position) == -1) {
+            // MLT CONSUMER is broken
+            emit blockMonitors();
+        }
     } else if (position != -1) render->seek(GenTime(position, render->fps()));
 }
 
@@ -757,15 +772,35 @@ 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));
+    }
+}
+
 
 MonitorRefresh::MonitorRefresh(QWidget* parent) : \
         QWidget(parent),