From 8a3d5a7729e10a901132ff00efbd5d80e38b2455 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 19 Sep 2021 22:19:38 +0200 Subject: 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). --- src/lib/video_content.cc | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'src/lib/video_content.cc') diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 5686a0a6f..655b8baf6 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -43,14 +43,13 @@ int const VideoContentProperty::USE = 0; int const VideoContentProperty::SIZE = 1; int const VideoContentProperty::FRAME_TYPE = 2; int const VideoContentProperty::CROP = 3; -int const VideoContentProperty::SCALE = 4; -int const VideoContentProperty::COLOUR_CONVERSION = 5; -int const VideoContentProperty::FADE_IN = 6; -int const VideoContentProperty::FADE_OUT = 7; -int const VideoContentProperty::RANGE = 8; -int const VideoContentProperty::CUSTOM_RATIO = 9; -int const VideoContentProperty::CUSTOM_SIZE = 10; -int const VideoContentProperty::BURNT_SUBTITLE_LANGUAGE = 11; +int const VideoContentProperty::COLOUR_CONVERSION = 4; +int const VideoContentProperty::FADE_IN = 5; +int const VideoContentProperty::FADE_OUT = 6; +int const VideoContentProperty::RANGE = 7; +int const VideoContentProperty::CUSTOM_RATIO = 8; +int const VideoContentProperty::CUSTOM_SIZE = 9; +int const VideoContentProperty::BURNT_SUBTITLE_LANGUAGE = 10; using std::string; using std::setprecision; @@ -302,9 +301,8 @@ VideoContent::take_from_examiner (shared_ptr d) auto const range = d->range (); ContentChangeSignaller cc1 (_parent, VideoContentProperty::SIZE); - ContentChangeSignaller cc2 (_parent, VideoContentProperty::SCALE); - ContentChangeSignaller cc3 (_parent, ContentProperty::LENGTH); - ContentChangeSignaller cc4 (_parent, VideoContentProperty::RANGE); + ContentChangeSignaller cc2 (_parent, ContentProperty::LENGTH); + ContentChangeSignaller cc3 (_parent, VideoContentProperty::RANGE); { boost::mutex::scoped_lock lm (_mutex); -- cgit v1.2.3