Allow support for changing timing details on multiple content simultaneously.

diff --git a/ChangeLog b/ChangeLog
index 7113e0fdaaeb1b10a64db9c180690051ea8e93bb..af4d9046ee65ab0ce47ddda82a9c6a95d3e26f63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-08-08  Carl Hetherington  <cth@carlh.net>
 
+       * Approximate support for changing timing details of multiple
+       bits of content at the same time.
+
        * Allow removal of multiple bits of content at the same time.
 
        * Version 1.72.7 released.

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index bbf1fc8d5f11d04683c4cf2e593e76254c8763cd..98d30a2a3b09abc1ba9669c96a95a4138d1254b2 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -872,7 +872,7 @@ FilmEditor::setup_content_sensitivity ()
        _video_panel->Enable    (!video_selection.empty() && _generally_sensitive);
        _audio_panel->Enable    (!audio_selection.empty() && _generally_sensitive);
        _subtitle_panel->Enable (selection.size() == 1 && dynamic_pointer_cast<FFmpegContent> (selection.front()) && _generally_sensitive);
-       _timing_panel->Enable   (selection.size() == 1 && _generally_sensitive);
+       _timing_panel->Enable   (!selection.empty() && _generally_sensitive);
 }
 
 ContentList
@@ -880,6 +880,13 @@ FilmEditor::selected_content ()
 {
        ContentList sel;
        long int s = -1;
+
+       /* The list was populated using a sorted content list, so we must sort it here too
+          so that we can look up by index and get the right thing.
+       */
+       ContentList content = _film->content ();
+       sort (content.begin(), content.end(), ContentSorter ());
+       
        while (true) {
                s = _content->GetNextItem (s, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
                if (s == -1) {
@@ -887,7 +894,7 @@ FilmEditor::selected_content ()
                }
 
                if (s < int (_film->content().size ())) {
-                       sel.push_back (_film->content()[s]);
+                       sel.push_back (content[s]);
                }
        }
 

diff --git a/src/wx/timecode.cc b/src/wx/timecode.cc
index ee5b5604bef4189e95329a360525be0e0bfbaf7b..166446d8c76140eb1e5fa01c27731abdb003111a 100644 (file)
--- a/src/wx/timecode.cc
+++ b/src/wx/timecode.cc
@@ -121,6 +121,16 @@ Timecode::get (int fps) const
        return t;
 }
 
+void
+Timecode::clear ()
+{
+       checked_set (_hours, "");
+       checked_set (_minutes, "");
+       checked_set (_seconds, "");
+       checked_set (_frames, "");
+       _fixed->SetLabel ("");
+}
+
 void
 Timecode::changed ()
 {

diff --git a/src/wx/timecode.h b/src/wx/timecode.h
index 880b44a31be8754ca54634e542d9e739e328b745..d0e8176f2d12a5e1cd51fce3675850c7a661c666 100644 (file)
--- a/src/wx/timecode.h
+++ b/src/wx/timecode.h
@@ -28,6 +28,7 @@ public:
 
        void set (Time, int);
        Time get (int) const;
+       void clear ();
 
        void set_editable (bool);
 

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index ef963bbfcce89751a70b5f979e3d83dcccec0aa0..38891fb0e841af1b65c038d130298079e5edc2a5 100644 (file)
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -27,6 +27,7 @@
 
 using std::cout;
 using std::string;
+using std::set;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using libdcp::raw_convert;
@@ -78,67 +79,117 @@ void
 TimingPanel::film_content_changed (int property)
 {
        ContentList cl = _editor->selected_content ();
-       shared_ptr<Content> content;
-       if (cl.size() == 1) {
-               content = cl.front ();
-       }
-
        int const film_video_frame_rate = _editor->film()->video_frame_rate ();
+
+       /* Here we check to see if we have exactly one different value of various
+          properties, and fill the controls with that value if so.
+       */
        
        if (property == ContentProperty::POSITION) {
-               if (content) {
-                       _position->set (content->position (), film_video_frame_rate);
+
+               set<Time> check;
+               for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) {
+                       check.insert ((*i)->position ());
+               }
+
+               if (check.size() == 1) {
+                       _position->set (cl.front()->position(), film_video_frame_rate);
                } else {
-                       _position->set (0, 24);
+                       _position->clear ();
                }
+               
        } else if (
                property == ContentProperty::LENGTH ||
                property == VideoContentProperty::VIDEO_FRAME_RATE ||
                property == VideoContentProperty::VIDEO_FRAME_TYPE
                ) {
-               if (content) {
-                       _full_length->set (content->full_length (), film_video_frame_rate);
-                       _play_length->set (content->length_after_trim (), film_video_frame_rate);
+
+               set<Time> check;
+               for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) {
+                       check.insert ((*i)->full_length ());
+               }
+               
+               if (check.size() == 1) {
+                       _full_length->set (cl.front()->full_length (), film_video_frame_rate);
                } else {
-                       _full_length->set (0, 24);
-                       _play_length->set (0, 24);
+                       _full_length->clear ();
                }
+
        } else if (property == ContentProperty::TRIM_START) {
-               if (content) {
-                       _trim_start->set (content->trim_start (), film_video_frame_rate);
-                       _play_length->set (content->length_after_trim (), film_video_frame_rate);
+
+               set<Time> check;
+               for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) {
+                       check.insert ((*i)->trim_start ());
+               }
+               
+               if (check.size() == 1) {
+                       _trim_start->set (cl.front()->trim_start (), film_video_frame_rate);
                } else {
-                       _trim_start->set (0, 24);
-                       _play_length->set (0, 24);
+                       _trim_start->clear ();
                }
+               
        } else if (property == ContentProperty::TRIM_END) {
-               if (content) {
-                       _trim_end->set (content->trim_end (), film_video_frame_rate);
-                       _play_length->set (content->length_after_trim (), film_video_frame_rate);
+
+               set<Time> check;
+               for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) {
+                       check.insert ((*i)->trim_end ());
+               }
+               
+               if (check.size() == 1) {
+                       _trim_end->set (cl.front()->trim_end (), film_video_frame_rate);
                } else {
                        _trim_end->set (0, 24);
-                       _play_length->set (0, 24);
+               }
+       }
+
+       if (
+               property == ContentProperty::LENGTH ||
+               property == ContentProperty::TRIM_START ||
+               property == ContentProperty::TRIM_END ||
+               property == VideoContentProperty::VIDEO_FRAME_RATE ||
+               property == VideoContentProperty::VIDEO_FRAME_TYPE
+               ) {
+
+               set<Time> check;
+               for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) {
+                       check.insert ((*i)->length_after_trim ());
+               }
+               
+               if (check.size() == 1) {
+                       _play_length->set (cl.front()->length_after_trim (), film_video_frame_rate);
+               } else {
+                       _play_length->clear ();
                }
        }
 
        if (property == VideoContentProperty::VIDEO_FRAME_RATE) {
-               if (content) {
-                       shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (content);
+               set<float> check;
+               shared_ptr<VideoContent> vc;
+               for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) {
+                       vc = dynamic_pointer_cast<VideoContent> (*i);
                        if (vc) {
-                               _video_frame_rate->SetValue (std_to_wx (raw_convert<string> (vc->video_frame_rate (), 5)));
-                       } else {
-                               _video_frame_rate->SetValue ("24");
+                               check.insert (vc->video_frame_rate ());
                        }
+               }
+               if (check.size() == 1) {
+                       _video_frame_rate->SetValue (std_to_wx (raw_convert<string> (vc->video_frame_rate (), 5)));
+                       _video_frame_rate->Enable (true);
                } else {
-                       _video_frame_rate->SetValue ("24");
+                       _video_frame_rate->SetValue ("");
+                       _video_frame_rate->Enable (false);
                }
        }
 
-       shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (content);
-       shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (content);
-       _full_length->set_editable (ic && ic->still ());
-       _play_length->set_editable (!ic || !ic->still ());
-       _video_frame_rate->Enable (vc);
+       bool have_still = false;
+       for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) {
+               shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (*i);
+               if (ic && ic->still ()) {
+                       have_still = true;
+               }
+       }
+
+       _full_length->set_editable (have_still);
+       _play_length->set_editable (!have_still);
        _set_video_frame_rate->Enable (false);
 }
 
