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
+1 -9
View File
@@ -8,8 +8,6 @@
#include "tracktypes.h"
#include "undo/comboaction.h"
#include "timeline/selection.h"
#include "timelineobject.h"
#include "clip.h"
class Sequence;
class Transition;
@@ -39,7 +37,7 @@ namespace olive {
class TrackList;
class Track : public TimelineObject
class Track : public QObject
{
Q_OBJECT
public:
@@ -70,12 +68,6 @@ public:
Clip* GetClipFromPoint(long point);
bool ContainsClip(Clip* c);
virtual int SequenceWidth() override;
virtual int SequenceHeight() override;
virtual double SequenceFrameRate() override;
virtual long SequencePlayhead() override;
Track* Previous();
Track* Next();
Track* Sibling(int diff);