diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-09-19 22:19:38 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-09-19 23:00:22 +0200 |
| commit | 8a3d5a7729e10a901132ff00efbd5d80e38b2455 (patch) | |
| tree | b69ad212d629626b689d688868f550fa8ce76276 /src/wx | |
| parent | c162f9d8b127f56b8da46b83908000611033e6a5 (diff) | |
Remove unused VideoContentProperty::SCALE and listen to CUSTOM_{RATIO,SIZE} instead.
::SCALE was sort-of being used, as it was emitted during examination of
video content, but it wasn't being emitted anywhere else (and CUSTOM_{RATIO,SIZE}
replace its functionality as far as I can see).
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/dcp_panel.cc | 3 | ||||
| -rw-r--r-- | src/wx/film_viewer.cc | 3 | ||||
| -rw-r--r-- | src/wx/video_panel.cc | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index 78f5fc526..61dfd7507 100644 --- a/src/wx/dcp_panel.cc +++ b/src/wx/dcp_panel.cc @@ -506,7 +506,8 @@ DCPPanel::film_content_changed (int property) property == TextContentProperty::BURN || property == TextContentProperty::LANGUAGE || property == TextContentProperty::LANGUAGE_IS_ADDITIONAL || - property == VideoContentProperty::SCALE || + property == VideoContentProperty::CUSTOM_RATIO || + property == VideoContentProperty::CUSTOM_SIZE || property == VideoContentProperty::BURNT_SUBTITLE_LANGUAGE || property == VideoContentProperty::CROP || property == DCPContentProperty::REFERENCE_VIDEO || diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 17649d450..c7e154fa5 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -418,7 +418,8 @@ FilmViewer::player_change (vector<int> properties) for (auto i: properties) { if ( i == VideoContentProperty::CROP || - i == VideoContentProperty::SCALE || + i == VideoContentProperty::CUSTOM_RATIO || + i == VideoContentProperty::CUSTOM_SIZE || i == VideoContentProperty::FADE_IN || i == VideoContentProperty::FADE_OUT || i == VideoContentProperty::COLOUR_CONVERSION || diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index 07a929e10..c7330ef59 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -384,7 +384,8 @@ VideoPanel::film_content_changed (int property) if (property == ContentProperty::VIDEO_FRAME_RATE || property == VideoContentProperty::FRAME_TYPE || property == VideoContentProperty::CROP || - property == VideoContentProperty::SCALE) { + property == VideoContentProperty::CUSTOM_RATIO || + property == VideoContentProperty::CUSTOM_SIZE) { setup_description (); } else if (property == VideoContentProperty::COLOUR_CONVERSION) { boost::unordered_set<optional<ColourConversion>> check; |