X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontrols.cc;h=700769a50c7543cdaee030223128facda4541323;hb=8eaf36467713e7ba9a1a2272a44aa1581e31c1b0;hp=b173b43ff6c68ac6bc9817414a7cb55baf112eb5;hpb=d7df8d5dd66834e34cd61b425ed80fe21a7ff755;p=dcpomatic.git

diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index b173b43ff..700769a50 100644
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "controls.h"
 #include "film_viewer.h"
 #include "wx_util.h"
@@ -43,35 +44,41 @@
 #include <wx/listctrl.h>
 #include <wx/progdlg.h>
 
+
 using std::string;
 using std::list;
 using std::cout;
 using std::make_pair;
 using std::exception;
 using boost::optional;
-using boost::shared_ptr;
-using boost::weak_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::weak_ptr;
+using std::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using namespace dcpomatic;
 
+
 Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor_controls)
 	: wxPanel (parent)
-	, _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096))
+	, _slider (new wxSlider(this, wxID_ANY, 0, 0, 4096))
 	, _viewer (viewer)
 	, _slider_being_moved (false)
 	, _outline_content (0)
 	, _eye (0)
 	, _jump_to_selected (0)
-	, _rewind_button (new Button (this, wxT("|<")))
-	, _back_button (new Button (this, wxT("<")))
-	, _forward_button (new Button (this, wxT(">")))
-	, _frame_number (new StaticText (this, wxT("")))
-	, _timecode (new StaticText (this, wxT("")))
+	, _rewind_button (new Button(this, wxT("|<")))
+	, _back_button (new Button(this, wxT("<")))
+	, _forward_button (new Button(this, wxT(">")))
+	, _frame_number (new StaticText(this, wxT("")))
+	, _timecode (new StaticText(this, wxT("")))
+	, _timer (this)
 {
 	_v_sizer = new wxBoxSizer (wxVERTICAL);
 	SetSizer (_v_sizer);
 
-	wxBoxSizer* view_options = new wxBoxSizer (wxHORIZONTAL);
+	auto view_options = new wxBoxSizer (wxHORIZONTAL);
 	if (editor_controls) {
 		_outline_content = new CheckBox (this, _("Outline content"));
 		view_options->Add (_outline_content, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
@@ -86,16 +93,16 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor
 
 	_v_sizer->Add (view_options, 0, wxALL, DCPOMATIC_SIZER_GAP);
 
-	wxBoxSizer* h_sizer = new wxBoxSizer (wxHORIZONTAL);
+	auto h_sizer = new wxBoxSizer (wxHORIZONTAL);
 
-	wxBoxSizer* time_sizer = new wxBoxSizer (wxVERTICAL);
+	auto time_sizer = new wxBoxSizer (wxVERTICAL);
 	time_sizer->Add (_frame_number, 0, wxEXPAND);
 	time_sizer->Add (_timecode, 0, wxEXPAND);
 
-	h_sizer->Add (_rewind_button, 0, wxALL, 2);
+	h_sizer->Add (_rewind_button, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2);
 	h_sizer->Add (time_sizer, 0, wxEXPAND);
-	h_sizer->Add (_back_button, 0, wxALL, 2);
-	h_sizer->Add (_forward_button, 0, wxALL, 2);
+	h_sizer->Add (_back_button, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2);
+	h_sizer->Add (_forward_button, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2);
 
 	_button_sizer = new wxBoxSizer (wxHORIZONTAL);
 	h_sizer->Add (_button_sizer, 0, wxEXPAND);
@@ -104,10 +111,17 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor
 
 	_v_sizer->Add (h_sizer, 0, wxEXPAND | wxALL, 6);
 
+#ifdef __WXGTK3__
+	_frame_number->SetMinSize (wxSize(100, -1));
+	_rewind_button->SetMinSize (wxSize(48, -1));
+	_back_button->SetMinSize (wxSize(48, -1));
+	_forward_button->SetMinSize (wxSize(48, -1));
+#else
 	_frame_number->SetMinSize (wxSize (84, -1));
 	_rewind_button->SetMinSize (wxSize (32, -1));
 	_back_button->SetMinSize (wxSize (32, -1));
 	_forward_button->SetMinSize (wxSize (32, -1));
+#endif
 
 	if (_eye) {
 		_eye->Bind (wxEVT_CHOICE, boost::bind (&Controls::eye_changed, this));
@@ -119,14 +133,7 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor
 	_slider->Bind           (wxEVT_SCROLL_THUMBTRACK,    boost::bind(&Controls::slider_moved,    this, false));
 	_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_OSX
-	/* _CHANGED is not received on OS X (at least, not when the
-	   slider is dragged), so use this instead.  Perhaps all
-	   platforms could just use _THUMBRELEASE.
-	*/
 	_slider->Bind           (wxEVT_SCROLL_THUMBRELEASE,  boost::bind(&Controls::slider_released, 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));
@@ -137,10 +144,12 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor
 		_jump_to_selected->SetValue (Config::instance()->jump_to_selected ());
 	}
 
-	_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));
 
+	Bind (wxEVT_TIMER, boost::bind(&Controls::update_position, this));
+	_timer.Start (80, wxTIMER_CONTINUOUS);
+
 	set_film (_viewer->film());
 
 	setup_sensitivity ();
@@ -159,39 +168,45 @@ Controls::config_changed (int)
 	setup_sensitivity ();
 }
 
