Separate Controls into standard/swaroop.

1 files changed, 9 insertions, 248 deletions

diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index cc9817b15..9fcdbd645 100644
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -52,25 +52,18 @@ using boost::dynamic_pointer_cast;
 
 Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor_controls)
 	: wxPanel (parent)
+	, _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096))
 	, _viewer (viewer)
 	, _slider_being_moved (false)
 	, _was_running_before_slider (false)
 	, _outline_content (0)
 	, _eye (0)
 	, _jump_to_selected (0)
-	, _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096))
 	, _rewind_button (new wxButton (this, wxID_ANY, wxT("|<")))
 	, _back_button (new wxButton (this, wxID_ANY, wxT("<")))
 	, _forward_button (new wxButton (this, wxID_ANY, wxT(">")))
 	, _frame_number (new wxStaticText (this, wxID_ANY, wxT("")))
 	, _timecode (new wxStaticText (this, wxID_ANY, wxT("")))
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	, _play_button (new wxButton(this, wxID_ANY, _("Play")))
-	, _pause_button (new wxButton(this, wxID_ANY, _("Pause")))
-	, _stop_button (new wxButton(this, wxID_ANY, _("Stop")))
-#else
-	, _play_button (new wxToggleButton(this, wxID_ANY, _("Play")))
-#endif
 {
 	_v_sizer = new wxBoxSizer (wxVERTICAL);
 	SetSizer (_v_sizer);
@@ -90,33 +83,6 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor
 
 	_v_sizer->Add (view_options, 0, wxALL, DCPOMATIC_SIZER_GAP);
 
-	wxBoxSizer* left_sizer = new wxBoxSizer (wxVERTICAL);
-
-	_spl_view = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER);
-	_spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 740);
-	left_sizer->Add (_spl_view, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
-
-	_content_view = new ContentView (this, _film);
-	left_sizer->Add (_content_view, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
-
-	wxBoxSizer* e_sizer = new wxBoxSizer (wxHORIZONTAL);
-	e_sizer->Add (left_sizer, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
-
-	_current_spl_view = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER);
-	_current_spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 500);
-	_current_spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 80);
-	e_sizer->Add (_current_spl_view, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
-
-	_v_sizer->Add (e_sizer, 1, wxEXPAND);
-
-	_log = new wxTextCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, 200), wxTE_READONLY | wxTE_MULTILINE);
-	_v_sizer->Add (_log, 0, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
-
-	_content_view->Show (false);
-	_spl_view->Show (false);
-	_current_spl_view->Show (false);
-	_log->Show (false);
-
 	wxBoxSizer* h_sizer = new wxBoxSizer (wxHORIZONTAL);
 
 	wxBoxSizer* time_sizer = new wxBoxSizer (wxVERTICAL);
@@ -127,11 +93,10 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor
 	h_sizer->Add (_back_button, 0, wxALL, 2);
 	h_sizer->Add (time_sizer, 0, wxEXPAND);
 	h_sizer->Add (_forward_button, 0, wxALL, 2);
-	h_sizer->Add (_play_button, 0, wxEXPAND);
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	h_sizer->Add (_pause_button, 0, wxEXPAND);
-	h_sizer->Add (_stop_button, 0, wxEXPAND);
-#endif
+
+	_button_sizer = new wxBoxSizer (wxHORIZONTAL);
+	h_sizer->Add (_button_sizer, 0, wxEXPAND);
+
 	h_sizer->Add (_slider, 1, wxEXPAND);
 
 	_v_sizer->Add (h_sizer, 0, wxEXPAND | wxALL, 6);
@@ -152,13 +117,6 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor
 	_slider->Bind           (wxEVT_SCROLL_PAGEUP,        boost::bind(&Controls::slider_moved,    this, true));
 	_slider->Bind           (wxEVT_SCROLL_PAGEDOWN,      boost::bind(&Controls::slider_moved,    this, true));
 	_slider->Bind           (wxEVT_SCROLL_CHANGED,       boost::bind(&Controls::slider_released, this));
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	_play_button->Bind      (wxEVT_BUTTON,               boost::bind(&Controls::play_clicked,    this));
-	_pause_button->Bind     (wxEVT_BUTTON,               boost::bind(&Controls::pause_clicked,   this));
-	_stop_button->Bind      (wxEVT_BUTTON,               boost::bind(&Controls::stop_clicked,    this));
-#else
-	_play_button->Bind      (wxEVT_TOGGLEBUTTON,         boost::bind(&Controls::play_clicked,    this));
-#endif
 	_rewind_button->Bind    (wxEVT_LEFT_DOWN,            boost::bind(&Controls::rewind_clicked,  this, _1));
 	_back_button->Bind      (wxEVT_LEFT_DOWN,            boost::bind(&Controls::back_clicked,    this, _1));
 	_forward_button->Bind   (wxEVT_LEFT_DOWN,            boost::bind(&Controls::forward_clicked, this, _1));
@@ -168,19 +126,14 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor
 		_jump_to_selected->Bind (wxEVT_CHECKBOX, boost::bind (&Controls::jump_to_selected_clicked, this));
 		_jump_to_selected->SetValue (Config::instance()->jump_to_selected ());
 	}
