Fix trim in affecting fade-out and trim out affecting fade-in.

mltframework · Feb 28, 2014 · 1456ff8 · 1456ff8
1 parent c901dda
commit 1456ff8
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/src/mltcontroller.cpp b/src/mltcontroller.cpp
@@ -504,8 +504,10 @@ void Controller::setIn(int in)
         int n = m_producer->filter_count();
         for (int i = 0; i < n; i++) {
             Filter* filter = m_producer->filter(i);
-            if (filter && filter->is_valid() && filter->get_length() > 0)
-                filter->set_in_and_out(in, in + filter->get_length() - 1);
+            if (filter && filter->is_valid() && filter->get_length() > 0) {
+                if (QString(filter->get("shotcut:filter")).startsWith("fadeIn"))
+                    filter->set_in_and_out(in, in + filter->get_length() - 1);
+            }
             delete filter;
         }
     }
@@ -521,8 +523,10 @@ void Controller::setOut(int out)
         for (int i = 0; i < n; i++) {
             Filter* filter = m_producer->filter(i);
             if (filter && filter->is_valid() && filter->get_length() > 0) {
-                int in = out - filter->get_length() + 1;
-                filter->set_in_and_out(in, out);
+                if (QString(filter->get("shotcut:filter")).startsWith("fadeOut")) {
+                    int in = out - filter->get_length() + 1;
+                    filter->set_in_and_out(in, out);
+                }
             }
             delete filter;
         }

diff --git a/src/models/multitrackmodel.cpp b/src/models/multitrackmodel.cpp
@@ -493,8 +493,10 @@ int MultitrackModel::trimClipIn(int trackIndex, int clipIndex, int delta)
         int n = info->producer->filter_count();
         for (int j = 0; j < n; j++) {
             Mlt::Filter* filter = info->producer->filter(j);
-            if (filter && filter->is_valid() && filter->get_length() > 0)
-                filter->set_in_and_out(in, in + filter->get_length() - 1);
+            if (filter && filter->is_valid() && filter->get_length() > 0) {
+                if (QString(filter->get("shotcut:filter")).startsWith("fadeIn"))
+                    filter->set_in_and_out(in, in + filter->get_length() - 1);
+            }
             delete filter;
         }
 
@@ -636,6 +638,17 @@ int MultitrackModel::trimClipOut(int trackIndex, int clipIndex, int delta)
         int out = info->frame_out - delta;
         playlist.resize_clip(clipIndex, in, out);
 
+        // Adjust all filters that have an explicit duration.
+        int n = info->producer->filter_count();
+        for (int j = 0; j < n; j++) {
+            Mlt::Filter* filter = info->producer->filter(j);
+            if (filter && filter->is_valid() && filter->get_length() > 0) {
+                if (QString(filter->get("shotcut:filter")).startsWith("fadeOut"))
+                    filter->set_in_and_out(out - filter->get_length() + 1, out);
+            }
+            delete filter;
+        }
+
         QModelIndex index = createIndex(clipIndex, 0, trackIndex);
         QVector<int> roles;
         roles << DurationRole;