#include "docclipbase.h"
#include "abstractclipitem.h"
#include "monitorscene.h"
-#include "monitoreditwidget.h"
+#include "widgets/monitoreditwidget.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) :
- AbstractMonitor(id, manager, parent),
- render(NULL),
- m_currentClip(NULL),
- m_overlay(NULL),
- m_scale(1),
- m_length(0),
- m_dragStarted(false),
- m_contextMenu(NULL),
- m_effectWidget(NULL),
- m_selectedClip(NULL),
- m_loopClipTransition(true),
- m_editMarker(NULL)
+ AbstractMonitor(id, manager, parent)
+ , render(NULL)
+ , m_currentClip(NULL)
+ , m_overlay(NULL)
+ , m_scale(1)
+ , m_length(2)
+ , m_dragStarted(false)
+ , m_loopClipAction(NULL)
+ , m_contextMenu(NULL)
+ , m_effectWidget(NULL)
+ , m_selectedClip(NULL)
+ , m_loopClipTransition(true)
+#ifdef USE_OPENGL
+ , m_glWidget(NULL)
+#endif
+ , m_editMarker(NULL)
{
QVBoxLayout *layout = new QVBoxLayout;
layout->setContentsMargins(0, 0, 0, 0);
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
#endif
// Monitor ruler
- m_ruler = new SmallRuler(m_monitorManager, render);
+ m_ruler = new SmallRuler(this, render);
if (id == Kdenlive::dvdMonitor) m_ruler->setZone(-3, -2);
layout->addWidget(m_ruler);
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();
m_toolbar->addWidget(spacer);
m_timePos = new TimecodeDisplay(m_monitorManager->timecode(), this);
m_toolbar->addWidget(m_timePos);
- connect(m_timePos, SIGNAL(editingFinished()), this, SLOT(slotSeek()));
- m_toolbar->setMaximumHeight(s * 1.5);
+ connect(m_timePos, SIGNAL(timeCodeEditingFinished()), this, SLOT(slotSeek()));
+ m_toolbar->setMaximumHeight(m_timePos->height());
layout->addWidget(m_toolbar);
}
}
#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);
- kDebug()<<"+++++++++++++\nCREATED OPENGL WIDG\n++++++++++++++";
m_glWidget = new VideoGLWidget(parent);
if (m_glWidget == NULL) {
// Creation failed, we are in trouble...
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;
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)
videoBox->setMinimumSize(0, 0);
}
+QString Monitor::getTimecodeFromFrames(int pos)
+{
+ return m_monitorManager->timecode().getTimecodeFromFrames(pos);
+}
+
+double Monitor::fps() const
+{
+ return m_monitorManager->timecode().fps();
+}
+
DocClipBase *Monitor::activeClip()
{
return m_currentClip;
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(const QList<CommentedTime> &markers)
+{
+ m_ruler->setMarkers(markers);
+}
+
void Monitor::slotSeekToPreviousSnap()
{
if (m_currentClip) slotSeek(getSnapForPos(true).frames(m_monitorManager->timecode().fps()));
void Monitor::slotZoneMoved(int start, int end)
{
m_ruler->setZone(start, end);
- checkOverlay();
setClipZone(m_ruler->zone());
+ checkOverlay();
}
void Monitor::slotSetZoneStart()
{
m_ruler->setZoneStart();
emit zoneUpdated(m_ruler->zone());
- checkOverlay();
setClipZone(m_ruler->zone());
+ checkOverlay();
}
void Monitor::slotSetZoneEnd()
{
m_ruler->setZoneEnd();
emit zoneUpdated(m_ruler->zone());
- checkOverlay();
setClipZone(m_ruler->zone());
+ checkOverlay();
}
// 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();
}
if (isActive()) slotPlay();
else slotActivateMonitor();
} //else event->ignore(); //QWidget::mouseReleaseEvent(event);
- m_dragStarted = false;
}
+ m_dragStarted = false;
+ event->accept();
}
// virtual
drag->setPixmap(pix);
drag->setHotSpot(QPoint(0, 50));*/
drag->start(Qt::MoveAction);
-
- //Qt::DropAction dropAction;
- //dropAction = drag->start(Qt::CopyAction | Qt::MoveAction);
+ /*Qt::DropAction dropAction = drag->exec(Qt::CopyAction | Qt::MoveAction);
+ Qt::DropAction dropAction;
+ dropAction = drag->start(Qt::CopyAction | Qt::MoveAction);*/
//Qt::DropAction dropAction = drag->exec();
//event->accept();
}
+
/*void Monitor::dragMoveEvent(QDragMoveEvent * event) {
event->setDropAction(Qt::IgnoreAction);
event->setDropAction(Qt::MoveAction);
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)
{
if (m_overlay == NULL) return;
QString overlayText;
- int pos = render->seekFramePosition();
+ int pos = m_timePos->getValue();//render->seekFramePosition();
QPoint zone = m_ruler->zone();
if (pos == zone.x())
overlayText = i18n("In Point");
slotActivateMonitor();
if (speed == 0) {
double currentspeed = render->playSpeed();
- if (currentspeed >= 0) render->play(-2);
- else render->play(currentspeed * 2);
+ if (currentspeed >= 0) render->play(-1);
+ else switch((int) currentspeed) {
+ case -1:
+ render->play(-2);
+ break;
+ case -2:
+ render->play(-3);
+ break;
+ case -3:
+ render->play(-5);
+ break;
+ default:
+ render->play(-8);
+ }
} else render->play(speed);
//m_playAction->setChecked(true);
m_playAction->setIcon(m_pauseIcon);
slotActivateMonitor();
if (speed == 0) {
double currentspeed = render->playSpeed();
- if (currentspeed <= 1) render->play(2);
- else render->play(currentspeed * 2);
+ if (currentspeed <= 0) render->play(1);
+ else switch((int) currentspeed) {
+ case 1:
+ render->play(2);
+ break;
+ case 2:
+ render->play(3);
+ break;
+ case 3:
+ render->play(5);
+ break;
+ default:
+ render->play(8);
+ }
} else render->play(speed);
//m_playAction->setChecked(true);
m_playAction->setIcon(m_pauseIcon);
void Monitor::seekCursor(int pos)
{
if (m_ruler->slotNewValue(pos)) {
- checkOverlay();
m_timePos->setValue(pos);
+ checkOverlay();
}
}
void Monitor::rendererStopped(int pos)
{
if (m_ruler->slotNewValue(pos)) {
- checkOverlay();
m_timePos->setValue(pos);
+ checkOverlay();
}
m_playAction->setIcon(m_playIcon);
}
void Monitor::start()
{
if (!isVisible() || !isActive()) return;
- if (render) render->doRefresh();// start();
+#ifdef USE_OPENGL
+ if (m_glWidget) m_glWidget->activateMonitor();
+#endif
+ if (render) render->startConsumer();
}
void Monitor::refreshMonitor(bool visible)
{
if (render == NULL) return;
slotActivateMonitor();
- if (render->playSpeed() == 0.0) {
+ if (render->isPlaying()) {
+ m_playAction->setIcon(m_playIcon);
+ render->switchPlay(false);
+ }
+ else {
m_playAction->setIcon(m_pauseIcon);
render->switchPlay(true);
- } else {
- m_playAction->setIcon(m_playIcon);
- render->switchPlay(false);
}
m_ruler->refreshRuler();
}
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 (m_currentClip) m_currentClip->lastSeekPosition = render->seekFramePosition();
m_currentClip = clip;
if (position == -1) position = clip->lastSeekPosition;
- if (m_currentClip) slotActivateMonitor();
updateMarkers(clip);
Mlt::Producer *prod = NULL;
if (clip) prod = clip->getCloneProducer();
if (render->setProducer(prod, position) == -1) {
// MLT CONSUMER is broken
kDebug(QtWarningMsg) << "ERROR, Cannot start monitor";
- }
+ } else start();
} else {
if (m_currentClip) {
slotActivateMonitor();
if (position == -1) position = render->seekFramePosition();
render->seek(position);
+ if (zone.isNull()) {
+ zone = m_currentClip->zone();
+ m_ruler->setZone(zone.x(), zone.y());
+ return;
+ }
}
}
if (!zone.isNull()) {
{
if (render == NULL) return;
slotActivateMonitor();
- QDomDocument doc;
- QDomElement mlt = doc.createElement("mlt");
- doc.appendChild(mlt);
- QDomElement prod = doc.createElement("producer");
- mlt.appendChild(prod);
- prod.setAttribute("mlt_service", "avformat");
- prod.setAttribute("resource", file);
- render->setSceneList(doc, 0);
+ render->loadUrl(file);
}
void Monitor::slotSaveZone()
//render->setSceneList(doc, 0);
}
+void Monitor::setCustomProfile(const QString &profile, const Timecode &tc)
+{
+ m_timePos->updateTimeCode(tc);
+ if (render == NULL) return;
+ if (!render->hasProfile(profile)) {
+ slotActivateMonitor();
+ render->resetProfile(profile);
+#ifdef USE_OPENGL
+ if (m_glWidget) m_glWidget->setImageAspectRatio(render->dar());
+#endif
+ }
+}
+
void Monitor::resetProfile(const QString &profile)
{
m_timePos->updateTimeCode(m_monitorManager->timecode());
if (!render->hasProfile(profile)) {
slotActivateMonitor();
render->resetProfile(profile);
+#ifdef USE_OPENGL
+ if (m_glWidget) m_glWidget->setImageAspectRatio(render->dar());
+#endif
}
if (m_effectWidget)
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::slotSetSelectedClip(AbstractClipItem* item)
{
if (item) {
- m_loopClipAction->setEnabled(true);
+ if (m_loopClipAction) m_loopClipAction->setEnabled(true);
m_selectedClip = item;
} else {
- m_loopClipAction->setEnabled(false);
+ if (m_loopClipAction) m_loopClipAction->setEnabled(false);
}
}
slotSetClipProducer(m_currentClip, m_currentClip->zone(), true);
}
+QString Monitor::getMarkerThumb(GenTime pos)
+{
+ if (!m_currentClip) return QString();
+ if (!m_currentClip->getClipHash().isEmpty()) {
+ 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();
+}
+
void Monitor::setPalette ( const QPalette & p)
{
QWidget::setPalette(p);
setBackgroundRole(QPalette::Base);
setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
setCursor(Qt::PointingHandCursor);
+
}
// virtual
void Overlay::setOverlayText(const QString &text, bool isZone)
{
if (text.isEmpty()) {
- QPalette p;
+ /*QPalette p;
p.setColor(QPalette::Base, KdenliveSettings::window_background());
setPalette(p);
setText(QString());
- repaint();
+ repaint();*/
setHidden(true);
return;
}
projects / kdenlive / blobdiff