X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.cpp;h=f61ba571a94801d07f59beebd0de59d141d2dffc;hb=ec00934b188e717301b9fe2477f9a0993f5fb982;hp=39603b7a542f83854402037e0f58feeb50cc4af2;hpb=70c329f1fe73439eb64dae58d6bec8e9279573db;p=kdenlive diff --git a/src/monitor.cpp b/src/monitor.cpp index 39603b7a..f61ba571 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -23,7 +23,10 @@ #include "monitormanager.h" #include "smallruler.h" #include "docclipbase.h" +#include "monitorscene.h" +#include "abstractclipitem.h" #include "kdenlivesettings.h" +#include "audiosignal.h" #include #include @@ -38,21 +41,30 @@ #include #include #include - - -Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : - QWidget(parent), - render(NULL), - m_monitorManager(manager), - m_name(name), - m_isActive(false), - m_currentClip(NULL), - m_dragStarted(false), - m_overlay(NULL) +#include +#include +#include + + +Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget *parent) : + QWidget(parent), + render(NULL), + m_audiosignal(NULL), + m_name(name), + m_monitorManager(manager), + m_currentClip(NULL), + m_ruler(new SmallRuler(m_monitorManager)), + m_overlay(NULL), + m_isActive(false), + m_scale(1), + m_length(0), + m_dragStarted(false), + m_effectScene(NULL), + m_effectView(NULL), + m_selectedClip(NULL), + m_loopClipTransition(true) { m_ui.setupUi(this); - m_scale = 1; - m_ruler = new SmallRuler(); QVBoxLayout *layout = new QVBoxLayout; layout->setContentsMargins(0, 0, 0, 0); layout->addWidget(m_ruler); @@ -69,10 +81,12 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : if (name != "chapter") { toolbar->addAction(KIcon("kdenlive-zone-start"), i18n("Set zone start"), this, SLOT(slotSetZoneStart())); toolbar->addAction(KIcon("kdenlive-zone-end"), i18n("Set zone end"), this, SLOT(slotSetZoneEnd())); - } else m_ruler->setZone(-3, -2); + } else { + m_ruler->setZone(-3, -2); + } toolbar->addAction(KIcon("media-seek-backward"), i18n("Rewind"), this, SLOT(slotRewind())); - toolbar->addAction(KIcon("media-skip-backward"), i18n("Rewind 1 frame"), this, SLOT(slotRewindOneFrame())); + //toolbar->addAction(KIcon("media-skip-backward"), i18n("Rewind 1 frame"), this, SLOT(slotRewindOneFrame())); QToolButton *playButton = new QToolButton(toolbar); m_playMenu = new QMenu(i18n("Play..."), this); @@ -84,7 +98,7 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : playButton->setPopupMode(QToolButton::MenuButtonPopup); toolbar->addWidget(playButton); - toolbar->addAction(KIcon("media-skip-forward"), i18n("Forward 1 frame"), this, SLOT(slotForwardOneFrame())); + //toolbar->addAction(KIcon("media-skip-forward"), i18n("Forward 1 frame"), this, SLOT(slotForwardOneFrame())); toolbar->addAction(KIcon("media-seek-forward"), i18n("Forward"), this, SLOT(slotForward())); playButton->setDefaultAction(m_playAction); @@ -96,6 +110,13 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : configButton->setMenu(m_configMenu); configButton->setPopupMode(QToolButton::QToolButton::InstantPopup); toolbar->addWidget(configButton); + + if (name == "clip") { + m_markerMenu = new QMenu(i18n("Go to marker..."), this); + m_markerMenu->setEnabled(false); + m_configMenu->addMenu(m_markerMenu); + connect(m_markerMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotGoToMarker(QAction *))); + } m_configMenu->addAction(KIcon("transform-scale"), i18n("Resize (100%)"), this, SLOT(slotSetSizeOneToOne())); m_configMenu->addAction(KIcon("transform-scale"), i18n("Resize (50%)"), this, SLOT(slotSetSizeOneToTwo())); } @@ -103,11 +124,8 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : QWidget *spacer = new QWidget(this); spacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); toolbar->addWidget(spacer); - m_timePos = new KRestrictedLine(this); - m_timePos->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::MinimumExpanding); - m_timePos->setInputMask("99:99:99:99"); + m_timePos = new TimecodeDisplay(m_monitorManager->timecode(), this); toolbar->addWidget(m_timePos); - connect(m_timePos, SIGNAL(editingFinished()), this, SLOT(slotSeek())); layout2->addWidget(toolbar); @@ -117,20 +135,34 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : //m_ruler->setPixelPerMark(3); + if (profile.isEmpty()) profile = KdenliveSettings::current_profile(); + 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, profile, 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); + render = new Render(m_name, (int) m_monitorRefresh->winId(), -1, profile, this); m_monitorRefresh->setRenderer(render); +#endif + m_audiosignal= new AudioSignal(this); + rendererBox->addWidget(m_audiosignal); + connect(render, SIGNAL(showAudioSignal(QByteArray)), m_audiosignal, SLOT(showAudio(QByteArray))); 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))); //render->createVideoXWindow(m_ui.video_frame->winId(), -1); - m_length = 0; if (name != "clip") { connect(render, SIGNAL(rendererPosition(int)), this, SIGNAL(renderPosition(int))); @@ -139,7 +171,21 @@ 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 + + if (name == "project") { + m_effectScene = new MonitorScene(render); + m_effectView = new QGraphicsView(m_effectScene, m_ui.video_frame); + m_effectView->setRenderHints(QFlags()); + m_effectView->scale(((double) render->renderWidth()) / render->frameRenderWidth(), 1.0); + rendererBox->addWidget(m_effectView); + m_effectView->setMouseTracking(true); + m_effectScene->setUp(); + m_effectView->hide(); + } + kDebug() << "/////// BUILDING MONITOR, ID: " << m_ui.video_frame->winId(); } @@ -148,7 +194,12 @@ Monitor::~Monitor() delete m_ruler; delete m_timePos; delete m_overlay; + if (m_name == "project") { + delete m_effectView; + delete m_effectScene; + } delete m_monitorRefresh; + delete render; } QString Monitor::name() const @@ -156,26 +207,36 @@ QString Monitor::name() const return m_name; } -void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMenu *markerMenu) +void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMenu *markerMenu, QAction *loopClip) { m_contextMenu = new QMenu(this); m_contextMenu->addMenu(m_playMenu); - if (goMenu) m_contextMenu->addMenu(goMenu); - if (markerMenu) m_contextMenu->addMenu(markerMenu); + if (goMenu) + m_contextMenu->addMenu(goMenu); + if (markerMenu) + m_contextMenu->addMenu(markerMenu); m_playMenu->addAction(playZone); m_playMenu->addAction(loopZone); + if (loopClip) { + m_loopClipAction = loopClip; + m_playMenu->addAction(loopClip); + } //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())); - + if (m_name == "clip") { + m_contextMenu->addMenu(m_markerMenu); + m_contextMenu->addAction(KIcon("document-save"), i18n("Save zone"), this, SLOT(slotSaveZone())); + } QAction *extractFrame = m_configMenu->addAction(KIcon("document-new"), i18n("Extract frame"), this, SLOT(slotExtractCurrentFrame())); 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); @@ -185,8 +246,21 @@ void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMe showTips->setCheckable(true); connect(showTips, SIGNAL(toggled(bool)), this, SLOT(slotSwitchMonitorInfo(bool))); showTips->setChecked(KdenliveSettings::displayMonitorInfo()); + + QAction *dropFrames = m_contextMenu->addAction(KIcon(), i18n("Real time (drop frames)")); + dropFrames->setCheckable(true); + dropFrames->setChecked(true); + connect(dropFrames, SIGNAL(toggled(bool)), this, SLOT(slotSwitchDropFrames(bool))); + m_configMenu->addAction(showTips); + m_configMenu->addAction(dropFrames); + +} +void Monitor::slotGoToMarker(QAction *action) +{ + int pos = action->data().toInt(); + slotSeek(pos); } void Monitor::slotSetSizeOneToOne() @@ -239,6 +313,26 @@ DocClipBase *Monitor::activeClip() return m_currentClip; } +void Monitor::updateMarkers(DocClipBase *source) +{ + if (source == m_currentClip && source != NULL) { + m_markerMenu->clear(); + QList markers = m_currentClip->commentedSnapMarkers(); + if (!markers.isEmpty()) { + QList marks; + for (int i = 0; i < markers.count(); i++) { + int pos = (int) markers.at(i).time().frames(m_monitorManager->timecode().fps()); + marks.append(pos); + QString position = m_monitorManager->timecode().getTimecode(markers.at(i).time()) + ' ' + markers.at(i).comment(); + QAction *go = m_markerMenu->addAction(position); + go->setData(pos); + } + m_ruler->setMarkers(marks); + } else m_ruler->setMarkers(QList ()); + m_markerMenu->setEnabled(!m_markerMenu->isEmpty()); + } +} + void Monitor::slotSeekToPreviousSnap() { if (m_currentClip) slotSeek(getSnapForPos(true).frames(m_monitorManager->timecode().fps())); @@ -251,7 +345,7 @@ void Monitor::slotSeekToNextSnap() GenTime Monitor::position() { - return GenTime(m_position, m_monitorManager->timecode().fps()); + return render->seekPosition(); } GenTime Monitor::getSnapForPos(bool previous) @@ -269,7 +363,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; @@ -281,8 +375,6 @@ GenTime Monitor::getSnapForPos(bool previous) return GenTime(); } - - void Monitor::slotZoneMoved(int start, int end) { m_ruler->setZone(start, end); @@ -292,7 +384,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()); @@ -300,7 +392,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()); @@ -321,14 +413,14 @@ void Monitor::mousePressEvent(QMouseEvent * event) void Monitor::mouseReleaseEvent(QMouseEvent * event) { if (m_dragStarted) { - if (m_ui.video_frame->underMouse()) { - slotPlay(); + if (m_ui.video_frame->underMouse() && (!m_effectView || !m_effectView->isVisible())) { + if (isActive()) slotPlay(); + else activateMonitor(); } else QWidget::mouseReleaseEvent(event); m_dragStarted = false; } } - // virtual void Monitor::mouseMoveEvent(QMouseEvent *event) { @@ -353,7 +445,6 @@ void Monitor::mouseMoveEvent(QMouseEvent *event) mimeData->setData("kdenlive/clip", data); drag->setMimeData(mimeData); QPixmap pix = m_currentClip->thumbnail(); - kDebug() << "/ / / /CLIP DRAGGED PIXMAP: " << pix.width() << "x" << pix.height(); drag->setPixmap(pix); drag->setHotSpot(QPoint(0, 50)); drag->start(Qt::MoveAction); @@ -388,24 +479,15 @@ QStringList Monitor::mimeTypes() const return qstrList; } - // virtual -/** Move to other position on mousewheel - * - * Moves towards end of clip/timeline on mousewheel down/back, - * opposite for mousewheel up/forward. - * - * Ctrl+wheel moves single frame, without Ctrl moves a second. - * - * See also http://www.kdenlive.org/mantis/view.php?id=265 */ 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(); } } @@ -415,17 +497,25 @@ 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); - 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; - frame.save(outputFile); + QImage frame = render->extractFrame(render->seekFramePosition()); + KFileDialog *fs = new KFileDialog(KUrl(), "image/png", this); + fs->setOperationMode(KFileDialog::Saving); + fs->setMode(KFile::File); +#if KDE_IS_VERSION(4,2,0) + fs->setConfirmOverwrite(true); +#endif + fs->setKeepLocation(true); + fs->exec(); + QString path = fs->selectedFile(); + delete fs; + if (!path.isEmpty()) { + frame.save(path); } } @@ -436,44 +526,45 @@ bool Monitor::isActive() const void Monitor::activateMonitor() { - if (!m_isActive) m_monitorManager->switchMonitors(); //m_monitorManager->activateMonitor(m_name); + if (!m_isActive) { + m_monitorManager->slotSwitchMonitors(m_name == "clip"); + } } void Monitor::setTimePos(const QString &pos) { - m_timePos->setText(pos); + m_timePos->setValue(pos); slotSeek(); } void Monitor::slotSeek() { - const int frames = m_monitorManager->timecode().getFrameCount(m_timePos->text(), m_monitorManager->timecode().fps()); - slotSeek(frames); + slotSeek(m_timePos->getValue()); } void Monitor::slotSeek(int pos) { activateMonitor(); if (render == NULL) return; - m_position = pos; - checkOverlay(); render->seekToFrame(pos); - emit renderPosition(m_position); - m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position)); - m_timePos->clearFocus(); } 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())); - if (markerComment.isEmpty()) m_overlay->setHidden(true); - else m_overlay->setOverlayText(markerComment, false); + 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); } } @@ -482,40 +573,28 @@ void Monitor::slotStart() { activateMonitor(); render->play(0); - m_position = 0; - render->seekToFrame(m_position); - emit renderPosition(m_position); - m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position)); + render->seekToFrame(0); } void Monitor::slotEnd() { activateMonitor(); render->play(0); - m_position = render->getLength(); - render->seekToFrame(m_position); - emit renderPosition(m_position); - m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position)); + render->seekToFrame(render->getLength()); } void Monitor::slotZoneStart() { activateMonitor(); render->play(0); - m_position = m_ruler->zone().x(); - render->seekToFrame(m_position); - emit renderPosition(m_position); - m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position)); + render->seekToFrame(m_ruler->zone().x()); } void Monitor::slotZoneEnd() { activateMonitor(); render->play(0); - m_position = m_ruler->zone().y(); - render->seekToFrame(m_position); - emit renderPosition(m_position); - m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position)); + render->seekToFrame(m_ruler->zone().y()); } void Monitor::slotRewind(double speed) @@ -546,49 +625,34 @@ 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); - m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position)); - checkOverlay(); + render->seekToFrameDiff(-diff); } 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); - m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position)); - checkOverlay(); + render->seekToFrameDiff(diff); } void Monitor::seekCursor(int pos) { activateMonitor(); - checkOverlay(); - m_position = pos; - m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos)); - m_ruler->slotNewValue(pos); + if (m_ruler->slotNewValue(pos)) { + checkOverlay(); + m_timePos->setValue(pos); + } } 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)); + if (m_ruler->slotNewValue(pos)) { + checkOverlay(); + m_timePos->setValue(pos); + } + disconnect(m_playAction, SIGNAL(triggered()), this, SLOT(slotPlay())); m_playAction->setChecked(false); + connect(m_playAction, SIGNAL(triggered()), this, SLOT(slotPlay())); m_playAction->setIcon(m_playIcon); } @@ -618,20 +682,20 @@ void Monitor::adjustRulerSize(int length) void Monitor::stop() { m_isActive = false; + disconnect(render, SIGNAL(rendererPosition(int)), this, SLOT(seekCursor(int))); if (render) render->stop(); - //kDebug()<<"/// MONITOR RENDER STOP"; } void Monitor::start() { m_isActive = true; if (render) render->start(); - //kDebug()<<"/// MONITOR RENDER START"; + connect(render, SIGNAL(rendererPosition(int)), this, SLOT(seekCursor(int))); } void Monitor::refreshMonitor(bool visible) { - if (visible && render) { + if (visible && render && !m_isActive) { activateMonitor(); render->doRefresh(); //askForRefresh(); } @@ -665,7 +729,7 @@ void Monitor::slotPlayZone() if (render == NULL) return; activateMonitor(); QPoint p = m_ruler->zone(); - render->playZone(GenTime(p.x(), render->fps()), GenTime(p.y(), render->fps())); + render->playZone(GenTime(p.x(), m_monitorManager->timecode().fps()), GenTime(p.y(), m_monitorManager->timecode().fps())); m_playAction->setChecked(true); m_playAction->setIcon(m_pauseIcon); } @@ -675,25 +739,43 @@ void Monitor::slotLoopZone() if (render == NULL) return; activateMonitor(); QPoint p = m_ruler->zone(); - render->loopZone(GenTime(p.x(), render->fps()), GenTime(p.y(), render->fps())); + render->loopZone(GenTime(p.x(), m_monitorManager->timecode().fps()), GenTime(p.y(), m_monitorManager->timecode().fps())); m_playAction->setChecked(true); m_playAction->setIcon(m_pauseIcon); } -void Monitor::slotSetXml(DocClipBase *clip, const int position) +void Monitor::slotLoopClip() { - if (render == NULL) return; + if (render == NULL || m_selectedClip == NULL) + return; activateMonitor(); - if (!clip && m_currentClip != NULL) { + render->loopZone(m_selectedClip->startPos(), m_selectedClip->endPos()); + m_playAction->setChecked(true); + m_playAction->setIcon(m_pauseIcon); +} + +void Monitor::slotSetXml(DocClipBase *clip, QPoint zone, const int position) +{ + if (render == NULL) return; + if (clip == NULL && m_currentClip != NULL) { m_currentClip = NULL; + m_length = -1; render->setProducer(NULL, -1); return; } + if (m_currentClip != NULL || clip != NULL) activateMonitor(); if (clip != m_currentClip) { m_currentClip = clip; - render->setProducer(clip->producer(), position); - m_position = position; - } else if (position != -1) render->seek(GenTime(position, render->fps())); + updateMarkers(clip); + if (render->setProducer(clip->producer(), position) == -1) { + // MLT CONSUMER is broken + kDebug(QtWarningMsg) << "ERROR, Cannot start monitor"; + } + } else if (position != -1) render->seek(GenTime(position, m_monitorManager->timecode().fps())); + if (!zone.isNull()) { + m_ruler->setZone(zone.x(), zone.y()); + render->seek(GenTime(zone.x(), m_monitorManager->timecode().fps())); + } } void Monitor::slotOpenFile(const QString &file) @@ -718,11 +800,15 @@ void Monitor::slotSaveZone() //render->setSceneList(doc, 0); } - -void Monitor::resetProfile() +void Monitor::resetProfile(const QString profile) { + m_timePos->updateTimeCode(m_monitorManager->timecode()); if (render == NULL) return; - render->resetProfile(); + render->resetProfile(profile); + if (m_effectScene) { + m_effectView->scale(((double) render->renderWidth()) / render->frameRenderWidth(), 1.0); + m_effectScene->resetProfile(); + } } void Monitor::saveSceneList(QString path, QDomElement info) @@ -737,72 +823,143 @@ const QString Monitor::sceneList() return render->sceneList(); } - void Monitor::setClipZone(QPoint pos) { if (m_currentClip == NULL) return; m_currentClip->setZone(pos); } +void Monitor::slotSwitchDropFrames(bool show) +{ + render->setDropFrames(show); +} + 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; } } -MonitorRefresh::MonitorRefresh(QWidget* parent) : \ - QWidget(parent), - m_renderer(NULL) +void Monitor::updateTimecodeFormat() { - setAttribute(Qt::WA_PaintOnScreen); - setAttribute(Qt::WA_OpaquePaintEvent); //setAttribute(Qt::WA_NoSystemBackground); + m_timePos->slotUpdateTimeCodeFormat(); } -void MonitorRefresh::setRenderer(Render* render) +QStringList Monitor::getZoneInfo() const { - m_renderer = render; + QStringList result; + if (m_currentClip == NULL) return result; + result << m_currentClip->getId(); + QPoint zone = m_ruler->zone(); + result << QString::number(zone.x()) << QString::number(zone.y()); + return result; } -void MonitorRefresh::paintEvent(QPaintEvent * /*event*/) +void Monitor::slotSetSelectedClip(AbstractClipItem* item) { - if (m_renderer) m_renderer->doRefresh(); + if (item) { + m_loopClipAction->setEnabled(true); + m_selectedClip = item; + } else { + m_loopClipAction->setEnabled(false); + } } +void Monitor::slotSetSelectedClip(ClipItem* item) +{ + if (item || (!item && !m_loopClipTransition)) { + m_loopClipTransition = false; + slotSetSelectedClip((AbstractClipItem*)item); + } +} -Overlay::Overlay(QWidget* parent) : - QLabel(parent) +void Monitor::slotSetSelectedClip(Transition* item) { - setAttribute(Qt::WA_TransparentForMouseEvents); + if (item || (!item && m_loopClipTransition)) { + m_loopClipTransition = true; + slotSetSelectedClip((AbstractClipItem*)item); + } +} + + +void Monitor::slotEffectScene(bool show) +{ + if (m_name == "project") { +#ifdef Q_WS_MAC + m_glWidget->setVisible(!show); +#else + m_monitorRefresh->setVisible(!show); +#endif + m_effectView->setVisible(show); + emit requestFrameForAnalysis(show); + if (show) { + render->doRefresh(); + m_effectScene->slotZoomFit(); + } + } +} + +MonitorScene * Monitor::getEffectScene() +{ + return m_effectScene; +} + +bool Monitor::effectSceneDisplayed() +{ + return m_effectView->isVisible(); +} + +MonitorRefresh::MonitorRefresh(QWidget* parent) : + QWidget(parent), + m_renderer(NULL) +{ + setAttribute(Qt::WA_PaintOnScreen); setAttribute(Qt::WA_OpaquePaintEvent); //setAttribute(Qt::WA_NoSystemBackground); - setAutoFillBackground(false); } -void Overlay::paintEvent(QPaintEvent * /*event*/) +void MonitorRefresh::setRenderer(Render* render) { - QPainter painter(this); - 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()); + m_renderer = render; } +void MonitorRefresh::paintEvent(QPaintEvent *event) +{ + Q_UNUSED(event); + if (m_renderer) m_renderer->doRefresh(); +} +Overlay::Overlay(QWidget* parent) : + QLabel(parent) +{ + setAttribute(Qt::WA_TransparentForMouseEvents); + //setAttribute(Qt::WA_OpaquePaintEvent); + //setAttribute(Qt::WA_NoSystemBackground); + setAutoFillBackground(true); + setBackgroundRole(QPalette::Base); +} void Overlay::setOverlayText(const QString &text, bool isZone) { setHidden(true); m_isZone = isZone; + QPalette p; + p.setColor(QPalette::Text, Qt::white); + if (m_isZone) p.setColor(QPalette::Base, QColor(200, 0, 0)); + else p.setColor(QPalette::Base, QColor(0, 0, 200)); + setPalette(p); setText(' ' + text + ' '); setHidden(false); update();