@@ -146,8 +197,8 @@ void
 TimingPanel::position_changed ()
 {
        ContentList c = _editor->selected_content ();
-       if (c.size() == 1) {
-               c.front()->set_position (_position->get (_editor->film()->video_frame_rate ()));
+       for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
+               (*i)->set_position (_position->get (_editor->film()->video_frame_rate ()));
        }
 }
 
@@ -155,8 +206,8 @@ void
 TimingPanel::full_length_changed ()
 {
        ContentList c = _editor->selected_content ();
-       if (c.size() == 1) {
-               shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (c.front ());
+       for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
+               shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (*i);
                if (ic && ic->still ()) {
                        ic->set_video_length (rint (_full_length->get (_editor->film()->video_frame_rate()) * ic->video_frame_rate() / TIME_HZ));
                }
@@ -167,8 +218,8 @@ void
 TimingPanel::trim_start_changed ()
 {
        ContentList c = _editor->selected_content ();
-       if (c.size() == 1) {
-               c.front()->set_trim_start (_trim_start->get (_editor->film()->video_frame_rate ()));
+       for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
+               (*i)->set_trim_start (_trim_start->get (_editor->film()->video_frame_rate ()));
        }
 }
 
@@ -177,8 +228,8 @@ void
 TimingPanel::trim_end_changed ()
 {
        ContentList c = _editor->selected_content ();
-       if (c.size() == 1) {
-               c.front()->set_trim_end (_trim_end->get (_editor->film()->video_frame_rate ()));
+       for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
+               (*i)->set_trim_end (_trim_end->get (_editor->film()->video_frame_rate ()));
        }
 }
 
@@ -186,8 +237,8 @@ void
 TimingPanel::play_length_changed ()
 {
        ContentList c = _editor->selected_content ();
-       if (c.size() == 1) {
-               c.front()->set_trim_end (c.front()->full_length() - _play_length->get (_editor->film()->video_frame_rate()) - c.front()->trim_start());
+       for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
+               (*i)->set_trim_end ((*i)->full_length() - _play_length->get (_editor->film()->video_frame_rate()) - (*i)->trim_start());
        }
 }
 
@@ -201,8 +252,8 @@ void
 TimingPanel::set_video_frame_rate ()
 {
        ContentList c = _editor->selected_content ();
-       if (c.size() == 1) {
-               shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (c.front ());
+       for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
+               shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (*i);
                if (vc) {
                        vc->set_video_frame_rate (raw_convert<float> (wx_to_std (_video_frame_rate->GetValue ())));
                }
@@ -213,16 +264,14 @@ TimingPanel::set_video_frame_rate ()
 void
 TimingPanel::content_selection_changed ()
 {
-       ContentList sel = _editor->selected_content ();
-       bool const single = sel.size() == 1;
-
-       /* Things that are only allowed with single selections */
-       _position->Enable (single);
-       _full_length->Enable (single);
-       _trim_start->Enable (single);
-       _trim_end->Enable (single);
-       _play_length->Enable (single);
-       _video_frame_rate->Enable (single);
+       bool const e = !_editor->selected_content().empty ();
+
+       _position->Enable (e);
+       _full_length->Enable (e);
+       _trim_start->Enable (e);
+       _trim_end->Enable (e);
+       _play_length->Enable (e);
+       _video_frame_rate->Enable (e);
        
        film_content_changed (ContentProperty::POSITION);
        film_content_changed (ContentProperty::LENGTH);