Enable mysteriously disabled multi-selected-content edit of timing and

fix a couple of problems with it (#1010).

diff --git a/ChangeLog b/ChangeLog
index c2d9aaf62fc94d988e5ba3042672904fdd8e6354..d983bca8d85edbe3bf285957198aba9ffea9d0b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-11-25  Carl Hetherington  <cth@carlh.net>
+
+       * Allow multi-edit of content timing details (#1010).
+
 2016-11-23  Carl Hetherington  <cth@carlh.net>
 
        * Fix crash on pressing enter in a crop control on Windows (#1009).

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 1b74f4c36fe8687a7991dcc927d2dd82ca2ecc38..b67bdb4eb77ad612e384be062a16c24cf07854cc 100644 (file)
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -397,7 +397,7 @@ ContentPanel::setup_sensitivity ()
        _video_panel->Enable    (video_selection.size() > 0 && _generally_sensitive);
        _audio_panel->Enable    (audio_selection.size() > 0 && _generally_sensitive);
        _subtitle_panel->Enable (selection.size() == 1 && selection.front()->subtitle && _generally_sensitive);
-       _timing_panel->Enable   (selection.size() == 1 && _generally_sensitive);
+       _timing_panel->Enable   (_generally_sensitive);
 }
 
 void

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index a8ff247f948ea53e7ccf18eff38fd4d5be1cba4a..bd4177ffbaaae51f21926b9c3ebaedd31be44dfd 100644 (file)
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -317,19 +317,21 @@ TimingPanel::film_content_changed (int property)
 void
 TimingPanel::position_changed ()
 {
+       DCPTime const pos = _position->get (_parent->film()->video_frame_rate ());
        BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
-               i->set_position (_position->get (_parent->film()->video_frame_rate ()));
+               i->set_position (pos);
        }
 }
 
 void
 TimingPanel::full_length_changed ()
 {
+       int const vfr = _parent->film()->video_frame_rate ();
+       Frame const len = _full_length->get (vfr).frames_round (vfr);
        BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
                shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (i);
                if (ic && ic->still ()) {
-                       int const vfr = _parent->film()->video_frame_rate ();
-                       ic->video->set_length (_full_length->get (vfr).frames_round (vfr));
+                       ic->video->set_length (len);
                }
        }
 }
@@ -344,6 +346,9 @@ TimingPanel::trim_start_changed ()
        shared_ptr<Content> ref;
        optional<FrameRateChange> ref_frc;
        optional<DCPTime> ref_ph;
+
+       ContentTime const trim = _trim_start->get (_parent->film()->video_frame_rate ());
+
        BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
                if (i->position() <= ph && ph < i->end()) {
                        /* The playhead is in i.  Use it as a reference to work out
@@ -355,7 +360,7 @@ TimingPanel::trim_start_changed ()
                        ref_ph = ph - i->position() + DCPTime (i->trim_start(), ref_frc.get());
                }
 
-               i->set_trim_start (_trim_start->get (_parent->film()->video_frame_rate ()));
+               i->set_trim_start (trim);
        }
 
        if (ref) {
@@ -370,8 +375,9 @@ TimingPanel::trim_end_changed ()
 {
        _viewer->set_coalesce_player_changes (true);
 
+       ContentTime const trim = _trim_end->get (_parent->film()->video_frame_rate ());
        BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
-               i->set_trim_end (_trim_end->get (_parent->film()->video_frame_rate ()));
+               i->set_trim_end (trim);
        }
 
        /* XXX: maybe playhead-off-the-end-of-the-film should be handled elsewhere */
@@ -385,11 +391,11 @@ TimingPanel::trim_end_changed ()
 void
 TimingPanel::play_length_changed ()
 {
+       DCPTime const play_length = _play_length->get (_parent->film()->video_frame_rate());
        BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
                FrameRateChange const frc = _parent->film()->active_frame_rate_change (i->position ());
                i->set_trim_end (
-                       ContentTime (i->full_length() - _play_length->get (_parent->film()->video_frame_rate()), frc)
-                       - i->trim_start ()
+                       ContentTime (i->full_length() - play_length, frc) - i->trim_start ()
                        );
        }
 }