+
 void
 Controls::started ()
 {
 	setup_sensitivity ();
 }
 
+
 void
 Controls::stopped ()
 {
 	setup_sensitivity ();
 }
 
+
 void
-Controls::position_changed ()
+Controls::update_position ()
 {
-	if (!_slider_being_moved) {
+	if (!_slider_being_moved && !_viewer->pending_idle_get()) {
 		update_position_label ();
 		update_position_slider ();
 	}
 }
 
+
 void
 Controls::eye_changed ()
 {
-	_viewer->set_eyes (_eye->GetSelection() == 0 ? EYES_LEFT : EYES_RIGHT);
+	_viewer->set_eyes (_eye->GetSelection() == 0 ? Eyes::LEFT : Eyes::RIGHT);
 }
 
+
 void
 Controls::outline_content_changed ()
 {
 	_viewer->set_outline_content (_outline_content->GetValue());
 }
 
+
 /** @param page true if this was a PAGEUP/PAGEDOWN event for which we won't receive a THUMBRELEASE */
 void
 Controls::slider_moved (bool page)
@@ -226,6 +241,7 @@ Controls::slider_moved (bool page)
 		);
 }
 
+
 void
 Controls::slider_released ()
 {
@@ -234,6 +250,7 @@ Controls::slider_released ()
 	_slider_being_moved = false;
 }
 
+
 void
 Controls::update_position_slider ()
 {
@@ -242,7 +259,7 @@ Controls::update_position_slider ()
 		return;
 	}
 
-	DCPTime const len = _film->length ();
+	auto const len = _film->length ();
 
 	if (len.get ()) {
 		int const new_slider_position = 4096 * _viewer->position().get() / len.get();
@@ -252,21 +269,23 @@ Controls::update_position_slider ()
 	}
 }
 
+
 void
 Controls::update_position_label ()
 {
 	if (!_film) {
-		_frame_number->SetLabel ("0");
-		_timecode->SetLabel ("0:0:0.0");
+		checked_set (_frame_number, wxT("0"));
+		checked_set (_timecode, wxT("0:0:0.0"));
 		return;
 	}
 
 	double const fps = _film->video_frame_rate ();
 	/* Count frame number from 1 ... not sure if this is the best idea */
-	_frame_number->SetLabel (wxString::Format (wxT("%ld"), lrint (_viewer->position().seconds() * fps) + 1));
-	_timecode->SetLabel (time_to_timecode (_viewer->position(), fps));
+	checked_set (_frame_number, wxString::Format (wxT("%ld"), lrint (_viewer->position().seconds() * fps) + 1));
+	checked_set (_timecode, time_to_timecode (_viewer->position(), fps));
 }
 
