Move keep-video-in-sequence button into the timeline dialogue.

1 files changed, 2 insertions, 19 deletions

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index e73b27267..275a7ab81 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -255,7 +255,6 @@ FilmEditor::connect_to_widgets ()
 	_audio_channels->Bind	(wxEVT_COMMAND_SPINCTRL_UPDATED,      boost::bind (&FilmEditor::audio_channels_changed, this));
 	_j2k_bandwidth->Bind	(wxEVT_COMMAND_SPINCTRL_UPDATED,      boost::bind (&FilmEditor::j2k_bandwidth_changed, this));
 	_resolution->Bind       (wxEVT_COMMAND_CHOICE_SELECTED,       boost::bind (&FilmEditor::resolution_changed, this));
-	_sequence_video->Bind   (wxEVT_COMMAND_CHECKBOX_CLICKED,      boost::bind (&FilmEditor::sequence_video_changed, this));
 	_three_d->Bind	 	(wxEVT_COMMAND_CHECKBOX_CLICKED,      boost::bind (&FilmEditor::three_d_changed, this));
 	_standard->Bind         (wxEVT_COMMAND_CHOICE_SELECTED,       boost::bind (&FilmEditor::standard_changed, this));
 }
@@ -295,9 +294,6 @@ FilmEditor::make_content_panel ()
 		_content_sizer->Add (s, 0, wxEXPAND | wxALL, 6);
 	}
 
-	_sequence_video = new wxCheckBox (_content_panel, wxID_ANY, _("Keep video in sequence"));
-	_content_sizer->Add (_sequence_video);
-
 	_content_notebook = new wxNotebook (_content_panel, wxID_ANY);
 	_content_sizer->Add (_content_notebook, 1, wxEXPAND | wxTOP, 6);
 
@@ -503,9 +499,6 @@ FilmEditor::film_changed (Film::Property p)
 		checked_set (_audio_channels, _film->audio_channels ());
 		setup_dcp_name ();
 		break;
-	case Film::SEQUENCE_VIDEO:
-		checked_set (_sequence_video, _film->sequence_video ());
-		break;
 	case Film::THREE_D:
 		checked_set (_three_d, _film->three_d ());
 		setup_dcp_name ();
@@ -513,6 +506,8 @@ FilmEditor::film_changed (Film::Property p)
 	case Film::INTEROP:
 		checked_set (_standard, _film->interop() ? 1 : 0);
 		break;
+	default:
+		break;
 	}
 }
 
@@ -630,7 +625,6 @@ FilmEditor::set_film (shared_ptr<Film> f)
 	film_changed (Film::ISDCF_METADATA);
 	film_changed (Film::VIDEO_FRAME_RATE);
 	film_changed (Film::AUDIO_CHANNELS);
-	film_changed (Film::SEQUENCE_VIDEO);
 	film_changed (Film::THREE_D);
 	film_changed (Film::INTEROP);
 
@@ -672,7 +666,6 @@ FilmEditor::set_general_sensitivity (bool s)
 	_j2k_bandwidth->Enable (s);
 	_container->Enable (s);
 	_best_frame_rate->Enable (s && _film && _film->best_video_frame_rate () != _film->video_frame_rate ());
-	_sequence_video->Enable (s);
 	_resolution->Enable (s);
 	_scaler->Enable (s);
 	_three_d->Enable (s);
@@ -1013,16 +1006,6 @@ FilmEditor::set_selection (weak_ptr<Content> wc)
 }
 
 void
-FilmEditor::sequence_video_changed ()
-{
-	if (!_film) {
-		return;
-	}
-	
-	_film->set_sequence_video (_sequence_video->GetValue ());
-}
-
-void
 FilmEditor::content_right_click (wxListEvent& ev)
 {
 	_menu.popup (_film, selected_content (), ev.GetPoint ());