Basics of allowing video parts of FFmpegContent to be disabled (#1355 and others).

5 files changed, 55 insertions, 8 deletions

diff --git a/src/wx/timeline_text_content_view.cc b/src/wx/timeline_text_content_view.cc
index 934bf1fc4..1345ea5e4 100644
--- a/src/wx/timeline_text_content_view.cc
+++ b/src/wx/timeline_text_content_view.cc
@@ -54,7 +54,5 @@ TimelineTextContentView::foreground_colour () const
 bool
 TimelineTextContentView::active () const
 {
-	shared_ptr<Content> c = _content.lock ();
-	DCPOMATIC_ASSERT (c);
 	return _caption->use();
 }
diff --git a/src/wx/timeline_video_content_view.cc b/src/wx/timeline_video_content_view.cc
index 731108c93..db1520190 100644
--- a/src/wx/timeline_video_content_view.cc
+++ b/src/wx/timeline_video_content_view.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,8 +18,9 @@
 
 */
 
-#include "timeline_video_content_view.h"
 #include "lib/image_content.h"
+#include "lib/video_content.h"
+#include "timeline_video_content_view.h"
 
 using boost::dynamic_pointer_cast;
 using boost::shared_ptr;
@@ -33,12 +34,27 @@ TimelineVideoContentView::TimelineVideoContentView (Timeline& tl, shared_ptr<Con
 wxColour
 TimelineVideoContentView::background_colour () const
 {
+	if (!active()) {
+		return wxColour (210, 210, 210, 128);
+	}
+
 	return wxColour (242, 92, 120, 255);
 }
 
 wxColour
 TimelineVideoContentView::foreground_colour () const
 {
+	if (!active()) {
+		return wxColour (180, 180, 180, 128);
+	}
+
 	return wxColour (0, 0, 0, 255);
 }
 
+bool
+TimelineVideoContentView::active () const
+{
+	shared_ptr<Content> c = _content.lock ();
+	DCPOMATIC_ASSERT (c);
+	return c->video && c->video->use();
+}
diff --git a/src/wx/timeline_video_content_view.h b/src/wx/timeline_video_content_view.h
index d53d43f35..c32424d59 100644
--- a/src/wx/timeline_video_content_view.h
+++ b/src/wx/timeline_video_content_view.h
@@ -29,9 +29,7 @@ public:
 	TimelineVideoContentView (Timeline& tl, boost::shared_ptr<Content> c);
 
 private:
-	bool active () const {
-		return true;
-	}
+	bool active () const;
 	wxColour background_colour () const;
 	wxColour foreground_colour () const;
 };
diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 7594d98a5..685424b8c 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -86,6 +86,8 @@ VideoPanel::VideoPanel (ContentPanel* p)
 	font.SetPointSize(font.GetPointSize() - 1);
 	_reference_note->SetFont(font);
 
+	_use = new wxCheckBox (this, wxID_ANY, _("Use"));
+
 	_type_label = create_label (this, _("Type"), true);
 	_frame_type = new ContentChoice<VideoContent, VideoFrameType> (
 		this,
@@ -206,6 +208,7 @@ VideoPanel::VideoPanel (ContentPanel* p)
 	_fade_in->Changed.connect (boost::bind (&VideoPanel::fade_in_changed, this));
 	_fade_out->Changed.connect (boost::bind (&VideoPanel::fade_out_changed, this));
 
+	_use->Bind                           (wxEVT_CHECKBOX, boost::bind (&VideoPanel::use_clicked, this));
 	_reference->Bind                     (wxEVT_CHECKBOX, boost::bind (&VideoPanel::reference_clicked, this));
 	_filters_button->Bind                (wxEVT_BUTTON,   boost::bind (&VideoPanel::edit_filters_clicked, this));
 	_colour_conversion->Bind             (wxEVT_CHOICE,   boost::bind (&VideoPanel::colour_conversion_changed, this));
@@ -233,6 +236,10 @@ VideoPanel::add_to_grid ()
 		++r;
 	}
 
+	_use->Show (full);
+	_grid->Add (_use, wxGBPosition(r, 0), wxGBSpan(1, 2));
+	++r;
+
 	add_label_to_sizer (_grid, _type_label, true, wxGBPosition(r, 0));
 	_frame_type->add (_grid, wxGBPosition(r, 1), wxGBSpan(1, 2));
 	++r;
@@ -385,6 +392,19 @@ VideoPanel::film_content_changed (int property)
 				checked_set (_filters, p);
 			}
 		}
+	} else if (property == VideoContentProperty::USE) {
+		set<bool> check;
+		BOOST_FOREACH (shared_ptr<const Content> i, vc) {
+			check.insert (i->video->use());
+		}
+
+		if (check.size() == 1) {
+			checked_set (_use, vc.front()->video->use());
+		} else {
+			checked_set (_use, false);
+		}
+
+		setup_sensitivity ();
 	} else if (property == VideoContentProperty::FADE_IN) {
 		set<Frame> check;
 		BOOST_FOREACH (shared_ptr<const Content> i, vc) {
@@ -528,6 +548,7 @@ VideoPanel::content_selection_changed ()
 	film_content_changed (VideoContentProperty::FADE_IN);
 	film_content_changed (VideoContentProperty::FADE_OUT);
 	film_content_changed (VideoContentProperty::RANGE);
+	film_content_changed (VideoContentProperty::USE);
 	film_content_changed (FFmpegContentProperty::FILTERS);
 	film_content_changed (DCPContentProperty::REFERENCE_VIDEO);
 
@@ -548,7 +569,11 @@ VideoPanel::setup_sensitivity ()
 	bool const can_reference = dcp && dcp->can_reference_video (_parent->film(), why_not);
 	setup_refer_button (_reference, _reference_note, dcp, can_reference, why_not);
 
-	if (_reference->GetValue ()) {
+	bool const enable = !_reference->GetValue() && _use->GetValue();
+
+	_use->Enable (!_reference->GetValue());
+
+	if (!enable) {
 		_frame_type->wrapped()->Enable (false);
 		_left_crop->wrapped()->Enable (false);
 		_right_crop->wrapped()->Enable (false);
@@ -614,6 +639,14 @@ VideoPanel::fade_out_changed ()
 }
 
 void
+VideoPanel::use_clicked ()
+{
+	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_video()) {
+		i->video->set_use (_use->GetValue());
+	}
+}
+
+void
 VideoPanel::reference_clicked ()
 {
 	ContentList c = _parent->selected ();
diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index b13228d2d..ad0ba402a 100644
--- a/src/wx/video_panel.h
+++ b/src/wx/video_panel.h
@@ -46,6 +46,7 @@ public:
 	void content_selection_changed ();
 
 private:
+	void use_clicked ();
 	void reference_clicked ();
 	void edit_filters_clicked ();
 	void colour_conversion_changed ();
@@ -60,6 +61,7 @@ private:
 
 	wxCheckBox* _reference;
 	wxStaticText* _reference_note;
+	wxCheckBox* _use;
 	wxStaticText* _type_label;
 	ContentChoice<VideoContent, VideoFrameType>* _frame_type;
 	wxStaticText* _left_crop_label;