From: Jean-Baptiste M. <jb...@kd...> - 2012-12-10 21:51:39
|
Git commit 6fa9db6c7fe703c5831bee5d157c0f169ebc8240 by Jean-Baptiste Mardelle. Committed on 10/12/2012 at 22:50. Pushed by mardelle into branch 'master'. Fix fade problem when resizing clip:http://kdenlive.org/mantis/view.php?id=2843 M +2 -1 src/clipitem.cpp M +3 -1 src/commands/editeffectcommand.cpp M +3 -1 src/commands/resizeclipcommand.cpp M +1 -1 src/customtrackview.cpp M +1 -2 src/effectstack/effectstackview2.cpp M +2 -2 src/positionedit.cpp http://commits.kde.org/kdenlive/6fa9db6c7fe703c5831bee5d157c0f169ebc8240 diff --git a/src/clipitem.cpp b/src/clipitem.cpp index fcae1fe..0171874 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -1944,8 +1944,9 @@ QMap<int, QDomElement> ClipItem::adjustEffectsToDuration(int width, int height, effects[i] = effect.cloneNode().toElement(); EffectsList::setParameter(effect, "out", QString::number(clipEnd)); } - if (effects.contains(i)) + if (effects.contains(i)) { setFadeIn(out - in); + } } else { if (out != clipEnd) { effects[i] = effect.cloneNode().toElement(); diff --git a/src/commands/editeffectcommand.cpp b/src/commands/editeffectcommand.cpp index 6ecc75b..10654c1 100644 --- a/src/commands/editeffectcommand.cpp +++ b/src/commands/editeffectcommand.cpp @@ -66,7 +66,9 @@ void EditEffectCommand::undo() // virtual void EditEffectCommand::redo() { - if (m_doIt) m_view->updateEffect(m_track, m_pos, m_effect, m_refreshEffectStack); + if (m_doIt) { + m_view->updateEffect(m_track, m_pos, m_effect, m_refreshEffectStack); + } m_doIt = true; m_refreshEffectStack = true; } diff --git a/src/commands/resizeclipcommand.cpp b/src/commands/resizeclipcommand.cpp index 9cde2c4..dba66a9 100644 --- a/src/commands/resizeclipcommand.cpp +++ b/src/commands/resizeclipcommand.cpp @@ -42,7 +42,9 @@ void ResizeClipCommand::undo() // virtual void ResizeClipCommand::redo() { - if (m_doIt) m_view->resizeClip(m_startPos, m_endPos, m_dontWorry); + if (m_doIt) { + m_view->resizeClip(m_startPos, m_endPos, m_dontWorry); + } m_doIt = true; } diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 29d3999..db64a05 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -7569,7 +7569,7 @@ void CustomTrackView::adjustEffects(ClipItem* item, ItemInfo oldInfo, QUndoComma { QMap<int, QDomElement> effects = item->adjustEffectsToDuration(m_document->width(), m_document->height(), oldInfo); - if (effects.count()) { + if (!effects.isEmpty()) { QMap<int, QDomElement>::const_iterator i = effects.constBegin(); while (i != effects.constEnd()) { new EditEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), i.value(), item->effect(i.key()), i.value().attribute("kdenlive_ix").toInt(), true, true, command); diff --git a/src/effectstack/effectstackview2.cpp b/src/effectstack/effectstackview2.cpp index d67f2bb..52803e9 100644 --- a/src/effectstack/effectstackview2.cpp +++ b/src/effectstack/effectstackview2.cpp @@ -96,8 +96,7 @@ void EffectStackView2::slotRenderPos(int pos) void EffectStackView2::slotClipItemUpdate() { int inPoint = m_clipref->cropStart().frames(KdenliveSettings::project_fps()); - int outPoint = m_clipref->cropDuration().frames(KdenliveSettings::project_fps()) - inPoint; - CollapsibleEffect *effectToMove = NULL; + int outPoint = m_clipref->cropDuration().frames(KdenliveSettings::project_fps()) + inPoint; for (int i = 0; i < m_effects.count(); i++) { m_effects.at(i)->setRange(inPoint, outPoint); } diff --git a/src/positionedit.cpp b/src/positionedit.cpp index aaeac22..ad8d4e1 100644 --- a/src/positionedit.cpp +++ b/src/positionedit.cpp @@ -83,8 +83,8 @@ void PositionEdit::slotUpdatePosition() void PositionEdit::setRange(int min, int max) { - m_slider->setRange(min, max); - m_display->setRange(min, max); + m_slider->setRange(0, max - min); + m_display->setRange(0, max - min); } #include "positionedit.moc" |