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

This reverts commit 1b9a963eeb.

ui/effectui.cpp

@@ -43,7 +43,7 @@ EffectUI::EffectUI(Node* e) :
     Transition* t = static_cast<Transition*>(e);
 
     // Since effects can have two clip attachments, find out which one is selected
-    Clip* selected_clip = t->GetParentClip();
+    Clip* selected_clip = t->parent_clip;
     bool both_selected = false;
 
     // Check if this is a shared transition
@@ -54,12 +54,12 @@ EffectUI::EffectUI(Node* e) :
 
         selected_clip = t->secondary_clip;
 
-        if (t->GetParentClip()->IsSelected()) {
+        if (t->parent_clip->IsSelected()) {
           // Both clips are selected
           both_selected = true;
         }
 
-      } else if (!t->GetParentClip()->IsSelected()) {
+      } else if (!t->parent_clip->IsSelected()) {
 
         // Neither are selected, but the naming scheme (no "opening" or "closing" modifier) will be the same
         both_selected = true;
@@ -267,7 +267,7 @@ void EffectUI::UpdateFromEffect()
   }
 }
 
-bool EffectUI::IsAttachedToClip(TimelineObject *c)
+bool EffectUI::IsAttachedToClip(Clip *c)
 {
   if (GetEffect()->parent_clip == c) {
     return true;

ui/effectui.h

@@ -131,7 +131,7 @@ public:
    *
    * True is an Effect from this Clip is already attached to this EffectUI.
    */
-  bool IsAttachedToClip(TimelineObject* c);
+  bool IsAttachedToClip(Clip* c);
 
   void SetNodeParent(NodeUI* parent);
 

ui/timelinearea.cpp

@@ -5,6 +5,8 @@
 #include "panels/timeline.h"
 #include "global/config.h"
 
+int olive::timeline::kTimelineLabelFixedWidth = 200;
+
 TimelineArea::TimelineArea(Timeline* timeline, olive::timeline::Alignment alignment) :
   timeline_(timeline),
   track_list_(nullptr),

ui/viewerwidget.cpp

@@ -344,7 +344,7 @@ void ViewerWidget::move_gizmos(QMouseEvent *event, bool done) {
                        x_movement,
                        y_movement,
                        get_timecode(gizmos->parent_clip,
-                                    gizmos->parent_clip->SequencePlayhead()),
+                                    gizmos->parent_clip->track()->sequence()->playhead),
                        done);
 
     gizmo_x_mvmt += x_movement;