diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-11-22 02:16:16 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-11-26 00:09:27 +0100 |
| commit | 5799460dc38bafa1da1ce9f7bf43621d3fadf442 (patch) | |
| tree | a4666f4bf8f99f29716e8d68113320426b0a1c95 /src/wx | |
| parent | aaf6845e130ac208cee524536b67c54bd1ce8ed9 (diff) | |
Noisy change to get film into AudioContent::modify_trim_start().
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/content_menu.cc | 4 | ||||
| -rw-r--r-- | src/wx/content_panel.cc | 2 | ||||
| -rw-r--r-- | src/wx/timing_panel.cc | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index cae56283b..32a4c9ac9 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -483,7 +483,9 @@ ContentMenu::advanced () } if (dialog->video_frame_rate()) { - content->set_video_frame_rate(*dialog->video_frame_rate()); + auto film = _film.lock(); + DCPOMATIC_ASSERT(film); + content->set_video_frame_rate(film, *dialog->video_frame_rate()); } else { content->unset_video_frame_rate(); } diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index d9400e34c..bf02e3930 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -660,7 +660,7 @@ ContentPanel::add_folder(boost::filesystem::path folder) return; } - ic->set_video_frame_rate (frame_rate); + ic->set_video_frame_rate(_film, frame_rate); } _film->examine_and_add_content (i); diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index a78e3bdd4..5b8adc495 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -365,7 +365,7 @@ TimingPanel::trim_start_changed () } ContentTime const trim = _trim_start->get (i->video_frame_rate().get_value_or(_parent->film()->video_frame_rate())); - i->set_trim_start (trim); + i->set_trim_start(_parent->film(), trim); } if (ref) { @@ -440,7 +440,7 @@ TimingPanel::trim_start_to_playhead_clicked () for (auto i: _parent->selected()) { if (i->position() < ph && ph < i->end(film)) { FrameRateChange const frc = film->active_frame_rate_change (i->position()); - i->set_trim_start (i->trim_start() + ContentTime (ph - i->position(), frc)); + i->set_trim_start(film, i->trim_start() + ContentTime(ph - i->position(), frc)); new_ph = i->position (); } } |