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.

diff --git a/ChangeLog b/ChangeLog
index 1d659518d6f4238dc598a7b4e2759bc7546f6f51..d7e922935741719918e52dfe059d4f39f88077b1 100644 (file)
--- 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
 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 687f4d6ff24aea5311ae0a726b9b51e7ab56fd1b..0146a14f4a4d37e5b4d0015ffcdb6f80e88df42d 100644 (file)
--- 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));
        _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));
 
        _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));