diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-11-21 01:59:04 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-11-21 01:59:04 +0000 |
| commit | 254b3044d72de6b033d7c584f5abd2b9aa70aad5 (patch) | |
| tree | 8a5c83c1b2dea690672663dedb2f3aa50f4473dc /src/wx/video_panel.cc | |
| parent | c31b9542c58ae1cbfae7ec3ba4911359fd010ba2 (diff) | |
Take Film pointer out of Content.
Diffstat (limited to 'src/wx/video_panel.cc')
| -rw-r--r-- | src/wx/video_panel.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index c525c1003..55c0984a3 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -361,8 +361,8 @@ VideoPanel::film_content_changed (int property) if (check.size() == 1) { _fade_in->set ( - ContentTime::from_frames (vc.front()->video->fade_in (), vc.front()->active_video_frame_rate ()), - vc.front()->active_video_frame_rate () + ContentTime::from_frames (vc.front()->video->fade_in(), vc.front()->active_video_frame_rate(_parent->film())), + vc.front()->active_video_frame_rate(_parent->film()) ); } else { _fade_in->clear (); @@ -375,8 +375,8 @@ VideoPanel::film_content_changed (int property) if (check.size() == 1) { _fade_out->set ( - ContentTime::from_frames (vc.front()->video->fade_out (), vc.front()->active_video_frame_rate ()), - vc.front()->active_video_frame_rate () + ContentTime::from_frames (vc.front()->video->fade_out(), vc.front()->active_video_frame_rate(_parent->film())), + vc.front()->active_video_frame_rate(_parent->film()) ); } else { _fade_out->clear (); @@ -420,7 +420,7 @@ VideoPanel::setup_description () return; } - string d = vc.front()->video->processing_description (); + string d = vc.front()->video->processing_description (_parent->film()); size_t lines = count (d.begin(), d.end(), '\n'); for (int i = lines; i < 6; ++i) { @@ -504,7 +504,7 @@ VideoPanel::setup_sensitivity () } string why_not; - bool const can_reference = dcp && dcp->can_reference_video (why_not); + bool const can_reference = dcp && dcp->can_reference_video (_parent->film(), why_not); setup_refer_button (_reference, _reference_note, dcp, can_reference, why_not); if (_reference->GetValue ()) { |