summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-04-20 23:03:02 +0100
committerCarl Hetherington <cth@carlh.net>2015-04-20 23:03:02 +0100
commita5880841f7d205a8c5a25c92f9d5315612cd8362 (patch)
tree267b828fc5bac0896442367055f8cade2df38502
parent185c94a0707cf4e43250b0b9453a55b0f07015eb (diff)
Hand-apply 9a90f25eb891d7d590563c0ce1597de4da8ff575; bind to
wxEVT_COMMAND_TEXT_UPDATED as well as wxEVT_COMMAND_SPINCTRL_UPDATED on the JPEG2000 control otherwise entering a value using the keyboard directly before doing "Make DCP" can seemingly result in the new value not being read in until after the video MXF filename has been decided. This results in a file not found at the end of the encode.
-rw-r--r--ChangeLog7
-rw-r--r--src/wx/dcp_panel.cc2
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d659518d..d7e922935 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-04-20 Carl Hetherington <cth@carlh.net>
+
+ * Hand-apply e1d0d24146592e311d46781a1961fe080f6357cf;
+ attempt to fix confusion with the JPEG2000 bandwidth
+ control when a user enters a value directly rather than
+ using the spin arrows.
+
2015-04-16 Carl Hetherington <cth@carlh.net>
* Fix potential OS X crashes due to another incarnation
diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 687f4d6ff..0146a14f4 100644
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -562,6 +562,8 @@ DCPPanel::make_video_panel ()
_best_frame_rate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::best_frame_rate_clicked, this));
_burn_subtitles->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::burn_subtitles_toggled, this));
_j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DCPPanel::j2k_bandwidth_changed, this));
+ /* Also listen to wxEVT_COMMAND_TEXT_UPDATED so that typing numbers directly in is always noticed */
+ _j2k_bandwidth->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DCPPanel::j2k_bandwidth_changed, this));
_resolution->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::resolution_changed, this));
_three_d->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::three_d_changed, this));