moved visual waveforms to block

This should be nicer, however it has a bug that I need to fix

app/render/previewautocacher.cpp

@@ -185,24 +185,28 @@ 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
-          Track* track = nullptr;
+          ClipBlock* block = nullptr;
 
           for (auto it=copy_map_.cbegin(); it!=copy_map_.cend(); it++) {
-            if (it.value() == waveform_info.track) {
-              track = static_cast<Track*>(it.key());
+            if (it.value() == waveform_info.block) {
+              block = static_cast<ClipBlock*>(it.key());
               break;
             }
           }
 
-          if (track && !valid_ranges.isEmpty()) {
+          if (block && !valid_ranges.isEmpty()) {
             // Generate visual waveform in this background thread
-            track->waveform().set_channel_count(viewer_node_->GetAudioParams().channel_count());
+            block->waveform().set_channel_count(viewer_node_->GetAudioParams().channel_count());
 
-            foreach (const TimeRange& r, valid_ranges) {
-              track->waveform().OverwriteSums(waveform_info.waveform, r.in(), r.in() - waveform_info.range.in(), r.length());
+            // Determine which of the waveform ranges we got intersects with the valid ranges
+            TimeRangeList intersections = valid_ranges.Intersects(waveform_info.range + block->in());
+            foreach (TimeRange r, intersections) {
+              // For each range, adjust it relative to the block and write it
+              r -= block->in();
+              block->waveform().OverwriteSums(waveform_info.waveform, r.in(), r.in(), r.length());
             }
 
-            emit track->PreviewChanged();
+            emit block->PreviewChanged();
           }
         }
       }

app/render/renderprocessor.cpp

@@ -272,8 +272,7 @@ NodeValueTable RenderProcessor::GenerateBlockTable(const Track *track, const Tim
         }
 
         // If this is a clip, we might have extra speed/reverse information
-        ClipBlock *clip_cast = dynamic_cast<ClipBlock*>(b);
-        if (clip_cast) {
+        if (ClipBlock *clip_cast = dynamic_cast<ClipBlock*>(b)) {
           double speed_value = clip_cast->speed();
           bool reversed = clip_cast->reverse();
 
@@ -288,6 +287,20 @@ NodeValueTable RenderProcessor::GenerateBlockTable(const Track *track, const Tim
           if (reversed) {
             samples_from_this_block->reverse();
           }
+
+          // Create block waveforms if requested
+          if (ticket_->property("enablewaveforms").toBool()) {
+            // Generate a visual waveform from the samples acquired from this block
+            AudioVisualWaveform visual_waveform;
+            visual_waveform.set_channel_count(audio_params.channel_count());
+            visual_waveform.OverwriteSamples(samples_from_this_block, audio_params.sample_rate());
+
+            // Format it for use back int eh maint hread
+            RenderedWaveform waveform_info = {clip_cast, visual_waveform, range_for_block - b->in()};
+            QVector<RenderedWaveform> waveform_list = ticket_->property("waveforms").value< QVector<RenderedWaveform> >();
+            waveform_list.append(waveform_info);
+            ticket_->setProperty("waveforms", QVariant::fromValue(waveform_list));
+          }
         }
 
         int copy_length = qMin(max_dest_sz, samples_from_this_block->sample_count());
@@ -301,18 +314,6 @@ NodeValueTable RenderProcessor::GenerateBlockTable(const Track *track, const Tim
       }
     }
 
-    if (ticket_->property("enablewaveforms").toBool()) {
-      // Generate a visual waveform and send it back to the main thread
-      AudioVisualWaveform visual_waveform;
-      visual_waveform.set_channel_count(audio_params.channel_count());
-      visual_waveform.OverwriteSamples(block_range_buffer, audio_params.sample_rate());
-
-      RenderedWaveform waveform_info = {track, visual_waveform, range};
-      QVector<RenderedWaveform> waveform_list = ticket_->property("waveforms").value< QVector<RenderedWaveform> >();
-      waveform_list.append(waveform_info);
-      ticket_->setProperty("waveforms", QVariant::fromValue(waveform_list));
-    }
-
     merged_table.Push(NodeValue::kSamples, QVariant::fromValue(block_range_buffer), track);
 
     return merged_table;

app/render/renderprocessor.h

@@ -21,6 +21,7 @@
 #ifndef RENDERPROCESSOR_H
 #define RENDERPROCESSOR_H
 
+#include "node/block/clip/clip.h"
 #include "node/traverser.h"
 #include "render/renderer.h"
 #include "rendercache.h"
@@ -35,7 +36,7 @@ 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 Track* track;
+    const ClipBlock* block;
     AudioVisualWaveform waveform;
     TimeRange range;
   };