Merge branch 'master' of https://github.com/olive-editor/olive

app/node/input.cpp

@@ -1075,7 +1075,9 @@ void NodeInput::CopyValues(NodeInput *source, NodeInput *dest, bool include_conn
   for (int i=0;i<source->keyframe_tracks_.size();i++) {
     dest->keyframe_tracks_[i].clear();
     foreach (NodeKeyframePtr key, source->keyframe_tracks_.at(i)) {
-      dest->keyframe_tracks_[i].append(key->copy());
+      NodeKeyframePtr key_copy = key->copy();
+      key_copy->set_parent(dest);
+      dest->keyframe_tracks_[i].append(key_copy);
     }
   }
 

app/node/input/media/media.cpp

@@ -40,14 +40,14 @@ QList<Node::CategoryID> MediaInput::Category() const
   return {kCategoryInput};
 }
 
-StreamPtr MediaInput::footage()
+StreamPtr MediaInput::stream()
 {
   return footage_input_->get_standard_value().value<StreamPtr>();
 }
 
-void MediaInput::SetFootage(StreamPtr f)
+void MediaInput::SetStream(StreamPtr s)
 {
-  footage_input_->set_standard_value(QVariant::fromValue(f));
+  footage_input_->set_standard_value(QVariant::fromValue(s));
 }
 
 bool MediaInput::IsMedia() const

app/node/input/media/media.h

@@ -40,8 +40,8 @@ public:
 
   virtual QList<CategoryID> Category() const override;
 
-  StreamPtr footage();
-  void SetFootage(StreamPtr f);
+  StreamPtr stream();
+  void SetStream(StreamPtr s);
 
   virtual bool IsMedia() const override;