Merge master.

[dcpomatic.git] / src / wx / timing_panel.cc

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 38891fb0e841af1b65c038d130298079e5edc2a5..a0e1f8f8a4845b8ebc9c852202d89818b55f8f01 100644 (file)
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -17,24 +17,24 @@
 
 */
 
-#include <libdcp/raw_convert.h>
+#include <dcp/raw_convert.h>
 #include "lib/content.h"
 #include "lib/image_content.h"
 #include "timing_panel.h"
 #include "wx_util.h"
 #include "timecode.h"
-#include "film_editor.h"
+#include "content_panel.h"
 
 using std::cout;
 using std::string;
 using std::set;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
-using libdcp::raw_convert;
+using dcp::raw_convert;
 
-TimingPanel::TimingPanel (FilmEditor* e)
+TimingPanel::TimingPanel (ContentPanel* p)
        /* horrid hack for apparent lack of context support with wxWidgets i18n code */
-       : FilmEditorPanel (e, S_("Timing|Timing"))
+       : ContentSubPanel (p, S_("Timing|Timing"))
 {
        wxFlexGridSizer* grid = new wxFlexGridSizer (2, 4, 4);
        _sizer->Add (grid, 0, wxALL, 8);
@@ -78,8 +78,8 @@ TimingPanel::TimingPanel (FilmEditor* e)
 void
 TimingPanel::film_content_changed (int property)
 {
-       ContentList cl = _editor->selected_content ();
-       int const film_video_frame_rate = _editor->film()->video_frame_rate ();
+       ContentList cl = _parent->selected ();
+       int const film_video_frame_rate = _parent->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.
@@ -87,7 +87,7 @@ TimingPanel::film_content_changed (int property)
        
        if (property == ContentProperty::POSITION) {
 
-               set<Time> check;
+               set<DCPTime> check;
                for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) {
                        check.insert ((*i)->position ());
                }
@@ -104,7 +104,7 @@ TimingPanel::film_content_changed (int property)
                property == VideoContentProperty::VIDEO_FRAME_TYPE
                ) {
 
-               set<Time> check;
+               set<DCPTime> check;
                for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) {
                        check.insert ((*i)->full_length ());
                }
@@ -117,7 +117,7 @@ TimingPanel::film_content_changed (int property)
 
        } else if (property == ContentProperty::TRIM_START) {
 
-               set<Time> check;
+               set<DCPTime> check;
                for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) {
                        check.insert ((*i)->trim_start ());
                }
@@ -130,7 +130,7 @@ TimingPanel::film_content_changed (int property)
                
        } else if (property == ContentProperty::TRIM_END) {
 
-               set<Time> check;
+               set<DCPTime> check;
                for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) {
                        check.insert ((*i)->trim_end ());
                }
@@ -138,7 +138,7 @@ TimingPanel::film_content_changed (int property)
                if (check.size() == 1) {
                        _trim_end->set (cl.front()->trim_end (), film_video_frame_rate);
                } else {
-                       _trim_end->set (0, 24);
+                       _trim_end->clear ();
                }
        }
 
@@ -150,7 +150,7 @@ TimingPanel::film_content_changed (int property)
                property == VideoContentProperty::VIDEO_FRAME_TYPE
                ) {
 
-               set<Time> check;
+               set<DCPTime> check;
                for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) {
                        check.insert ((*i)->length_after_trim ());
                }
@@ -196,20 +196,21 @@ TimingPanel::film_content_changed (int property)
 void
 TimingPanel::position_changed ()
 {
-       ContentList c = _editor->selected_content ();
+       ContentList c = _parent->selected ();
        for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
-               (*i)->set_position (_position->get (_editor->film()->video_frame_rate ()));
+               (*i)->set_position (_position->get (_parent->film()->video_frame_rate ()));
        }
 }
 
 void
 TimingPanel::full_length_changed ()
 {
-       ContentList c = _editor->selected_content ();
+       ContentList c = _parent->selected ();
        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));
+                       /* XXX: No effective FRC here... is this right? */
+                       ic->set_video_length (ContentTime (_full_length->get (_parent->film()->video_frame_rate()), FrameRateChange (1, 1)));
                }
        }
 }
@@ -217,9 +218,9 @@ TimingPanel::full_length_changed ()
 void
 TimingPanel::trim_start_changed ()
 {
-       ContentList c = _editor->selected_content ();
+       ContentList c = _parent->selected ();
        for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
-               (*i)->set_trim_start (_trim_start->get (_editor->film()->video_frame_rate ()));
+               (*i)->set_trim_start (_trim_start->get (_parent->film()->video_frame_rate ()));
        }
 }
 
@@ -227,18 +228,18 @@ TimingPanel::trim_start_changed ()
 void
 TimingPanel::trim_end_changed ()
 {
-       ContentList c = _editor->selected_content ();
+       ContentList c = _parent->selected ();
        for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
-               (*i)->set_trim_end (_trim_end->get (_editor->film()->video_frame_rate ()));
+               (*i)->set_trim_end (_trim_end->get (_parent->film()->video_frame_rate ()));
        }
 }
 
 void
 TimingPanel::play_length_changed ()
 {
-       ContentList c = _editor->selected_content ();
+       ContentList c = _parent->selected ();
        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());
+               (*i)->set_trim_end ((*i)->full_length() - _play_length->get (_parent->film()->video_frame_rate()) - (*i)->trim_start());
        }
 }
 
@@ -251,7 +252,7 @@ TimingPanel::video_frame_rate_changed ()
 void
 TimingPanel::set_video_frame_rate ()
 {
-       ContentList c = _editor->selected_content ();
+       ContentList c = _parent->selected ();
        for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
                shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (*i);
                if (vc) {
@@ -264,7 +265,7 @@ TimingPanel::set_video_frame_rate ()
 void
 TimingPanel::content_selection_changed ()
 {
-       bool const e = !_editor->selected_content().empty ();
+       bool const e = !_parent->selected().empty ();
 
        _position->Enable (e);
        _full_length->Enable (e);