Fix fade out effects not correctly working

svn path=/trunk/kdenlive/; revision=3557

diff --git a/src/clipitem.cpp b/src/clipitem.cpp
index 1e005f5537d92fb38cf78f49164dec8e960649ba..a962bf96b9b8c6cb14e0392f181f87bf66180e58 100644 (file)
--- a/src/clipitem.cpp
+++ b/src/clipitem.cpp
@@ -1471,9 +1471,8 @@ void ClipItem::deleteEffect(QString index)
         if (index.toInt() > m_effectList.count() - 1) {
             setSelectedEffect(m_effectList.count() - 1);
         } else setSelectedEffect(index.toInt());
-        return;
     }
-    if (needRepaint) update(boundingRect());
+    if (needRepaint) update();
     flashClip();
 }
 

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index c76b8a599ac9783ef9e809e75080970da269409f..eb98da0862813b1c1c5fde32da1a6f46ac1a9a4d 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -1335,10 +1335,16 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track)
             ClipItem *item = (ClipItem *)itemList.at(i);
             if (effect.attribute("type") == "audio") {
                 // Don't add audio effects on video clips
-                if (item->isVideoOnly() || (item->clipType() != AUDIO && item->clipType() != AV && item->clipType() != PLAYLIST)) continue;
+                if (item->isVideoOnly() || (item->clipType() != AUDIO && item->clipType() != AV && item->clipType() != PLAYLIST)) {
+                    emit displayMessage(i18n("Cannot add an audio effect to this clip"), ErrorMessage);
+                    continue;
+                }
             } else if (effect.hasAttribute("type") == false) {
                 // Don't add video effect on audio clips
-                if (item->isAudioOnly() || item->clipType() == AUDIO) continue;
+                if (item->isAudioOnly() || item->clipType() == AUDIO) {
+                    emit displayMessage(i18n("Cannot add a video effect to this clip"), ErrorMessage);
+                    continue;
+                }
             }
             if (item->hasEffect(effect.attribute("tag"), effect.attribute("id")) != -1 && effect.attribute("unique", "0") != "0") {
                 emit displayMessage(i18n("Effect already present in clip"), ErrorMessage);
@@ -2597,7 +2603,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
 
                 new ResizeClipCommand(this, m_dragItemInfo, info, false, resizeCommand);
                 m_commandStack->push(resizeCommand);
-                updateClipFade(static_cast <ClipItem *>(m_dragItem), true);
+                updateClipFade(static_cast <ClipItem *>(m_dragItem));
             } else {
                 m_dragItem->resizeEnd((int) m_dragItemInfo.endPos.frames(m_document->fps()));
                 emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
@@ -3315,7 +3321,7 @@ void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end)
         bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, end.endPos - clipinfo.startPos);
         if (success) {
             item->resizeEnd((int) end.endPos.frames(m_document->fps()));
-            updateClipFade(item, true);
+            updateClipFade(item);
         } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
     }
     if (end.cropStart != start.cropStart) {
@@ -3332,85 +3338,86 @@ void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end)
     KdenliveSettings::setSnaptopoints(snap);
 }
 
