X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftransitionsettings.cpp;h=8946e8d4d20fb13e5f0d1463830244b24787c714;hb=00e301465f397cbd487dc4c0e3e7a641746f8e25;hp=833c1110397efbdec769f67e7b808aaa7df73774;hpb=07f908f3c4fbfef99ff99b174b8fb628badc9e9c;p=kdenlive diff --git a/src/transitionsettings.cpp b/src/transitionsettings.cpp index 833c1110..8946e8d4 100644 --- a/src/transitionsettings.cpp +++ b/src/transitionsettings.cpp @@ -23,23 +23,24 @@ #include "effectstackedit.h" #include "kdenlivesettings.h" #include "mainwindow.h" +#include "monitoreditwidget.h" +#include "monitorscene.h" #include -TransitionSettings::TransitionSettings(QWidget* parent) : +TransitionSettings::TransitionSettings(Monitor *monitor, QWidget* parent) : QWidget(parent), m_usedTransition(NULL), - m_tracksCount(0), m_autoTrackTransition(0) { setupUi(this); QVBoxLayout *vbox1 = new QVBoxLayout(frame); - m_effectEdit = new EffectStackEdit(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, SIGNAL(seekTimeline(int))); + connect(m_effectEdit, SIGNAL(seekTimeline(int)), this, SLOT(slotSeekTimeline(int))); setEnabled(false); QList transitionsList; @@ -63,26 +64,41 @@ TransitionSettings::TransitionSettings(QWidget* parent) : connect(transitionList, SIGNAL(activated(int)), this, SLOT(slotTransitionChanged())); connect(transitionTrack, SIGNAL(activated(int)), this, SLOT(slotTransitionTrackChanged())); - - connect(this, SIGNAL(transferParamDesc(const QDomElement&, int , int)), m_effectEdit , SLOT(transferParamDesc(const QDomElement&, int , int))); - connect(m_effectEdit, SIGNAL(parameterChanged(const QDomElement&, const QDomElement&)), this , SLOT(slotUpdateEffectParams(const QDomElement&, const QDomElement&))); + connect(m_effectEdit, SIGNAL(parameterChanged(const QDomElement, const QDomElement, int)), this , SLOT(slotUpdateEffectParams(const QDomElement, const QDomElement))); } void TransitionSettings::updateProjectFormat(MltVideoProfile profile, Timecode t, const QList info) { - m_tracksCount = info.count(); m_effectEdit->updateProjectFormat(profile, t); - QStringList tracksList; + m_tracks = info; + updateTrackList(); +} + +void TransitionSettings::updateTimecodeFormat() +{ + m_effectEdit->updateTimecodeFormat(); +} + +void TransitionSettings::updateTrackList() +{ transitionTrack->blockSignals(true); + int current = transitionTrack->itemData(transitionTrack->currentIndex()).toInt(); transitionTrack->clear(); transitionTrack->addItem(i18n("Auto"), -1); - for (int i = 0; i < m_tracksCount; i++) { - int ix = m_tracksCount - i - 1; - if (!info.at(ix).trackName.isEmpty()) - transitionTrack->addItem(info.at(ix).trackName + '(' + QString::number(i) + ')'); - else transitionTrack->addItem(QString::number(i)); + 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); } - transitionTrack->addItem(i18n("Black"), m_tracksCount); + transitionTrack->addItem(i18n("Black"), 0); + transitionTrack->setCurrentIndex(transitionTrack->findData(current)); transitionTrack->blockSignals(false); } @@ -94,16 +110,18 @@ void TransitionSettings::slotTransitionChanged(bool reinit, bool updateCurrent) // Reset the transition parameters to the default one 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); } else if (!updateCurrent) { // Transition changed, update parameters dialog //slotUpdateEffectParams(e, e); - m_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())); + if (m_usedTransition->hasGeometry()) + m_effectEdit->transferParamDesc(m_usedTransition->toXML(), m_usedTransition->info(), false); } + slotCheckMonitorPosition(m_effectEdit->monitor()->render->seekFramePosition()); } void TransitionSettings::slotTransitionTrackChanged() @@ -112,16 +130,15 @@ void TransitionSettings::slotTransitionTrackChanged() int ix = 0; QDomElement oldxml = m_usedTransition->toXML().cloneNode().toElement(); if (transitionTrack->currentIndex() > 0) { - ix = transitionTrack->count() - transitionTrack->currentIndex() - 1; + ix = transitionTrack->itemData(transitionTrack->currentIndex()).toInt(); m_usedTransition->setForcedTrack(true, ix); m_effectEdit->updateParameter("force_track", "1"); - emit transitionUpdated(m_usedTransition, oldxml); } else { ix = m_autoTrackTransition; m_usedTransition->setForcedTrack(false, ix); m_effectEdit->updateParameter("force_track", "0"); - emit transitionUpdated(m_usedTransition, oldxml); } + emit transitionUpdated(m_usedTransition, oldxml); m_effectEdit->updateParameter("transition_btrack", QString::number(ix)); } @@ -130,11 +147,13 @@ void TransitionSettings::slotTransitionItemSelected(Transition* t, int nextTrack 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) { transitionTrack->blockSignals(true); - if (t->forcedTrack()) transitionTrack->setCurrentIndex(m_tracksCount + 1 - t->transitionEndTrack()); + updateTrackList(); + if (t->forcedTrack()) transitionTrack->setCurrentIndex(transitionTrack->findData(t->transitionEndTrack())); else transitionTrack->setCurrentIndex(0); transitionTrack->blockSignals(false); } @@ -149,41 +168,78 @@ void TransitionSettings::slotTransitionItemSelected(Transition* t, int nextTrack m_transitionDuration = t->cropDuration(); m_transitionStart = t->startPos(); transitionTrack->blockSignals(true); - if (!t->forcedTrack()) transitionTrack->setCurrentIndex(0); - else transitionTrack->setCurrentIndex(m_tracksCount + 1 - t->transitionEndTrack()); + 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); - m_usedTransition = t; if (ix != -1) { transitionList->blockSignals(true); transitionList->setCurrentIndex(ix); slotTransitionChanged(false, 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; - m_effectEdit->transferParamDesc(QDomElement(), 0, 0); + ItemInfo info; + m_effectEdit->transferParamDesc(QDomElement(), info, false); } - } -void TransitionSettings::slotUpdateEffectParams(const QDomElement &oldparam, const QDomElement ¶m) +void TransitionSettings::slotUpdateEffectParams(const QDomElement oldparam, const QDomElement param) { if (m_usedTransition) { m_usedTransition->setTransitionParameters(param); 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); + } +} + + +#include "transitionsettings.moc"