Merge branch 'master' into nodeview-redux

app/widget/timelinewidget/timelineundo.h

@@ -1370,6 +1370,8 @@ public:
 
     Track* track = timeline_->GetTrackAt(track_index_);
 
+    track->BeginOperation();
+
     bool append = (in_ >= track->track_length());
 
     // Check if the placement location is past the end of the timeline
@@ -1409,6 +1411,12 @@ public:
       }
     }
 
+    track->EndOperation();
+
+    if (ripple_remove_command_) {
+      track->Node::InvalidateCache(TimeRange(insert_->in(), insert_->out()), Track::kBlockInput);
+    }
+
     for (int i=0; i<position_commands_.size(); i++) {
       position_commands_.at(i)->redo();
     }
@@ -1422,7 +1430,10 @@ public:
 
     Track* t = timeline_->GetTrackAt(track_index_);
 
+    TimeRange insert_range(insert_->in(), insert_->out());
+
     // Firstly, remove our insert
+    t->BeginOperation();
     t->RippleRemoveBlock(insert_);
 
     if (ripple_remove_command_) {
@@ -1432,6 +1443,11 @@ public:
       t->RippleRemoveBlock(gap_);
       gap_->setParent(&memory_manager_);
     }
+    t->EndOperation();
+
+    if (ripple_remove_command_) {
+      t->Node::InvalidateCache(insert_range, Track::kBlockInput);
+    }
 
     // Remove tracks if we added them
     for (int i=add_track_commands_.size()-1; i>=0; i--) {

app/widget/timelinewidget/tool/import.cpp

@@ -87,7 +87,11 @@ void ImportTool::DragEnter(TimelineViewMouseEvent *event)
     PrepGhosts(drag_start_.GetFrame() - parent()->SceneToTime(import_pre_buffer_),
                drag_start_.GetTrack().index());
 
-    event->accept();
+    if (parent()->HasGhosts() || !parent()->GetConnectedNode()) {
+      event->accept();
+    } else {
+      event->ignore();
+    }
   } else {
     // FIXME: Implement dropping from file
     event->ignore();

app/widget/viewer/audiowaveformview.cpp

@@ -60,8 +60,7 @@ void AudioWaveformView::SetViewer(AudioPlaybackCache *playback)
     pool_.clear();
     pool_.waitForDone();
 
-    disconnect(playback_, &AudioPlaybackCache::Validated, this, &AudioWaveformView::RenderRange);
-    //disconnect(playback_, &AudioPlaybackCache::ParametersChanged, this, &AudioWaveformView::RenderRange);
+    disconnect(playback_, &AudioPlaybackCache::Validated, this, static_cast<void(AudioWaveformView::*)()>(&AudioWaveformView::update));
 
     SetTimebase(0);
   }
@@ -69,14 +68,9 @@ void AudioWaveformView::SetViewer(AudioPlaybackCache *playback)
   playback_ = playback;
 
   if (playback_) {
-    connect(playback_, &AudioPlaybackCache::Validated, this, &AudioWaveformView::RenderRange);
-    //connect(playback_, &AudioPlaybackCache::ParametersChanged, this, &AudioWaveformView::RenderRange);
+    connect(playback_, &AudioPlaybackCache::Validated, this, static_cast<void(AudioWaveformView::*)()>(&AudioWaveformView::update));
 
     SetTimebase(playback_->GetParameters().sample_rate_as_time_base());
-
-    waveform_.set_channel_count(playback_->GetParameters().channel_count());
-
-    RenderRange(TimeRange(0, playback_->GetLength()));
   }
 }
 
@@ -101,7 +95,7 @@ void AudioWaveformView::paintEvent(QPaintEvent *event)
 
   // Draw waveform
   p.setPen(QColor(64, 255, 160)); // FIXME: Hardcoded color
-  AudioVisualWaveform::DrawWaveform(&p, rect(), GetScale(), waveform_, SceneToTime(GetScroll()));
+  AudioVisualWaveform::DrawWaveform(&p, rect(), GetScale(), playback_->visual(), SceneToTime(GetScroll()));
 
   // Draw playhead
   p.setPen(PLAYHEAD_COLOR);
@@ -110,42 +104,4 @@ void AudioWaveformView::paintEvent(QPaintEvent *event)
   p.drawLine(playhead_x, 0, playhead_x, height());
 }
 
-void AudioWaveformView::RenderRange(TimeRange range)
-{
-  // Limit range to length
-  range = TimeRange(qMax(rational(0), range.in()), qMin(playback_->GetLength(), range.out()));
-
-  // Floor to second increments
-  int64_t start = qFloor(range.in().toDouble());
-  int64_t end = qCeil(range.out().toDouble());
-
-  for (; start!=end; start++) {
-    TimeRange this_range(start, start+1);
-
-    QFutureWatcher<AudioVisualWaveform>* watcher = new QFutureWatcher<AudioVisualWaveform>();
-    connect(watcher, &QFutureWatcher<AudioVisualWaveform>::finished, this, &AudioWaveformView::BackgroundFinished);
-
-    jobs_.insert(this_range, watcher);
-
-    watcher->setFuture(QtConcurrent::run(&pool_, GenerateWaveform, playback_->CreatePlaybackDevice(), playback_->GetParameters(), this_range));
-  }
-}
-
-void AudioWaveformView::BackgroundFinished()
-{
-  QFutureWatcher<AudioVisualWaveform>* watcher = static_cast<QFutureWatcher<AudioVisualWaveform>*>(sender());
-
-  for (auto it=jobs_.begin(); it!=jobs_.end(); it++) {
-    if (it.value() == watcher) {
-      AudioVisualWaveform rendered = watcher->result();
-      waveform_.OverwriteSums(rendered, it.key().in());
-      jobs_.erase(it);
-      update();
-      break;
-    }
-  }
-
-  delete watcher;
-}
-
 }

app/widget/viewer/audiowaveformview.h

@@ -24,7 +24,6 @@
 #include <QtConcurrent/QtConcurrent>
 #include <QWidget>
 
-#include "audio/audiovisualwaveform.h"
 #include "render/audioparams.h"
 #include "render/audioplaybackcache.h"
 #include "widget/timeruler/seekablewidget.h"
@@ -37,32 +36,16 @@ class AudioWaveformView : public SeekableWidget
 public:
   AudioWaveformView(QWidget* parent = nullptr);
 
-  //void SetData(const QString& file, const AudioRenderingParams& params);
-
   void SetViewer(AudioPlaybackCache *playback);
 
-  const AudioVisualWaveform* waveform() const
-  {
-    return &waveform_;
-  }
-
 protected:
   virtual void paintEvent(QPaintEvent* event) override;
 
 private:
-  void RenderRange(TimeRange range);
-
   QThreadPool pool_;
 
   AudioPlaybackCache *playback_;
 
-  AudioVisualWaveform waveform_;
-
-  QHash<TimeRange, QFutureWatcher<AudioVisualWaveform>*> jobs_;
-
-private slots:
-  void BackgroundFinished();
-
 };
 
 }

app/widget/viewer/viewer.cpp

@@ -455,7 +455,7 @@ void ViewerWidget::StartAudioOutput()
     AudioManager::instance()->StartOutput(audio_cache,
                                           audio_cache->GetParameters().time_to_bytes(GetTime()),
                                           playback_speed_);
-    emit AudioManager::instance()->OutputWaveformStarted(waveform_view_->waveform(),
+    emit AudioManager::instance()->OutputWaveformStarted(&audio_cache->visual(),
                                                          GetTime(), playback_speed_);
   }
 }