-void CustomTrackView::updateClipFade(ClipItem * item, bool updateFadeOut)
-{
-    if (!updateFadeOut) {
-        int end = item->fadeIn();
-        if (end != 0) {
-            // there is a fade in effect
-            int effectPos = item->hasEffect("volume", "fadein");
-            if (effectPos != -1) {
-                QDomElement oldeffect = item->effectAt(effectPos);
-                int start = item->cropStart().frames(m_document->fps());
-                int max = item->cropDuration().frames(m_document->fps());
-                if (end > max) {
-                    item->setFadeIn(max);
-                    end = item->fadeIn();
-                }
-                end += start;
-                EffectsList::setParameter(oldeffect, "in", QString::number(start));
-                EffectsList::setParameter(oldeffect, "out", QString::number(end));
-                if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect)))
-                    emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
-                // if fade effect is displayed, update the effect edit widget with new clip duration
-                if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
+void CustomTrackView::updateClipFade(ClipItem * item)
+{
+    int end = item->fadeIn();
+    if (end != 0) {
+        // there is a fade in effect
+        int effectPos = item->hasEffect("volume", "fadein");
+        if (effectPos != -1) {
+            QDomElement oldeffect = item->effectAt(effectPos);
+            int start = item->cropStart().frames(m_document->fps());
+            int max = item->cropDuration().frames(m_document->fps());
+            if (end > max) {
+                // Make sure the fade effect is not longer than the clip
+                item->setFadeIn(max);
+                end = item->fadeIn();
             }
-            effectPos = item->hasEffect("brightness", "fade_from_black");
-            if (effectPos != -1) {
-                QDomElement oldeffect = item->effectAt(effectPos);
-                int start = item->cropStart().frames(m_document->fps());
-                int max = item->cropDuration().frames(m_document->fps());
-                if (end > max) {
-                    item->setFadeIn(max);
-                    end = item->fadeIn();
-                }
-                end += start;
-                EffectsList::setParameter(oldeffect, "in", QString::number(start));
-                EffectsList::setParameter(oldeffect, "out", QString::number(end));
-                if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect)))
-                    emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
-                // if fade effect is displayed, update the effect edit widget with new clip duration
-                if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
+            end += start;
+            EffectsList::setParameter(oldeffect, "in", QString::number(start));
+            EffectsList::setParameter(oldeffect, "out", QString::number(end));
+            if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect)))
+                emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
+            // if fade effect is displayed, update the effect edit widget with new clip duration
+            if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
+        }
+        effectPos = item->hasEffect("brightness", "fade_from_black");
+        if (effectPos != -1) {
+            QDomElement oldeffect = item->effectAt(effectPos);
+            int start = item->cropStart().frames(m_document->fps());
+            int max = item->cropDuration().frames(m_document->fps());
+            if (end > max) {
+                // Make sure the fade effect is not longer than the clip
+                item->setFadeIn(max);
+                end = item->fadeIn();
             }
-        }
-    } else {
-        int start = item->fadeOut();
-        if (start != 0) {
-            // there is a fade in effect
-            int effectPos = item->hasEffect("volume", "fadeout");
-            if (effectPos != -1) {
-                QDomElement oldeffect = item->effectAt(effectPos);
-                int end = (item->duration() - item->cropStart()).frames(m_document->fps());
-                int max = item->cropDuration().frames(m_document->fps());
-                if (end > max) {
-                    item->setFadeOut(max);
-                    start = item->fadeOut();
-                }
-                start = end - start;
-                EffectsList::setParameter(oldeffect, "in", QString::number(start));
-                EffectsList::setParameter(oldeffect, "out", QString::number(end));
-                if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect)))
-                    emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
-                // if fade effect is displayed, update the effect edit widget with new clip duration
-                if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
+            end += start;
+            EffectsList::setParameter(oldeffect, "in", QString::number(start));
+            EffectsList::setParameter(oldeffect, "out", QString::number(end));
+            if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect)))
+                emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
+            // if fade effect is displayed, update the effect edit widget with new clip duration
+            if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
+        }
+    }
+    int start = item->fadeOut();
+    if (start != 0) {
+        // there is a fade out effect
+        int effectPos = item->hasEffect("volume", "fadeout");
+        if (effectPos != -1) {
+            QDomElement oldeffect = item->effectAt(effectPos);
+            int max = item->cropDuration().frames(m_document->fps());
+            int end = max + item->cropStart().frames(m_document->fps());
+            if (start > max) {
+                // Make sure the fade effect is not longer than the clip
+                item->setFadeOut(max);
+                start = item->fadeOut();
             }
-            effectPos = item->hasEffect("brightness", "fade_to_black");
-            if (effectPos != -1) {
-                QDomElement oldeffect = item->effectAt(effectPos);
-                int end = (item->duration() - item->cropStart()).frames(m_document->fps());
-                int max = item->cropDuration().frames(m_document->fps());
-                if (end > max) {
-                    item->setFadeOut(max);
-                    start = item->fadeOut();
-                }
-                start = end - start;
-                EffectsList::setParameter(oldeffect, "in", QString::number(start));
-                EffectsList::setParameter(oldeffect, "out", QString::number(end));
-                if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect)))
-                    emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
-                // if fade effect is displayed, update the effect edit widget with new clip duration
-                if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
+            start = end - start;
+            EffectsList::setParameter(oldeffect, "in", QString::number(start));
+            EffectsList::setParameter(oldeffect, "out", QString::number(end));
+            if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect)))
+                emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
+            // if fade effect is displayed, update the effect edit widget with new clip duration
+            if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
+        }
+        effectPos = item->hasEffect("brightness", "fade_to_black");
+        if (effectPos != -1) {
+            QDomElement oldeffect = item->effectAt(effectPos);
+            int max = item->cropDuration().frames(m_document->fps());
+            int end = max + item->cropStart().frames(m_document->fps());
+            if (start > max) {
+                // Make sure the fade effect is not longer than the clip
+                item->setFadeOut(max);
+                start = item->fadeOut();
             }
+            start = end - start;
+            EffectsList::setParameter(oldeffect, "in", QString::number(start));
+            EffectsList::setParameter(oldeffect, "out", QString::number(end));
+            if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect)))
+                emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
+            // if fade effect is displayed, update the effect edit widget with new clip duration
+            if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
         }
     }
 }

diff --git a/src/customtrackview.h b/src/customtrackview.h
index 967ecbd581c3afc2bc799e5d8286f6e9b789b91f..3ed0fc76a558ba8056a9d7a1bd7726d91f461937 100644 (file)
--- a/src/customtrackview.h
+++ b/src/customtrackview.h
@@ -234,7 +234,7 @@ private:
 
     /** Get the index of the video track that is just below current track */
     int getPreviousVideoTrack(int track);
-    void updateClipFade(ClipItem * item, bool updateFadeOut = false);
+    void updateClipFade(ClipItem * item);
     bool canBePastedTo(ItemInfo info, int type) const;
     bool canBePasted(QList<AbstractClipItem *> items, GenTime offset, int trackOffset) const;
     bool canBeMoved(QList<AbstractClipItem *> items, GenTime offset, int trackOffset) const;

diff --git a/src/renderer.cpp b/src/renderer.cpp
index a214bf8c2b53a32d1c52e8dc81b1d434c0c389e6..f29ad335a0fd367eb639687f692af039e70ff2a9 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -2197,6 +2197,10 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration)
         clip->parent().set("length", newDuration + 1);
         clip->set("length", newDuration + 1);
     }
+    if (newDuration > clip->get_out()) {
+        clip->parent().set_in_and_out(0, newDuration + 1);
+        clip->set_in_and_out(0, newDuration + 1);
+    }
     trackPlaylist.resize_clip(clipIndex, previousStart, newDuration + previousStart);
     trackPlaylist.consolidate_blanks(0);
     // skip to next clip