some timeline refactoring, preparing for rewrites

app/render/previewautocacher.cpp

@@ -147,11 +147,11 @@ void PreviewAutoCacher::AudioRendered()
       QVector<RenderProcessor::RenderedWaveform> waveform_list = watcher->GetTicket()->property("waveforms").value< QVector<RenderProcessor::RenderedWaveform> >();
       foreach (const RenderProcessor::RenderedWaveform& waveform_info, waveform_list) {
         // Find original track
-        TrackOutput* track = nullptr;
+        Track* track = nullptr;
 
         for (auto it=copy_map_.cbegin(); it!=copy_map_.cend(); it++) {
           if (it.value() == waveform_info.track) {
-            track = static_cast<TrackOutput*>(it.key());
+            track = static_cast<Track*>(it.key());
             break;
           }
         }

app/render/renderprocessor.cpp

@@ -186,9 +186,9 @@ void RenderProcessor::Process(RenderTicketPtr ticket, Renderer *render_ctx, Stil
   p.Run();
 }
 
-NodeValueTable RenderProcessor::GenerateBlockTable(const TrackOutput *track, const TimeRange &range)
+NodeValueTable RenderProcessor::GenerateBlockTable(const Track *track, const TimeRange &range)
 {
-  if (track->track_type() == Timeline::kTrackTypeAudio) {
+  if (track->track_type() == Track::kAudio) {
 
     const AudioParams& audio_params = ticket_->property("aparam").value<AudioParams>();
 

app/render/renderprocessor.h

@@ -35,13 +35,13 @@ public:
   static void Process(RenderTicketPtr ticket, Renderer* render_ctx, StillImageCache* still_image_cache, DecoderCache* decoder_cache, ShaderCache* shader_cache, QVariant default_shader);
 
   struct RenderedWaveform {
-    const TrackOutput* track;
+    const Track* track;
     AudioVisualWaveform waveform;
     TimeRange range;
   };
 
 protected:
-  virtual NodeValueTable GenerateBlockTable(const TrackOutput *track, const TimeRange &range) override;
+  virtual NodeValueTable GenerateBlockTable(const Track *track, const TimeRange &range) override;
 
   virtual QVariant ProcessVideoFootage(VideoStream* video_stream, const rational &input_time) override;