Revert "derive clips, tracks, and sequences from the same base"

This reverts commit 1b9a963eeb.
This commit is contained in:
itsmattkc
2019-04-14 12:47:19 +10:00
parent 1b9a963eeb
commit de69558ee5
26 changed files with 108 additions and 284 deletions
+6 -5
View File
@@ -48,7 +48,8 @@
class EffectGizmo;
class KeyframeDataChange;
class TimelineObject;
class Clip;
using ClipPtr = std::shared_ptr<Clip>;
class Node;
using NodePtr = std::shared_ptr<Node>;
@@ -111,10 +112,10 @@ struct GLTextureCoords {
class Node : public QObject {
Q_OBJECT
public:
Node(TimelineObject *c);
Node(Clip *c);
~Node();
TimelineObject* parent_clip;
Clip* parent_clip;
virtual QString name() = 0;
virtual QString id() = 0;
@@ -123,7 +124,7 @@ public:
virtual EffectType type() = 0;
virtual olive::TrackType subtype() = 0;
virtual bool IsCreatable();
virtual NodePtr Create(TimelineObject *c) = 0;
virtual NodePtr Create(Clip *c) = 0;
void AddRow(EffectRow* row);
int IndexOfRow(EffectRow* row);
@@ -141,7 +142,7 @@ public:
virtual void refresh();
virtual NodePtr copy(TimelineObject* c);
virtual NodePtr copy(Clip* c);
void copy_field_keyframes(NodePtr e);
virtual void load(QXmlStreamReader& stream);