Merge branch 'master' into hashremoval

app/widget/nodeparamview/nodeparamviewitem.cpp

@@ -83,7 +83,10 @@ void NodeParamViewItem::Retranslate()
 
 void NodeParamViewItem::RecreateBody()
 {
-  delete body_;
+  if (body_) {
+    body_->setParent(nullptr);
+    body_->deleteLater();
+  }
 
   body_ = new NodeParamViewItemBody(node_, create_checkboxes_);
   connect(body_, &NodeParamViewItemBody::RequestSelectNode, this, &NodeParamViewItem::RequestSelectNode);

app/widget/viewer/viewer.cpp

@@ -68,7 +68,8 @@ ViewerWidget::ViewerWidget(QWidget *parent) :
   prequeuing_video_(false),
   prequeuing_audio_(0),
   record_armed_(false),
-  recording_(false)
+  recording_(false),
+  enable_audio_scrubbing_(true)
 {
   // Set up main layout
   QVBoxLayout* layout = new QVBoxLayout(this);
@@ -834,7 +835,7 @@ void ViewerWidget::PauseInternal()
 
 void ViewerWidget::PushScrubbedAudio()
 {
-  if (!IsPlaying() && GetConnectedNode() && OLIVE_CONFIG("AudioScrubbing").toBool()) {
+  if (!IsPlaying() && GetConnectedNode() && OLIVE_CONFIG("AudioScrubbing").toBool() && enable_audio_scrubbing_) {
     // Get audio src device from renderer
     const AudioParams& params = GetConnectedNode()->audio_playback_cache()->GetParameters();
 

app/widget/viewer/viewer.h

@@ -89,6 +89,11 @@ public:
 
   void StartCapture(TimelineWidget *source, const TimeRange &time, const Track::Reference &track);
 
+  void SetAudioScrubbingEnabled(bool e)
+  {
+    enable_audio_scrubbing_ = e;
+  }
+
 public slots:
   void Play(bool in_to_out_only);
 
@@ -276,6 +281,8 @@ private:
 
   qint64 queue_starved_start_;
 
+  bool enable_audio_scrubbing_;
+
 private slots:
   void PlaybackTimerUpdate();