+
 void
 Controls::active_jobs_changed (optional<string> j)
 {
@@ -274,10 +293,11 @@ Controls::active_jobs_changed (optional<string> j)
 	setup_sensitivity ();
 }
 
+
 DCPTime
 Controls::nudge_amount (wxKeyboardState& ev)
 {
-	DCPTime amount = _viewer->one_video_frame ();
+	auto amount = _viewer->one_video_frame ();
 
 	if (ev.ShiftDown() && !ev.ControlDown()) {
 		amount = DCPTime::from_seconds (1);
@@ -290,6 +310,7 @@ Controls::nudge_amount (wxKeyboardState& ev)
 	return amount;
 }
 
+
 void
 Controls::rewind_clicked (wxMouseEvent& ev)
 {
@@ -297,30 +318,35 @@ Controls::rewind_clicked (wxMouseEvent& ev)
 	ev.Skip();
 }
 
+
 void
 Controls::back_frame ()
 {
 	_viewer->seek_by (-_viewer->one_video_frame(), true);
 }
 
+
 void
 Controls::forward_frame ()
 {
 	_viewer->seek_by (_viewer->one_video_frame(), true);
 }
 
+
 void
 Controls::back_clicked (wxKeyboardState& ev)
 {
 	_viewer->seek_by (-nudge_amount(ev), true);
 }
 
+
 void
 Controls::forward_clicked (wxKeyboardState& ev)
 {
 	_viewer->seek_by (nudge_amount(ev), true);
 }
 
+
 void
 Controls::setup_sensitivity ()
 {
@@ -346,32 +372,36 @@ Controls::setup_sensitivity ()
 	}
 }
 
+
 void
 Controls::timecode_clicked ()
 {
-	PlayheadToTimecodeDialog* dialog = new PlayheadToTimecodeDialog (this, _film->video_frame_rate ());
+	auto dialog = new PlayheadToTimecodeDialog (this, _viewer->position(), _film->video_frame_rate());
 	if (dialog->ShowModal() == wxID_OK) {
 		_viewer->seek (dialog->get(), true);
 	}
 	dialog->Destroy ();
 }
 
+
 void
 Controls::frame_number_clicked ()
 {
-	PlayheadToFrameDialog* dialog = new PlayheadToFrameDialog (this, _film->video_frame_rate ());
+	auto dialog = new PlayheadToFrameDialog (this, _viewer->position(), _film->video_frame_rate());
 	if (dialog->ShowModal() == wxID_OK) {
 		_viewer->seek (dialog->get(), true);
 	}
 	dialog->Destroy ();
 }
 
+
 void
 Controls::jump_to_selected_clicked ()
 {
 	Config::instance()->set_jump_to_selected (_jump_to_selected->GetValue ());
 }
 
+
 void
 Controls::set_film (shared_ptr<Film> film)
 {
@@ -391,22 +421,33 @@ Controls::set_film (shared_ptr<Film> film)
 	update_position_label ();
 }
 
+
 shared_ptr<Film>
 Controls::film () const
 {
 	return _film;
 }
 
+
 void
 Controls::film_change (ChangeType type, Film::Property p)
 {
-	if (type == CHANGE_TYPE_DONE) {
-		if (p == Film::CONTENT) {
+	if (type == ChangeType::DONE) {
+		if (p == Film::Property::CONTENT) {
 			setup_sensitivity ();
 			update_position_label ();
 			update_position_slider ();
-		} else if (p == Film::THREE_D) {
+		} else if (p == Film::Property::THREE_D) {
 			setup_sensitivity ();
 		}
 	}
 }
+
+
+void
+Controls::seek (int slider)
+{
+	_slider->SetValue (slider);
+	slider_moved (false);
+	slider_released ();
+}