X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftransitionsettings.cpp;h=39943683d733ecaeb30ead2bae9300cddad39ac0;hb=f4462e7ecb75f64e524746e3bb7c62a5e973d965;hp=0fbe0f7a4da38fcb1e44aa0c20ad8ea09026d7ea;hpb=df22911b4aab73a9bcf3b33d491530ad3f83af42;p=kdenlive diff --git a/src/transitionsettings.cpp b/src/transitionsettings.cpp index 0fbe0f7a..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,63 +23,84 @@ #include "effectstackedit.h" #include "kdenlivesettings.h" #include "mainwindow.h" +#include "monitoreditwidget.h" +#include "monitorscene.h" #include -TransitionSettings::TransitionSettings(QWidget* parent) : - QWidget(parent), - m_usedTransition(NULL), - m_tracksCount(0), - m_autoTrackTransition(0) +TransitionSettings::TransitionSettings(Monitor *monitor, QWidget* parent) : + QWidget(parent), + m_usedTransition(NULL), + 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))); + connect(m_effectEdit, SIGNAL(importClipKeyframes()), this, SIGNAL(importClipKeyframes())); + setEnabled(false); - QMap transitionsList; + QList transitionsList; int max = MainWindow::transitions.effectNames().count(); QStringList transitionInfo; int ix = 0; - for (; ix < max; ix++) { + for (; ix < max; ++ix) { transitionInfo = MainWindow::transitions.effectIdInfo(ix); transitionInfo << QString::number(ix); - transitionsList.insert(transitionInfo.at(0).toLower(), transitionInfo); + transitionsList.append(transitionInfo); } ix = 0; foreach(const QStringList &value, transitionsList) { - transitionList->addItem(value.at(0)); + 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++; + ++ix; } 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(QDomElement,QDomElement,int)), this , SLOT(slotUpdateEffectParams(QDomElement,QDomElement))); } -void TransitionSettings::updateProjectFormat(MltVideoProfile profile, Timecode t, const QList info) +void TransitionSettings::updateProjectFormat(const MltVideoProfile &profile, const 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++) { - if (!info.at(i).trackName.isEmpty()) - transitionTrack->addItem(info.at(i).trackName + '(' + QString::number(i) + ')', 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); } @@ -89,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 + 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); - 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())); + 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() @@ -109,29 +146,30 @@ 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)); } -void TransitionSettings::slotTransitionItemSelected(Transition* t, int nextTrack, QPoint p, 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) { 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); } @@ -146,23 +184,30 @@ 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()); - transitionTrack->blockSignals(false); - int ix = transitionList->findText(t->transitionName(), Qt::MatchExactly); 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) { 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); + m_effectEdit->monitor()->slotShowEffectScene(false); } - } void TransitionSettings::slotUpdateEffectParams(const QDomElement &oldparam, const QDomElement ¶m) @@ -172,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"