Disallow referencing of Interop DCPs in SMPTE films, and vice versa (#804).

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

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index f6f234a0d2bce4a3eee372e8d513e437f4a93ac7..3ab78727e01a59fc7955ae0e66fef68c0a1d5582 100644 (file)
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -86,9 +86,10 @@ VideoPanel::VideoPanel (ContentPanel* p)
        _frame_type = new ContentChoice<VideoContent, VideoFrameType> (
                this,
                new wxChoice (this, wxID_ANY),
-               VideoContentProperty::VIDEO_FRAME_TYPE,
-               boost::mem_fn (&VideoContent::video_frame_type),
-               boost::mem_fn (&VideoContent::set_video_frame_type),
+               VideoContentProperty::FRAME_TYPE,
+               &Content::video,
+               boost::mem_fn (&VideoContent::frame_type),
+               boost::mem_fn (&VideoContent::set_frame_type),
                &caster<int, VideoFrameType>,
                &caster<VideoFrameType, int>
                );
@@ -104,7 +105,8 @@ VideoPanel::VideoPanel (ContentPanel* p)
        _left_crop = new ContentSpinCtrl<VideoContent> (
                this,
                new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
-               VideoContentProperty::VIDEO_CROP,
+               VideoContentProperty::CROP,
+               &Content::video,
                boost::mem_fn (&VideoContent::left_crop),
                boost::mem_fn (&VideoContent::set_left_crop)
                );
@@ -114,7 +116,8 @@ VideoPanel::VideoPanel (ContentPanel* p)
        _right_crop = new ContentSpinCtrl<VideoContent> (
                this,
                new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
-               VideoContentProperty::VIDEO_CROP,
+               VideoContentProperty::CROP,
+               &Content::video,
                boost::mem_fn (&VideoContent::right_crop),
                boost::mem_fn (&VideoContent::set_right_crop)
                );
@@ -126,7 +129,8 @@ VideoPanel::VideoPanel (ContentPanel* p)
        _top_crop = new ContentSpinCtrl<VideoContent> (
                this,
                new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
-               VideoContentProperty::VIDEO_CROP,
+               VideoContentProperty::CROP,
+               &Content::video,
                boost::mem_fn (&VideoContent::top_crop),
                boost::mem_fn (&VideoContent::set_top_crop)
                );
@@ -136,7 +140,8 @@ VideoPanel::VideoPanel (ContentPanel* p)
        _bottom_crop = new ContentSpinCtrl<VideoContent> (
                this,
                new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
-               VideoContentProperty::VIDEO_CROP,
+               VideoContentProperty::CROP,
+               &Content::video,
                boost::mem_fn (&VideoContent::bottom_crop),
                boost::mem_fn (&VideoContent::set_bottom_crop)
                );
@@ -159,7 +164,8 @@ VideoPanel::VideoPanel (ContentPanel* p)
        _scale = new ContentChoice<VideoContent, VideoContentScale> (
                this,
                new wxChoice (this, wxID_ANY),
-               VideoContentProperty::VIDEO_SCALE,
+               VideoContentProperty::SCALE,
+               &Content::video,
                boost::mem_fn (&VideoContent::scale),
                boost::mem_fn (&VideoContent::set_scale),
                &index_to_scale,
@@ -250,6 +256,7 @@ VideoPanel::film_changed (Film::Property property)
                setup_description ();
                break;
        case Film::REEL_TYPE:
+       case Film::INTEROP:
                setup_sensitivity ();
        default:
                break;
@@ -267,13 +274,10 @@ VideoPanel::film_content_changed (int property)
                fcs = dynamic_pointer_cast<FFmpegContent> (vcs);
        }
 
-       if (property == VideoContentProperty::VIDEO_FRAME_TYPE) {
-               setup_description ();
-       } else if (property == VideoContentProperty::VIDEO_CROP) {
-               setup_description ();
-       } else if (property == VideoContentProperty::VIDEO_SCALE) {
-               setup_description ();
-       } else if (property == VideoContentProperty::VIDEO_FRAME_RATE) {
+       if (property == ContentProperty::VIDEO_FRAME_RATE ||
+           property == VideoContentProperty::FRAME_TYPE ||
+           property == VideoContentProperty::CROP ||
+           property == VideoContentProperty::SCALE) {
                setup_description ();
        } else if (property == VideoContentProperty::COLOUR_CONVERSION) {
                if (vcs && vcs->video->colour_conversion ()) {
@@ -302,7 +306,7 @@ VideoPanel::film_content_changed (int property)
                                checked_set (_filters, p);
                        }
                }
-       } else if (property == VideoContentProperty::VIDEO_FADE_IN) {
+       } else if (property == VideoContentProperty::FADE_IN) {
                set<Frame> check;
                BOOST_FOREACH (shared_ptr<const Content> i, vc) {
                        check.insert (i->video->fade_in ());
@@ -310,13 +314,13 @@ VideoPanel::film_content_changed (int property)
 
                if (check.size() == 1) {
                        _fade_in->set (
-                               ContentTime::from_frames (vc.front()->video->fade_in (), vc.front()->video->video_frame_rate ()),
-                               vc.front()->video->video_frame_rate ()
+                               ContentTime::from_frames (vc.front()->video->fade_in (), vc.front()->active_video_frame_rate ()),
+                               vc.front()->active_video_frame_rate ()
                                );
                } else {
                        _fade_in->clear ();
                }
-       } else if (property == VideoContentProperty::VIDEO_FADE_OUT) {
+       } else if (property == VideoContentProperty::FADE_OUT) {
                set<Frame> check;
                BOOST_FOREACH (shared_ptr<const Content> i, vc) {
                        check.insert (i->video->fade_out ());
@@ -324,8 +328,8 @@ VideoPanel::film_content_changed (int property)
 
                if (check.size() == 1) {
                        _fade_out->set (
-                               ContentTime::from_frames (vc.front()->video->fade_out (), vc.front()->video->video_frame_rate ()),
-                               vc.front()->video->video_frame_rate ()
+                               ContentTime::from_frames (vc.front()->video->fade_out (), vc.front()->active_video_frame_rate ()),
+                               vc.front()->active_video_frame_rate ()
                                );
                } else {
                        _fade_out->clear ();
@@ -408,7 +412,7 @@ VideoPanel::edit_colour_conversion_clicked ()
                return;
        }
 
-       ContentColourConversionDialog* d = new ContentColourConversionDialog (this, vc.front()->yuv ());
+       ContentColourConversionDialog* d = new ContentColourConversionDialog (this, vc.front()->video->yuv ());
        d->set (vc.front()->video->colour_conversion().get_value_or (PresetColourConversion::all().front ().conversion));
        d->ShowModal ();
        vc.front()->video->set_colour_conversion (d->get ());
@@ -427,11 +431,11 @@ VideoPanel::content_selection_changed ()
        _bottom_crop->set_content (video_sel);
        _scale->set_content (video_sel);
 
-       film_content_changed (VideoContentProperty::VIDEO_CROP);
-       film_content_changed (VideoContentProperty::VIDEO_FRAME_RATE);
+       film_content_changed (ContentProperty::VIDEO_FRAME_RATE);
+       film_content_changed (VideoContentProperty::CROP);
        film_content_changed (VideoContentProperty::COLOUR_CONVERSION);
-       film_content_changed (VideoContentProperty::VIDEO_FADE_IN);
-       film_content_changed (VideoContentProperty::VIDEO_FADE_OUT);
+       film_content_changed (VideoContentProperty::FADE_IN);
+       film_content_changed (VideoContentProperty::FADE_OUT);
        film_content_changed (FFmpegContentProperty::FILTERS);
        film_content_changed (DCPContentProperty::REFERENCE_VIDEO);
 
@@ -491,7 +495,7 @@ VideoPanel::setup_sensitivity ()
        }
 
        if (vcs && vcs->video->colour_conversion ()) {
-               _edit_colour_conversion_button->Enable (!vcs->colour_conversion().get().preset());
+               _edit_colour_conversion_button->Enable (!vcs->video->colour_conversion().get().preset());
        } else {
                _edit_colour_conversion_button->Enable (false);
        }
@@ -500,18 +504,18 @@ VideoPanel::setup_sensitivity ()
 void
 VideoPanel::fade_in_changed ()
 {
-       BOOST_FOREACH (shared_ptr<VideoContent> i, _parent->selected_video ()) {
+       BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_video ()) {
                int const vfr = _parent->film()->video_frame_rate ();
-               i->set_fade_in (_fade_in->get (vfr).frames_round (vfr));
+               i->video->set_fade_in (_fade_in->get (vfr).frames_round (vfr));
        }
 }
 
 void
 VideoPanel::fade_out_changed ()
 {
-       BOOST_FOREACH (shared_ptr<VideoContent> i, _parent->selected_video ()) {
+       BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_video ()) {
                int const vfr = _parent->film()->video_frame_rate ();
-               i->set_fade_out (_fade_out->get (vfr).frames_round (vfr));
+               i->video->set_fade_out (_fade_out->get (vfr).frames_round (vfr));
        }
 }