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

This reverts commit 1b9a963eeb.

effects/internal/richtexteffect.cpp

@@ -143,8 +143,8 @@ void RichTextEffect::redraw(double timecode)
   double scroll_progress = 0;
 
   if (auto_scroll_dir != SCROLL_OFF) {
-    double clip_length_secs = double(parent_clip->length()) / parent_clip->MediaFrameRate();
-    scroll_progress = (timecode - double(parent_clip->clip_in()) / parent_clip->MediaFrameRate()) / clip_length_secs;
+    double clip_length_secs = double(parent_clip->length()) / parent_clip->media_frame_rate();
+    scroll_progress = (timecode - double(parent_clip->clip_in()) / parent_clip->media_frame_rate()) / clip_length_secs;
   }
 
   if (auto_scroll_dir == SCROLL_OFF || auto_scroll_dir == SCROLL_LEFT || auto_scroll_dir == SCROLL_RIGHT) {

effects/internal/shakeeffect.cpp

@@ -28,6 +28,7 @@
 #include "ui/labelslider.h"
 #include "ui/collapsiblewidget.h"
 #include "timeline/clip.h"
+#include "timeline/sequence.h"
 #include "panels/timeline.h"
 #include "global/debug.h"
 

effects/internal/solideffect.cpp

@@ -28,6 +28,7 @@
 #include <QComboBox>
 
 #include "timeline/clip.h"
+#include "timeline/sequence.h"
 
 const int SMPTE_BARS = 7;
 const int SMPTE_STRIP_COUNT = 3;

effects/internal/texteffect.cpp

@@ -36,6 +36,7 @@
 #include "ui/labelslider.h"
 #include "ui/collapsiblewidget.h"
 #include "timeline/clip.h"
+#include "timeline/sequence.h"
 #include "ui/comboboxex.h"
 #include "ui/colorbutton.h"
 #include "ui/blur.h"

effects/internal/timecodeeffect.cpp

@@ -118,7 +118,7 @@ void TimecodeEffect::redraw(double timecode) {
                                                                                olive::config.timecode_view,
                                                                                sequence->frame_rate);
   } else {
-    double media_rate = parent_clip->MediaFrameRate();
+    double media_rate = parent_clip->media_frame_rate();
     display_timecode = prepend_text->GetStringAt(timecode) + frame_to_timecode(qRound(timecode * media_rate),
                                                                                olive::config.timecode_view,
                                                                                media_rate);

effects/internal/toneeffect.cpp

@@ -25,7 +25,7 @@
 #define TONE_TYPE_SINE 0
 
 #include "timeline/clip.h"
-#include "rendering/audio.h"
+#include "timeline/sequence.h"
 
 ToneEffect::ToneEffect(Clip* c) : Node(c), sinX(INT_MIN) {
   type_val = new ComboInput(this, "type", tr("Type"));
@@ -90,7 +90,7 @@ void ToneEffect::process_audio(double timecode_start,
 
     double timecode = timecode_start+(interval*i);
     float tone_sample = qSin((2*M_PI*sinX*freq_val->GetDoubleAt(timecode))
-                                           /current_audio_freq())
+                                           /parent_clip->track()->sequence()->audio_frequency)
                                       *log_volume(amount_val->GetDoubleAt(timecode)*0.01);
 
     for (int j=0;j<channel_count;j++) {