From 441555e9f2f79248975dde164985b1f9377cdec9 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Mon, 30 Dec 2019 22:22:48 +1100
Subject: [PATCH] fixed bug that wouldn't set a footage stream's `enabled`
 property correctly

---
 app/dialog/footageproperties/footageproperties.cpp | 5 ++---
 app/widget/timelinewidget/timelinewidget.h         | 1 +
 app/widget/timelinewidget/tool/import.cpp          | 3 +--
 app/widget/viewer/footageviewer.cpp                | 1 -
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/dialog/footageproperties/footageproperties.cpp b/app/dialog/footageproperties/footageproperties.cpp
index a43b24b9b..9f9c00573 100644
--- a/app/dialog/footageproperties/footageproperties.cpp
+++ b/app/dialog/footageproperties/footageproperties.cpp
@@ -106,7 +106,7 @@ void FootagePropertiesDialog::accept() {
   for (int i=0;i<footage_->streams().size();i++) {
     bool stream_enabled = (track_list->item(i)->checkState() == Qt::Checked);
 
-    if (footage_->stream(i)->enabled() == stream_enabled) {
+    if (footage_->stream(i)->enabled() != stream_enabled) {
       new StreamEnableChangeCommand(footage_->stream(i),
                                     stream_enabled,
                                     command);
@@ -144,14 +144,13 @@ void FootagePropertiesDialog::FootageChangeCommand::undo()
 FootagePropertiesDialog::StreamEnableChangeCommand::StreamEnableChangeCommand(StreamPtr stream, bool enabled, QUndoCommand *command) :
   QUndoCommand(command),
   stream_(stream),
+  old_enabled_(stream->enabled()),
   new_enabled_(enabled)
 {
 }
 
 void FootagePropertiesDialog::StreamEnableChangeCommand::redo()
 {
-  old_enabled_ = stream_->enabled();
-
   stream_->set_enabled(new_enabled_);
 }
 
diff --git a/app/widget/timelinewidget/timelinewidget.h b/app/widget/timelinewidget/timelinewidget.h
index 020dddbb2..82718eafa 100644
--- a/app/widget/timelinewidget/timelinewidget.h
+++ b/app/widget/timelinewidget/timelinewidget.h
@@ -200,6 +200,7 @@ private:
     virtual void DragMove(TimelineViewMouseEvent *event) override;
     virtual void DragLeave(QDragLeaveEvent *event) override;
     virtual void DragDrop(TimelineViewMouseEvent *event) override;
+
   private:
     int import_pre_buffer_;
   };
diff --git a/app/widget/timelinewidget/tool/import.cpp b/app/widget/timelinewidget/tool/import.cpp
index c4703f4df..07dbe188d 100644
--- a/app/widget/timelinewidget/tool/import.cpp
+++ b/app/widget/timelinewidget/tool/import.cpp
@@ -64,7 +64,6 @@ void TimelineWidget::ImportTool::DragEnter(TimelineViewMouseEvent *event)
 
   // Listen for MIME data from a ProjectViewModel
   if (mime_formats.contains("application/x-oliveprojectitemdata")) {
-    // FIXME: Implement audio insertion
 
     // Data is drag/drop data from a ProjectViewModel
     QByteArray model_data = event->GetMimeData()->data("application/x-oliveprojectitemdata");
@@ -107,7 +106,7 @@ void TimelineWidget::ImportTool::DragEnter(TimelineViewMouseEvent *event)
           TrackType track_type = TrackTypeFromStreamType(stream->type());
 
           // Check if this stream has a compatible TrackList
-          if (track_type == kTrackTypeNone) {
+          if (track_type == kTrackTypeNone || !stream->enabled()) {
             continue;
           }
 
diff --git a/app/widget/viewer/footageviewer.cpp b/app/widget/viewer/footageviewer.cpp
index 7e13c9a92..7cf3450bb 100644
--- a/app/widget/viewer/footageviewer.cpp
+++ b/app/widget/viewer/footageviewer.cpp
@@ -49,7 +49,6 @@ void FootageViewerWidget::SetFootage(Footage *footage)
 
     if (audio_stream) {
       audio_node_->SetFootage(audio_stream);
-      qDebug() << "Audio stream channel layout:" << audio_stream->channel_layout();
       viewer_node_->set_audio_params(AudioParams(audio_stream->sample_rate(), audio_stream->channel_layout()));
     }