-	_spl_view->Bind         (wxEVT_LIST_ITEM_SELECTED,   boost::bind(&Controls::spl_selection_changed, this));
-	_spl_view->Bind         (wxEVT_LIST_ITEM_DESELECTED, boost::bind(&Controls::spl_selection_changed, this));
 
 	_viewer->PositionChanged.connect (boost::bind(&Controls::position_changed, this));
 	_viewer->Started.connect (boost::bind(&Controls::started, this));
 	_viewer->Stopped.connect (boost::bind(&Controls::stopped, this));
-	_viewer->FilmChanged.connect (boost::bind(&Controls::film_changed, this));
-	_viewer->ImageChanged.connect (boost::bind(&Controls::image_changed, this, _1));
 
-	film_changed ();
+	set_film (_viewer->film());
 
 	setup_sensitivity ();
-	update_playlist_directory ();
 
 	JobManager::instance()->ActiveJobsChanged.connect (
 		bind (&Controls::active_jobs_changed, this, _2)
@@ -191,63 +144,20 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor
 }
 
 void
-Controls::spl_selection_changed ()
+Controls::config_changed (int)
 {
-	long int selected = _spl_view->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-	if (selected == -1) {
-		_current_spl_view->DeleteAllItems ();
-		return;
-	}
-
-	shared_ptr<Film> film (new Film(optional<boost::filesystem::path>()));
-
-	int N = 0;
-	BOOST_FOREACH (SPLEntry i, _playlists[selected].get()) {
-		wxListItem it;
-		it.SetId (N);
-		it.SetColumn (0);
-		it.SetText (std_to_wx(i.name));
-		_current_spl_view->InsertItem (it);
-		film->add_content (i.content);
-		++N;
-	}
-
-	_viewer->set_film (film);
-}
-
-void
-Controls::config_changed (int property)
-{
-	if (property == Config::PLAYER_CONTENT_DIRECTORY) {
-		_content_view->update ();
-	} else if (property == Config::PLAYER_PLAYLIST_DIRECTORY) {
-		update_playlist_directory ();
-	} else {
-		setup_sensitivity ();
-	}
+	setup_sensitivity ();
 }
 
 void
 Controls::started ()
 {
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	_play_button->Enable (false);
-	_pause_button->Enable (true);
-#else
-	_play_button->SetValue (true);
-#endif
 	setup_sensitivity ();
 }
 
 void
 Controls::stopped ()
 {
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	_play_button->Enable (true);
-	_pause_button->Enable (false);
-#else
-	_play_button->SetValue (false);
-#endif
 	setup_sensitivity ();
 }
 
@@ -307,33 +217,6 @@ Controls::slider_released ()
 }
 
 void
