/***************************************************************************
- effecstackedit.h - description
+ effecstackedit.cpp - description
-------------------
begin : Mar 15 2008
copyright : (C) 2008 by Marco Gittler
#include "effectstackedit.h"
#include "kdenlivesettings.h"
#include "mainwindow.h"
-#include "monitoreditwidget.h"
+#include "widgets/monitoreditwidget.h"
#include "monitorscene.h"
#include <KDebug>
TransitionSettings::TransitionSettings(Monitor *monitor, QWidget* parent) :
- QWidget(parent),
- m_usedTransition(NULL),
- m_autoTrackTransition(0)
+ QWidget(parent),
+ m_usedTransition(NULL),
+ m_autoTrackTransition(0)
{
setupUi(this);
QVBoxLayout *vbox1 = new QVBoxLayout(frame);
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);
QList<QStringList> transitionsList;
QStringList transitionInfo;
int ix = 0;
- for (; ix < max; ix++) {
+ for (; ix < max; ++ix) {
transitionInfo = MainWindow::transitions.effectIdInfo(ix);
transitionInfo << QString::number(ix);
transitionsList.append(transitionInfo);
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(m_effectEdit, SIGNAL(parameterChanged(const QDomElement, const QDomElement, int)), this , SLOT(slotUpdateEffectParams(const QDomElement, const QDomElement)));
- connect(m_effectEdit, SIGNAL(checkMonitorPosition(int)), this, SLOT(slotCheckMonitorPosition(int)));
- connect(monitor, SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int)));
+ connect(m_effectEdit, SIGNAL(parameterChanged(QDomElement,QDomElement,int)), this , SLOT(slotUpdateEffectParams(QDomElement,QDomElement)));
}
-void TransitionSettings::updateProjectFormat(MltVideoProfile profile, Timecode t, const QList <TrackInfo> info)
+void TransitionSettings::updateProjectFormat(const MltVideoProfile &profile, const Timecode &t, const QList<TrackInfo> &info)
{
m_effectEdit->updateProjectFormat(profile, t);
m_tracks = info;
int limit = 1;
if (m_usedTransition)
limit = m_usedTransition->track() + 1;
- kDebug() << "/ / TRANS TRK: " << limit;
+ //kDebug() << "/ / TRANS TRK: " << limit;
KIcon videoIcon("kdenlive-show-video");
KIcon audioIcon("kdenlive-show-audio");
- for (int i = limit; i < m_tracks.count(); i++) {
+ 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.at(ix).trackName.isEmpty() ? QString::number(i) : m_tracks.at(ix).trackName + " (" + QString::number(i) + ')',
m_tracks.count() - i);
}
transitionTrack->addItem(i18n("Black"), 0);
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);
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->info(), false);
} else {
// Same transition, we just want to update the parameters value
- slotUpdateEffectParams(e, e);
- if (m_usedTransition->hasGeometry())
- m_effectEdit->transferParamDesc(m_usedTransition->toXML(), m_usedTransition->info(), false);
+ 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()
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) {
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;
ItemInfo info;
m_effectEdit->transferParamDesc(QDomElement(), info, false);
+ m_effectEdit->monitor()->slotShowEffectScene(false);
}
-
}
-void TransitionSettings::slotUpdateEffectParams(const QDomElement oldparam, const QDomElement param)
+void TransitionSettings::slotUpdateEffectParams(const QDomElement &oldparam, const QDomElement ¶m)
{
if (m_usedTransition) {
m_usedTransition->setTransitionParameters(param);
{
if (dock && m_usedTransition)
dock->raise();
-
}
void TransitionSettings::slotRenderPos(int pos)
{
- if (m_usedTransition)
+ 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);
+ emit seekTimeline(m_usedTransition->startPos().frames(KdenliveSettings::project_fps()) + pos);
}
void TransitionSettings::slotCheckMonitorPosition(int renderPos)
{
- if (renderPos >= m_usedTransition->startPos().frames(KdenliveSettings::project_fps()) && renderPos <= m_usedTransition->endPos().frames(KdenliveSettings::project_fps())) {
- if (!m_effectEdit->monitor()->getEffectEdit()->getScene()->views().at(0)->isVisible())
- m_effectEdit->monitor()->slotEffectScene(true);
- } else {
- m_effectEdit->monitor()->slotEffectScene(false);
+ 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"
projects / kdenlive / blobdiff