X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftransitionsettings.cpp;h=39943683d733ecaeb30ead2bae9300cddad39ac0;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=5309915ec8178a7835a3e4f084f30c409e087c00;hpb=5ee798aed90c5a3a50024e6b5bd26753e03ec7cc;p=kdenlive diff --git a/src/transitionsettings.cpp b/src/transitionsettings.cpp index 5309915e..39943683 100644 --- a/src/transitionsettings.cpp +++ b/src/transitionsettings.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - effecstackedit.h - description + effecstackedit.cpp - description ------------------- begin : Mar 15 2008 copyright : (C) 2008 by Marco Gittler @@ -23,45 +23,85 @@ #include "effectstackedit.h" #include "kdenlivesettings.h" #include "mainwindow.h" +#include "monitoreditwidget.h" +#include "monitorscene.h" #include -TransitionSettings::TransitionSettings(QWidget* parent) : - QWidget(parent), - m_tracksCount(0), - m_usedTransition(NULL) +TransitionSettings::TransitionSettings(Monitor *monitor, QWidget* parent) : + QWidget(parent), + m_usedTransition(NULL), + m_autoTrackTransition(0) { - ui.setupUi(this); - effectEdit = new EffectStackEdit(ui.frame); - connect(effectEdit, SIGNAL(seekTimeline(int)), this, SIGNAL(seekTimeline(int))); + setupUi(this); + QVBoxLayout *vbox1 = new QVBoxLayout(frame); + m_effectEdit = new EffectStackEdit(monitor, frame); + vbox1->setContentsMargins(0, 0, 0, 0); + vbox1->setSpacing(0); + vbox1->addWidget(m_effectEdit); + frame->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum)); + connect(m_effectEdit, SIGNAL(seekTimeline(int)), this, SLOT(slotSeekTimeline(int))); + connect(m_effectEdit, SIGNAL(importClipKeyframes()), this, SIGNAL(importClipKeyframes())); + setEnabled(false); - ui.transitionList->addItems(MainWindow::transitions.effectNames()); - for (int i = 0; i < ui.transitionList->count(); i++) { - ui.transitionList->setItemData(i, MainWindow::transitions.getInfoFromIndex(i), Qt::ToolTipRole); + + QList transitionsList; + int max = MainWindow::transitions.effectNames().count(); + QStringList transitionInfo; + int ix = 0; + + for (; ix < max; ++ix) { + transitionInfo = MainWindow::transitions.effectIdInfo(ix); + transitionInfo << QString::number(ix); + transitionsList.append(transitionInfo); + } + ix = 0; + foreach(const QStringList &value, transitionsList) { + QStringList data = value; + if (!data.isEmpty()) data.removeLast(); + transitionList->addItem(value.at(0), data); + transitionList->setItemData(ix, MainWindow::transitions.getInfoFromIndex(value.last().toInt()), Qt::ToolTipRole); + ++ix; } - //kDebug() << MainWindow::transitions.effectNames().size(); - //ui.listWidget->setCurrentRow(0); - connect(ui.transitionList, SIGNAL(activated(int)), this, SLOT(slotTransitionChanged())); - connect(ui.transitionTrack, SIGNAL(activated(int)), this, SLOT(slotTransitionTrackChanged())); - connect(this, SIGNAL(transferParamDesc(const QDomElement&, int , int)), effectEdit , SLOT(transferParamDesc(const QDomElement&, int , int))); - connect(effectEdit, SIGNAL(parameterChanged(const QDomElement&, const QDomElement&)), this , SLOT(slotUpdateEffectParams(const QDomElement&, const QDomElement&))); + connect(transitionList, SIGNAL(activated(int)), this, SLOT(slotTransitionChanged())); + connect(transitionTrack, SIGNAL(activated(int)), this, SLOT(slotTransitionTrackChanged())); + connect(m_effectEdit, SIGNAL(parameterChanged(QDomElement,QDomElement,int)), this , SLOT(slotUpdateEffectParams(QDomElement,QDomElement))); +} + +void TransitionSettings::updateProjectFormat(const MltVideoProfile &profile, const Timecode &t, const QList &info) +{ + m_effectEdit->updateProjectFormat(profile, t); + m_tracks = info; + updateTrackList(); +} + +void TransitionSettings::updateTimecodeFormat() +{ + m_effectEdit->updateTimecodeFormat(); } -void TransitionSettings::updateProjectFormat(MltVideoProfile profile, Timecode t, const uint tracksCount) +void TransitionSettings::updateTrackList() { - m_tracksCount = tracksCount; - effectEdit->updateProjectFormat(profile, t); - QStringList tracksList; - tracksList << i18n("Auto"); - for (uint i = 0; i < tracksCount; i++) { - tracksList << QString::number(i); + transitionTrack->blockSignals(true); + int current = transitionTrack->itemData(transitionTrack->currentIndex()).toInt(); + transitionTrack->clear(); + transitionTrack->addItem(i18n("Auto"), -1); + int limit = 1; + if (m_usedTransition) + limit = m_usedTransition->track() + 1; + //kDebug() << "/ / TRANS TRK: " << limit; + KIcon videoIcon("kdenlive-show-video"); + KIcon audioIcon("kdenlive-show-audio"); + for (int i = limit; i < m_tracks.count(); ++i) { + int ix = m_tracks.count() - i - 1; + transitionTrack->addItem(m_tracks.at(ix).type == VIDEOTRACK ? videoIcon : audioIcon, + m_tracks.at(ix).trackName.isEmpty() ? QString::number(i) : m_tracks.at(ix).trackName + " (" + QString::number(i) + ')', + m_tracks.count() - i); } - tracksList << i18n("Black"); - ui.transitionTrack->blockSignals(true); - ui.transitionTrack->clear(); - ui.transitionTrack->addItems(tracksList); - ui.transitionTrack->blockSignals(false); + transitionTrack->addItem(i18n("Black"), 0); + transitionTrack->setCurrentIndex(transitionTrack->findData(current)); + transitionTrack->blockSignals(false); } @@ -70,18 +110,34 @@ void TransitionSettings::slotTransitionChanged(bool reinit, bool updateCurrent) QDomElement e = m_usedTransition->toXML().cloneNode().toElement(); if (reinit) { // Reset the transition parameters to the default one - QDomElement newTransition = MainWindow::transitions.getEffectByName(ui.transitionList->currentText()).cloneNode().toElement(); + disconnect(m_effectEdit->monitor(), SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int))); + QDomElement newTransition = MainWindow::transitions.getEffectByName(transitionList->currentText()).cloneNode().toElement(); slotUpdateEffectParams(e, newTransition); - emit transferParamDesc(newTransition, m_usedTransition->startPos().frames(KdenliveSettings::project_fps()), m_usedTransition->endPos().frames(KdenliveSettings::project_fps())); + m_effectEdit->transferParamDesc(newTransition, m_usedTransition->info(), false); + if (m_effectEdit->needsMonitorEffectScene()) + connect(m_effectEdit->monitor(), SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int))); } else if (!updateCurrent) { // Transition changed, update parameters dialog //slotUpdateEffectParams(e, e); - effectEdit->transferParamDesc(e, m_usedTransition->startPos().frames(KdenliveSettings::project_fps()), m_usedTransition->endPos().frames(KdenliveSettings::project_fps())); + m_effectEdit->transferParamDesc(e, m_usedTransition->info(), false); } else { // Same transition, we just want to update the parameters value - slotUpdateEffectParams(e, e); - if (m_usedTransition->hasGeometry()) emit transferParamDesc(m_usedTransition->toXML(), m_usedTransition->startPos().frames(KdenliveSettings::project_fps()), m_usedTransition->endPos().frames(KdenliveSettings::project_fps())); + int ix = transitionList->findData(m_usedTransition->transitionInfo(), Qt::UserRole, Qt::MatchExactly); + if (ix != transitionList->currentIndex()) { + // Transition type changed, reload params + transitionList->blockSignals(true); + transitionList->setCurrentIndex(ix); + transitionList->blockSignals(false); + m_effectEdit->transferParamDesc(e, m_usedTransition->info(), false); + } else { + slotUpdateEffectParams(e, e); + if (m_usedTransition->hasGeometry()) + m_effectEdit->transferParamDesc(m_usedTransition->toXML(), m_usedTransition->info(), false); + } + if (m_effectEdit->needsMonitorEffectScene()) + connect(m_effectEdit->monitor(), SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int))); } + slotCheckMonitorPosition(m_effectEdit->monitor()->render->seekFramePosition()); } void TransitionSettings::slotTransitionTrackChanged() @@ -89,54 +145,69 @@ void TransitionSettings::slotTransitionTrackChanged() if (m_usedTransition == NULL) return; int ix = 0; QDomElement oldxml = m_usedTransition->toXML().cloneNode().toElement(); - if (ui.transitionTrack->currentIndex() > 0) { - ix = ui.transitionTrack->count() - ui.transitionTrack->currentIndex() - 1; + if (transitionTrack->currentIndex() > 0) { + ix = transitionTrack->itemData(transitionTrack->currentIndex()).toInt(); m_usedTransition->setForcedTrack(true, ix); - effectEdit->updateParameter("force_track", "1"); - emit transitionUpdated(m_usedTransition, oldxml); + m_effectEdit->updateParameter("force_track", "1"); } else { + ix = m_autoTrackTransition; m_usedTransition->setForcedTrack(false, ix); - effectEdit->updateParameter("force_track", "0"); - emit transitionUpdated(m_usedTransition, oldxml); + m_effectEdit->updateParameter("force_track", "0"); } - effectEdit->updateParameter("transition_btrack", QString::number(ix)); + emit transitionUpdated(m_usedTransition, oldxml); + m_effectEdit->updateParameter("transition_btrack", QString::number(ix)); } -void TransitionSettings::slotTransitionItemSelected(Transition* t, bool update) +void TransitionSettings::slotTransitionItemSelected(Transition* t, int nextTrack, const QPoint &p, bool update) { setEnabled(t != NULL); + m_effectEdit->setFrameSize(p); + m_autoTrackTransition = nextTrack; + disconnect(m_effectEdit->monitor(), SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int))); if (t == m_usedTransition) { if (t == NULL) return; if (update) { - ui.transitionTrack->blockSignals(true); - if (t->forcedTrack()) ui.transitionTrack->setCurrentIndex(m_tracksCount + 1 - t->transitionEndTrack()); - else ui.transitionTrack->setCurrentIndex(0); - ui.transitionTrack->blockSignals(false); + transitionTrack->blockSignals(true); + updateTrackList(); + if (t->forcedTrack()) transitionTrack->setCurrentIndex(transitionTrack->findData(t->transitionEndTrack())); + else transitionTrack->setCurrentIndex(0); + transitionTrack->blockSignals(false); } - if (update || t->duration() != m_transitionDuration || t->startPos() != m_transitionStart) { - m_transitionDuration = t->duration(); + if (update || t->cropDuration() != m_transitionDuration || t->startPos() != m_transitionStart) { + m_transitionDuration = t->cropDuration(); m_transitionStart = t->startPos(); slotTransitionChanged(false, true); } return; } else if (update) return; if (t) { - m_transitionDuration = t->duration(); + m_transitionDuration = t->cropDuration(); m_transitionStart = t->startPos(); - ui.transitionTrack->blockSignals(true); - if (!t->forcedTrack()) ui.transitionTrack->setCurrentIndex(0); - else ui.transitionTrack->setCurrentIndex(m_tracksCount + 1 - t->transitionEndTrack()); - ui.transitionTrack->blockSignals(false); - int ix = ui.transitionList->findText(t->transitionName(), Qt::MatchExactly); + transitionTrack->blockSignals(true); m_usedTransition = t; + updateTrackList(); + if (!t->forcedTrack()) + transitionTrack->setCurrentIndex(0); + else + transitionTrack->setCurrentIndex(transitionTrack->findData(t->transitionEndTrack())); + transitionTrack->blockSignals(false); + int ix = transitionList->findData(t->transitionInfo(), Qt::UserRole, Qt::MatchExactly); if (ix != -1) { - ui.transitionList->blockSignals(true); - ui.transitionList->setCurrentIndex(ix); + transitionList->blockSignals(true); + transitionList->setCurrentIndex(ix); slotTransitionChanged(false, false); - ui.transitionList->blockSignals(false); + transitionList->blockSignals(false); + } + if (m_effectEdit->needsMonitorEffectScene()) { + connect(m_effectEdit->monitor(), SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int))); } + } else { + // null transition selected + m_usedTransition = NULL; + ItemInfo info; + m_effectEdit->transferParamDesc(QDomElement(), info, false); + m_effectEdit->monitor()->slotShowEffectScene(false); } - } void TransitionSettings::slotUpdateEffectParams(const QDomElement &oldparam, const QDomElement ¶m) @@ -146,15 +217,50 @@ void TransitionSettings::slotUpdateEffectParams(const QDomElement &oldparam, con m_usedTransition->update(); } //oldparam must be also first given to Transition and then return the toXML() - if (oldparam != param) { + if (oldparam != param) emit transitionUpdated(m_usedTransition, oldparam); - } } void TransitionSettings::raiseWindow(QWidget* dock) { if (dock && m_usedTransition) dock->raise(); +} +void TransitionSettings::slotRenderPos(int pos) +{ + if (m_usedTransition) { + m_effectEdit->slotSyncEffectsPos(pos - m_usedTransition->startPos().frames(KdenliveSettings::project_fps())); + if (isEnabled()) slotCheckMonitorPosition(pos); + } +} + +void TransitionSettings::slotSeekTimeline(int pos) +{ + if (m_usedTransition) + emit seekTimeline(m_usedTransition->startPos().frames(KdenliveSettings::project_fps()) + pos); +} + +void TransitionSettings::slotCheckMonitorPosition(int renderPos) +{ + if (!isEnabled()) return; + if (m_effectEdit->needsMonitorEffectScene()) { + if (renderPos >= m_usedTransition->startPos().frames(KdenliveSettings::project_fps()) && renderPos < m_usedTransition->endPos().frames(KdenliveSettings::project_fps())) { + if (!m_effectEdit->monitor()->effectSceneDisplayed()) { + m_effectEdit->monitor()->slotShowEffectScene(true); + } + } else { + m_effectEdit->monitor()->slotShowEffectScene(false); + } + } + else { + m_effectEdit->monitor()->slotShowEffectScene(false); + } +} + +void TransitionSettings::setKeyframes(const QString &data, int maximum) +{ + m_effectEdit->setKeyframes(data, maximum); } +#include "transitionsettings.moc"