Merge pull request #3817 from ferdnyc/effect-parent

Use new effect.ParentClip() for more efficient property lookup, fix cutting closeEvent()

Author: ferdnyc

src/windows/cutting.py

@@ -356,7 +356,6 @@ def close(self):
 
     def closeEvent(self, event):
         log.debug('closeEvent')
-        event.accept()
 
         # Stop playback
         self.preview_parent.worker.Stop()

src/windows/models/properties_model.py

@@ -95,25 +95,24 @@ def update_item_timeout(self):
 
         log.debug("Update item: %s" % item_type)
 
+        timeline = get_app().window.timeline_sync.timeline
         if item_type == "clip":
-            c = get_app().window.timeline_sync.timeline.GetClip(item_id)
-            if c:
-                # Append to selected items
-                self.selected.append((c, item_type))
-
-        if item_type == "transition":
-            t = get_app().window.timeline_sync.timeline.GetEffect(item_id)
-            if t:
-                # Append to selected items
-                self.selected.append((t, item_type))
-
-        if item_type == "effect":
-            e = get_app().window.timeline_sync.timeline.GetClipEffect(item_id)
-            if e:
-                # Filter out basic properties, since this is an effect on a clip
-                self.filter_base_properties = ["position", "layer", "start", "end", "duration"]
-                # Append to selected items
-                self.selected.append((e, item_type))
+            item = timeline.GetClip(item_id)
+        elif item_type == "transition":
+            item = timeline.GetEffect(item_id)
+        elif item_type == "effect":
+            item = timeline.GetClipEffect(item_id)
+            # Filter out basic properties, since this is an effect on a clip
+            self.filter_base_properties = ["position", "layer", "start", "end", "duration"]
+            if item:
+                # We also need the parent
+                self.selected_parent = item.ParentClip()
+        else:
+            item = None
+
+        if not item:
+            return
+        self.selected.append((item, item_type))
 
         # Update frame # from timeline
         self.update_frame(get_app().window.preview_thread.player.Position(), reload_model=False)
@@ -135,21 +134,9 @@ def update_frame(self, frame_number, reload_model=True):
                 # Ignore null clip
                 return
 
-            # If effect, find the position of the parent clip
+            # If effect, we really care about the position of the parent clip
             if item_type == "effect":
-                # find parent clip
-                effect = Effect.get(id=clip.Id())
-                if not effect:
-                    # Invalid effect
-                    return
-
-                parent_clip_id = effect.parent["id"]
-
-                # Find this clip object
-                c = get_app().window.timeline_sync.timeline.GetClip(parent_clip_id)
-                if c:
-                    # Override the selected clip object (so the effect gets the correct starting position)
-                    clip = c
+                clip = self.selected_parent
 
             # Get FPS from project
             fps = get_app().project.get("fps")