diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-06-11 20:22:29 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-06-14 23:43:13 +0200 |
| commit | 82ef1cd34dfe22aaae45b7cf8a2f0d2f2c552a47 (patch) | |
| tree | f890ce1498018c3408dfae806ff06325e264f222 | |
| parent | a1a14f3a4186dce4e1c9bac97cf3bb43e370e1b9 (diff) | |
Move video frame rate set up to a slightly more logical place.
| -rw-r--r-- | src/lib/film.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index d0a26e44c..09378696e 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -1310,12 +1310,6 @@ Film::signal_change(ChangeType type, FilmProperty p) if (type == ChangeType::DONE) { set_dirty(true); - if (p == FilmProperty::CONTENT) { - if (!_user_explicit_video_frame_rate) { - set_video_frame_rate(best_video_frame_rate()); - } - } - emit(boost::bind(boost::ref(Change), type, p)); if (p == FilmProperty::VIDEO_FRAME_RATE || p == FilmProperty::SEQUENCE) { @@ -1573,7 +1567,9 @@ Film::playlist_content_change(ChangeType type, weak_ptr<Content> c, int p, bool { switch (p) { case ContentProperty::VIDEO_FRAME_RATE: - signal_change(type, FilmProperty::CONTENT); + if (!_user_explicit_video_frame_rate) { + set_video_frame_rate(best_video_frame_rate()); + } break; case AudioContentProperty::STREAMS: signal_change(type, FilmProperty::NAME); @@ -1604,6 +1600,10 @@ Film::playlist_change(ChangeType type) signal_change(type, FilmProperty::CONTENT); signal_change(type, FilmProperty::NAME); + if (!_user_explicit_video_frame_rate) { + set_video_frame_rate(best_video_frame_rate()); + } + if (type == ChangeType::DONE) { check_settings_consistency(); } |