-Controls::play_clicked ()
-{
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	_viewer->start ();
-#else
-	check_play_state ();
-#endif
-}
-
-
-#ifndef DCPOMATIC_VARIANT_SWAROOP
-void
-Controls::check_play_state ()
-{
-	if (!_film || _film->video_frame_rate() == 0) {
-		return;
-	}
-
-	if (_play_button->GetValue()) {
-		_viewer->start ();
-	} else {
-		_viewer->stop ();
-	}
-}
-#endif
-
-void
 Controls::update_position_slider ()
 {
 	if (!_film) {
@@ -431,14 +314,6 @@ Controls::setup_sensitivity ()
 	_rewind_button->Enable (c);
 	_back_button->Enable (c);
 	_forward_button->Enable (c);
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	_play_button->Enable (c && !_viewer->playing());
-	_pause_button->Enable (c && (!_current_kind || _current_kind != dcp::ADVERTISEMENT) && _viewer->playing());
-	_stop_button->Enable (c && (!_current_kind || _current_kind != dcp::ADVERTISEMENT));
-	_slider->Enable (c && (!_current_kind || _current_kind != dcp::ADVERTISEMENT));
-#else
-	_play_button->Enable (c);
-#endif
 	if (_outline_content) {
 		_outline_content->Enable (c);
 	}
@@ -480,10 +355,8 @@ Controls::jump_to_selected_clicked ()
 }
 
 void
-Controls::film_changed ()
+Controls::set_film (shared_ptr<Film> film)
 {
-	shared_ptr<Film> film = _viewer->film ();
-
 	if (_film == film) {
 		return;
 	}
@@ -494,9 +367,6 @@ Controls::film_changed ()
 
 	update_position_slider ();
 	update_position_label ();
-
-	_content_view->set_film (film);
-	_content_view->update ();
 }
 
 shared_ptr<Film>
@@ -504,112 +374,3 @@ Controls::film () const
 {
 	return _film;
 }
-
-void
-Controls::show_extended_player_controls (bool s)
-{
-	_content_view->Show (s);
-	_spl_view->Show (s);
-	if (s) {
-		_content_view->update ();
-		update_playlist_directory ();
-	}
-	_current_spl_view->Show (s);
-	_log->Show (s);
-	_v_sizer->Layout ();
-}
-
-void
-Controls::add_playlist_to_list (SPL spl)
-{
-	int const N = _spl_view->GetItemCount();
-
-	wxListItem it;
-	it.SetId(N);
-	it.SetColumn(0);
-	it.SetText (std_to_wx(spl.name()));
-	_spl_view->InsertItem (it);
-}
-
-void
-Controls::update_playlist_directory ()
-{
-	if (!_spl_view->IsShown()) {
-		return;
-	}
-
-	using namespace boost::filesystem;
-
-	_spl_view->DeleteAllItems ();
-	optional<path> dir = Config::instance()->player_playlist_directory();
-	if (!dir) {
-		return;
-	}
-
-	for (directory_iterator i = directory_iterator(*dir); i != directory_iterator(); ++i) {
-		try {
-			if (is_regular_file(i->path()) && i->path().extension() == ".xml") {
-				SPL spl;
-				spl.read (i->path(), _content_view);
-				_playlists.push_back (spl);
-				add_playlist_to_list (spl);
-			}
-		} catch (exception& e) {
-			/* Never mind */
-		}
-	}
-}
-
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-void
-Controls::pause_clicked ()
-{
-	_viewer->stop ();
-}
-
-void
-Controls::stop_clicked ()
-{
-	_viewer->stop ();
-	_viewer->seek (DCPTime(), true);
-}
-#endif
-
-void
-Controls::log (wxString s)
-{
-	struct timeval time;
-	gettimeofday (&time, 0);
-	char buffer[64];
-	time_t const sec = time.tv_sec;
-	struct tm* t = localtime (&sec);
-	strftime (buffer, 64, "%c", t);
-	wxString ts = std_to_wx(string(buffer)) + N_(": ");
-	_log->SetValue(_log->GetValue() + ts + s + "\n");
-}
-
-void
-Controls::image_changed (boost::weak_ptr<PlayerVideo> weak_pv)
-{
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	shared_ptr<PlayerVideo> pv = weak_pv.lock ();
-	if (!pv) {
-		return;
-	}
-
-	shared_ptr<Content> c = pv->content().lock();
-	if (!c) {
-		return;
-	}
-
-	shared_ptr<DCPContent> dc = dynamic_pointer_cast<DCPContent> (c);
-	if (!dc) {
-		return;
-	}
-
-	if (!_current_kind || *_current_kind != dc->content_kind()) {
-		_current_kind = dc->content_kind ();
-		setup_sensitivity ();
-	}
-#endif
-}