X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.cpp;h=d8c28dd50b163448d3c0a86b9a5d20bb883f2a01;hb=3c844989ad9fdb96bb9258a990a9874773b3d792;hp=309e79cb20e1fe2b91d470e0f278cf58a99cf837;hpb=f6ee585152c056105045f204111fdb14b5bacff1;p=kdenlive diff --git a/src/monitor.cpp b/src/monitor.cpp index 309e79cb..d8c28dd5 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -27,10 +27,11 @@ #include "kdenlivesettings.h" #include -#include +#include #include #include #include +#include #include #include @@ -41,6 +42,7 @@ #include #include #include +#include #define SEEK_INACTIVE (-1) @@ -119,7 +121,7 @@ Monitor::Monitor(Kdenlive::MONITORID id, MonitorManager *manager, QString profil 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 *))); + 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())); @@ -147,7 +149,8 @@ Monitor::Monitor(Kdenlive::MONITORID id, MonitorManager *manager, QString profil setLayout(layout); setMinimumHeight(200); - if (profile.isEmpty()) profile = KdenliveSettings::current_profile(); + if (profile.isEmpty()) + profile = KdenliveSettings::current_profile(); bool monitorCreated = false; #ifdef Q_WS_MAC @@ -195,7 +198,7 @@ Monitor::Monitor(Kdenlive::MONITORID id, MonitorManager *manager, QString profil if (id == Kdenlive::projectMonitor) { m_effectWidget = new MonitorEditWidget(render, videoBox); - connect(m_effectWidget, SIGNAL(showEdit(bool, bool)), this, SLOT(slotShowEffectScene(bool, bool))); + connect(m_effectWidget, SIGNAL(showEdit(bool,bool)), this, SLOT(slotShowEffectScene(bool,bool))); m_toolbar->addAction(m_effectWidget->getVisibilityAction()); videoBox->layout()->addWidget(m_effectWidget); m_effectWidget->hide(); @@ -227,7 +230,7 @@ QWidget *Monitor::container() } #ifdef USE_OPENGL -bool Monitor::createOpenGlWidget(QWidget *parent, const QString profile) +bool Monitor::createOpenGlWidget(QWidget *parent, const QString &profile) { render = new Render(id(), 0, profile, this); m_glWidget = new VideoGLWidget(parent); @@ -251,7 +254,7 @@ void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMe if (markerMenu) { m_contextMenu->addMenu(markerMenu); QList list = markerMenu->actions(); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->data().toString() == "edit_marker") { m_editMarker = list.at(i); break; @@ -294,10 +297,9 @@ void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMe 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) @@ -373,7 +375,7 @@ void Monitor::updateMarkers(DocClipBase *source) QList markers = m_currentClip->commentedSnapMarkers(); if (!markers.isEmpty()) { QList marks; - for (int i = 0; i < markers.count(); i++) { + 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(); @@ -386,7 +388,7 @@ void Monitor::updateMarkers(DocClipBase *source) } } -void Monitor::setMarkers(QList markers) +void Monitor::setMarkers(const QList &markers) { m_ruler->setMarkers(markers); } @@ -472,7 +474,7 @@ void Monitor::mousePressEvent(QMouseEvent * event) void Monitor::resizeEvent(QResizeEvent *event) { - Q_UNUSED(event); + Q_UNUSED(event) if (render && isVisible() && isActive()) render->doRefresh(); } @@ -610,13 +612,13 @@ void Monitor::slotExtractCurrentFrame() fs->setMode(KFile::File); fs->setConfirmOverwrite(true); fs->setKeepLocation(true); - fs->exec(); - QString path; - if (fs) path = fs->selectedFile(); - delete fs; - if (!path.isEmpty()) { - frame.save(path); + if (fs->exec()) { + QString path = fs->selectedFile(); + if (!path.isEmpty()) { + frame.save(path); + } } + delete fs; } void Monitor::setTimePos(const QString &pos) @@ -872,7 +874,7 @@ void Monitor::slotLoopClip() void Monitor::updateClipProducer(Mlt::Producer *prod) { if (render == NULL) return; - render->setProducer(prod, render->seekFramePosition()); + render->setProducer(prod, render->seekFramePosition()); } void Monitor::slotSetClipProducer(DocClipBase *clip, QPoint zone, bool forceUpdate, int position) @@ -880,7 +882,6 @@ void Monitor::slotSetClipProducer(DocClipBase *clip, QPoint zone, bool forceUpda if (render == NULL) return; if (clip == NULL && m_currentClip != NULL) { m_currentClip->lastSeekPosition = render->seekFramePosition(); - kDebug()<<"// SETTING NULL CLIP MONITOR"; m_currentClip = NULL; m_length = -1; render->setProducer(NULL, -1); @@ -897,7 +898,7 @@ void Monitor::slotSetClipProducer(DocClipBase *clip, QPoint zone, bool forceUpda if (render->setProducer(prod, position) == -1) { // MLT CONSUMER is broken kDebug(QtWarningMsg) << "ERROR, Cannot start monitor"; - } + } else start(); } else { if (m_currentClip) { slotActivateMonitor(); @@ -931,7 +932,7 @@ void Monitor::slotSaveZone() //render->setSceneList(doc, 0); } -void Monitor::setCustomProfile(const QString &profile, Timecode tc) +void Monitor::setCustomProfile(const QString &profile, const Timecode &tc) { m_timePos->updateTimeCode(tc); if (render == NULL) return; @@ -959,7 +960,7 @@ void Monitor::resetProfile(const QString &profile) m_effectWidget->resetProfile(render); } -void Monitor::saveSceneList(QString path, QDomElement info) +void Monitor::saveSceneList(const QString &path, const QDomElement &info) { if (render == NULL) return; render->saveSceneList(path, info); @@ -971,7 +972,7 @@ const QString Monitor::sceneList() return render->sceneList(); } -void Monitor::setClipZone(QPoint pos) +void Monitor::setClipZone(const QPoint &pos) { if (m_currentClip == NULL) return; m_currentClip->setZone(pos);