X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontrols.cc;h=86329efb39425f8f4ff40b88cf52751df7f5d4f5;hb=1a7c50245309bb0b99001940b2203a267de942ca;hp=27139f1f5a8608b2b6c63c71e711863033373a34;hpb=579d18cb7770efe2da03afaf6a33faaf624119e3;p=dcpomatic.git

diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index 27139f1f5..86329efb3 100644
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -52,8 +52,12 @@ using boost::optional;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::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))
@@ -105,10 +109,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));
@@ -170,7 +181,7 @@ Controls::stopped ()
 void
 Controls::update_position ()
 {
-	if (!_slider_being_moved) {
+	if (!_slider_being_moved && !_viewer->pending_idle_get()) {
 		update_position_label ();
 		update_position_slider ();
 	}
@@ -252,15 +263,15 @@ 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
@@ -345,7 +356,7 @@ Controls::setup_sensitivity ()
 void
 Controls::timecode_clicked ()
 {
-	PlayheadToTimecodeDialog* dialog = new PlayheadToTimecodeDialog (this, _film->video_frame_rate ());
+	PlayheadToTimecodeDialog* dialog = new PlayheadToTimecodeDialog (this, _viewer->position(), _film->video_frame_rate());
 	if (dialog->ShowModal() == wxID_OK) {
 		_viewer->seek (dialog->get(), true);
 	}
@@ -355,7 +366,7 @@ Controls::timecode_clicked ()
 void
 Controls::frame_number_clicked ()
 {
-	PlayheadToFrameDialog* dialog = new PlayheadToFrameDialog (this, _film->video_frame_rate ());
+	PlayheadToFrameDialog* dialog = new PlayheadToFrameDialog (this, _viewer->position(), _film->video_frame_rate());
 	if (dialog->ShowModal() == wxID_OK) {
 		_viewer->seek (dialog->get(), true);
 	}
@@ -407,7 +418,6 @@ Controls::film_change (ChangeType type, Film::Property p)
 	}
 }
 
-#ifdef DCPOMATIC_PLAYER_STRESS_TEST
 void
 Controls::seek (int slider)
 {
@@ -415,4 +425,3 @@ Controls::seek (int slider)
 	slider_moved (false);
 	slider_released ();
 }
-#endif