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

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 85f52c59..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) :
@@ -107,8 +108,10 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) :
     m_timePos = new KRestrictedLine(this);
     m_timePos->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::MinimumExpanding);
     m_frametimecode = KdenliveSettings::frametimecode();
-    if (m_frametimecode) m_timePos->setInputMask("999999999");
-    else m_timePos->setInputMask("99:99:99:99");
+    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()));
@@ -122,10 +125,21 @@ 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)));
@@ -142,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();
 }
 
@@ -177,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);
@@ -413,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;
+        if (event->delta() > 0) delta = 0 - delta;
         slotSeek(render->seekFramePosition() - delta);
     } else {
-        if (event->delta() <= 0) slotForwardOneFrame();
+        if (event->delta() >= 0) slotForwardOneFrame();
         else slotRewindOneFrame();
     }
 }
@@ -453,7 +471,7 @@ void Monitor::activateMonitor()
 void Monitor::setTimePos(const QString &pos)
 {
     if (m_frametimecode) {
-        int frames = m_monitorManager->timecode().getFrameCount(pos, m_monitorManager->timecode().fps());
+        int frames = m_monitorManager->timecode().getFrameCount(pos);
         m_timePos->setText(QString::number(frames));
     } else m_timePos->setText(pos);
     slotSeek();
@@ -463,7 +481,8 @@ void Monitor::slotSeek()
 {
     int frames;
     if (m_frametimecode) frames = m_timePos->text().toInt();
-    else frames = m_monitorManager->timecode().getFrameCount(m_timePos->text(), m_monitorManager->timecode().fps());
+    else frames = m_monitorManager->timecode().getFrameCount(m_timePos->text());
+    //kDebug() << "// / / SEEK TO: " << frames;
     slotSeek(frames);
 }
 
@@ -753,9 +772,13 @@ 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;
@@ -766,11 +789,13 @@ void Monitor::updateTimecodeFormat()
 {
     m_frametimecode = KdenliveSettings::frametimecode();
     if (m_frametimecode) {
-        int frames = m_monitorManager->timecode().getFrameCount(m_timePos->text(), m_monitorManager->timecode().fps());
-        m_timePos->setInputMask("999999999");
+        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));
     }