X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.cpp;h=0920da0a781ba1d289692ecc93ea7909b0cce1a1;hb=b49b665fd1cd36d01567b91fa555dcae819b7999;hp=68f7b2495eb9957af5fe8393a494121cd40ddf67;hpb=3cec1c93808c28644c97907a5698568df0971b3d;p=kdenlive diff --git a/src/monitor.cpp b/src/monitor.cpp index 68f7b249..0920da0a 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -42,6 +42,7 @@ #include #include #include +#include #define SEEK_INACTIVE (-1) @@ -148,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 @@ -228,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); @@ -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) @@ -930,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; @@ -958,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); @@ -970,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);