#include "docclipbase.h"
#include "abstractclipitem.h"
#include "monitorscene.h"
-#include "monitoreditwidget.h"
+#include "widgets/monitoreditwidget.h"
+#include "widgets/videosurface.h"
#include "kdenlivesettings.h"
#include <KDebug>
-#include <KLocale>
+#include <KLocalizedString>
#include <KFileDialog>
#include <KApplication>
#include <KMessageBox>
+#include <KSelectAction>
#include <QMouseEvent>
#include <QStylePainter>
#include <QLabel>
#include <QIntValidator>
#include <QVBoxLayout>
+#include <QSlider>
#define SEEK_INACTIVE (-1)
-Monitor::Monitor(Kdenlive::MONITORID id, MonitorManager *manager, QString profile, QWidget *parent) :
+Monitor::Monitor(Kdenlive::MonitorId id, MonitorManager *manager, QString profile, QWidget *parent) :
AbstractMonitor(id, manager, parent)
, render(NULL)
- , m_name(Kdenlive::noMonitor)
, m_currentClip(NULL)
, m_overlay(NULL)
, m_scale(1)
m_pauseIcon = KIcon("media-playback-pause");
- if (id != Kdenlive::dvdMonitor) {
+ if (id != Kdenlive::DvdMonitor) {
m_toolbar->addAction(KIcon("kdenlive-zone-start"), i18n("Set zone start"), this, SLOT(slotSetZoneStart()));
m_toolbar->addAction(KIcon("kdenlive-zone-end"), i18n("Set zone end"), this, SLOT(slotSetZoneEnd()));
}
playButton->setDefaultAction(m_playAction);
- if (id != Kdenlive::dvdMonitor) {
+ if (id != Kdenlive::DvdMonitor) {
QToolButton *configButton = new QToolButton(m_toolbar);
m_configMenu = new QMenu(i18n("Misc..."), this);
configButton->setIcon(KIcon("system-run"));
configButton->setPopupMode(QToolButton::QToolButton::InstantPopup);
m_toolbar->addWidget(configButton);
- if (id == Kdenlive::clipMonitor) {
+ if (id == Kdenlive::ClipMonitor) {
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()));
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
// Monitor ruler
m_ruler = new SmallRuler(this, render);
- if (id == Kdenlive::dvdMonitor) m_ruler->setZone(-3, -2);
+ if (id == Kdenlive::DvdMonitor) m_ruler->setZone(-3, -2);
layout->addWidget(m_ruler);
connect(m_audioSlider, SIGNAL(valueChanged(int)), this, SLOT(slotSetVolume(int)));
connect(render, SIGNAL(rendererStopped(int)), this, SLOT(rendererStopped(int)));
connect(render, SIGNAL(rendererPosition(int)), this, SLOT(seekCursor(int)));
- if (id != Kdenlive::clipMonitor) {
+ if (id != Kdenlive::ClipMonitor) {
connect(render, SIGNAL(rendererPosition(int)), this, SIGNAL(renderPosition(int)));
connect(render, SIGNAL(durationChanged(int)), this, SIGNAL(durationChanged(int)));
connect(m_ruler, SIGNAL(zoneChanged(QPoint)), this, SIGNAL(zoneUpdated(QPoint)));
if (videoSurface) videoSurface->show();
- if (id == Kdenlive::projectMonitor) {
+ 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();
}
#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);
if (markerMenu) {
m_contextMenu->addMenu(markerMenu);
QList <QAction *>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;
}
//TODO: add save zone to timeline monitor when fixed
- if (m_id == Kdenlive::clipMonitor) {
+ if (m_id == Kdenlive::ClipMonitor) {
m_contextMenu->addMenu(m_markerMenu);
m_contextMenu->addAction(KIcon("document-save"), i18n("Save zone"), this, SLOT(slotSaveZone()));
QAction *extractZone = m_configMenu->addAction(KIcon("document-new"), i18n("Extract Zone"), this, SLOT(slotExtractCurrentZone()));
QAction *extractFrame = m_configMenu->addAction(KIcon("document-new"), i18n("Extract frame"), this, SLOT(slotExtractCurrentFrame()));
m_contextMenu->addAction(extractFrame);
- if (m_id != Kdenlive::clipMonitor) {
+ if (m_id != Kdenlive::ClipMonitor) {
QAction *splitView = m_contextMenu->addAction(KIcon("view-split-left-right"), i18n("Split view"), render, SLOT(slotSplitView(bool)));
splitView->setCheckable(true);
m_configMenu->addAction(splitView);
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)
QList <CommentedTime> markers = m_currentClip->commentedSnapMarkers();
if (!markers.isEmpty()) {
QList <int> 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();
}
}
-void Monitor::setMarkers(QList <CommentedTime> markers)
+void Monitor::setMarkers(const QList<CommentedTime> &markers)
{
m_ruler->setMarkers(markers);
}
// virtual
void Monitor::mousePressEvent(QMouseEvent * event)
{
+ if (render) render->setActiveMonitor();
if (event->button() != Qt::RightButton) {
if (videoBox->geometry().contains(event->pos()) && (!m_overlay || !m_overlay->underMouse())) {
m_dragStarted = true;
void Monitor::resizeEvent(QResizeEvent *event)
{
- Q_UNUSED(event);
+ Q_UNUSED(event)
if (render && isVisible() && isActive()) render->doRefresh();
}
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)
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)
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);
if (render->setProducer(prod, position) == -1) {
// MLT CONSUMER is broken
kDebug(QtWarningMsg) << "ERROR, Cannot start monitor";
- }
+ } else start();
} else {
if (m_currentClip) {
slotActivateMonitor();
//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;
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);
return render->sceneList();
}
-void Monitor::setClipZone(QPoint pos)
+void Monitor::setClipZone(const QPoint &pos)
{
if (m_currentClip == NULL) return;
m_currentClip->setZone(pos);
void Monitor::slotShowEffectScene(bool show, bool manuallyTriggered)
{
- if (m_id == Kdenlive::projectMonitor) {
+ if (m_id == Kdenlive::ProjectMonitor) {
if (!m_effectWidget->getVisibilityAction()->isChecked())
show = false;
if (m_effectWidget->isVisible() == show)
{
if (!m_currentClip) return QString();
if (!m_currentClip->getClipHash().isEmpty()) {
- QString url = m_monitorManager->getProjectFolder() + "thumbs/" + m_currentClip->getClipHash() + '#' + QString::number(pos.frames(m_monitorManager->timecode().fps())) + ".png";
+ QString url = m_monitorManager->getProjectFolder() + "thumbs/" + m_currentClip->getClipHash() + '#' + QString::number((int) pos.frames(m_monitorManager->timecode().fps())) + ".png";
if (QFile::exists(url)) return url;
}
return QString();
projects / kdenlive / blobdiff