diff options
author | François Laignel <fengalin@free.fr> | 2021-04-20 15:57:40 +0300 |
---|---|---|
committer | François Laignel <fengalin@free.fr> | 2021-04-20 19:19:58 +0300 |
commit | 27bc5c89cad7dfec9cc12c6c87beca76a4a0b139 (patch) | |
tree | 8837a6ede376d71ede06dfa553250b19de618b16 /video | |
parent | e0b577fe1d96779cac8b2bdd365f84c008232246 (diff) |
fix-getters-def 0.3.0 pass
Diffstat (limited to 'video')
-rw-r--r-- | video/closedcaption/src/ccdetect/imp.rs | 2 | ||||
-rw-r--r-- | video/closedcaption/src/cea608overlay/imp.rs | 2 | ||||
-rw-r--r-- | video/closedcaption/src/line_reader.rs | 2 | ||||
-rw-r--r-- | video/closedcaption/src/mcc_enc/imp.rs | 2 | ||||
-rw-r--r-- | video/closedcaption/src/mcc_parse/imp.rs | 5 | ||||
-rw-r--r-- | video/closedcaption/src/scc_parse/imp.rs | 5 | ||||
-rw-r--r-- | video/closedcaption/src/tttocea608/imp.rs | 2 | ||||
-rw-r--r-- | video/closedcaption/src/tttojson/imp.rs | 2 | ||||
-rw-r--r-- | video/gif/src/gifenc/imp.rs | 4 | ||||
-rw-r--r-- | video/hsv/src/hsvdetector/imp.rs | 4 | ||||
-rw-r--r-- | video/hsv/src/hsvfilter/imp.rs | 4 | ||||
-rw-r--r-- | video/rav1e/src/rav1enc/imp.rs | 2 | ||||
-rw-r--r-- | video/rspng/src/pngenc/imp.rs | 2 |
13 files changed, 16 insertions, 22 deletions
diff --git a/video/closedcaption/src/ccdetect/imp.rs b/video/closedcaption/src/ccdetect/imp.rs index cc4230d3b..5aa14d3ba 100644 --- a/video/closedcaption/src/ccdetect/imp.rs +++ b/video/closedcaption/src/ccdetect/imp.rs @@ -270,7 +270,7 @@ impl ObjectImpl for CCDetect { } } - fn get_property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { + fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { match pspec.name() { "window" => { let settings = self.settings.lock().unwrap(); diff --git a/video/closedcaption/src/cea608overlay/imp.rs b/video/closedcaption/src/cea608overlay/imp.rs index a9427a477..c07d91fdd 100644 --- a/video/closedcaption/src/cea608overlay/imp.rs +++ b/video/closedcaption/src/cea608overlay/imp.rs @@ -614,7 +614,7 @@ impl ObjectImpl for Cea608Overlay { } } - fn get_property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { + fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { match pspec.name() { "field" => { let settings = self.settings.lock().unwrap(); diff --git a/video/closedcaption/src/line_reader.rs b/video/closedcaption/src/line_reader.rs index 3f0dd48a1..82e6d677b 100644 --- a/video/closedcaption/src/line_reader.rs +++ b/video/closedcaption/src/line_reader.rs @@ -152,7 +152,7 @@ impl<T: AsRef<[u8]>> LineReader<T> { assert_eq!(self.buf.len(), len); } - pub fn get_line_with_drain(&mut self, drain: bool) -> Option<&[u8]> { + pub fn line_with_drain(&mut self, drain: bool) -> Option<&[u8]> { // Drop all data from the previous line self.drop_previous_line(); diff --git a/video/closedcaption/src/mcc_enc/imp.rs b/video/closedcaption/src/mcc_enc/imp.rs index 5a6103308..5feeec1ed 100644 --- a/video/closedcaption/src/mcc_enc/imp.rs +++ b/video/closedcaption/src/mcc_enc/imp.rs @@ -540,7 +540,7 @@ impl ObjectImpl for MccEnc { } } - fn get_property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { + fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { match pspec.name() { "uuid" => { let settings = self.settings.lock().unwrap(); diff --git a/video/closedcaption/src/mcc_parse/imp.rs b/video/closedcaption/src/mcc_parse/imp.rs index a6d449e9e..5d54ca942 100644 --- a/video/closedcaption/src/mcc_parse/imp.rs +++ b/video/closedcaption/src/mcc_parse/imp.rs @@ -156,10 +156,7 @@ fn parse_timecode_rate( impl State { #[allow(clippy::type_complexity)] - fn get_line( - &mut self, - drain: bool, - ) -> Result<Option<MccLine>, (&[u8], nom::error::Error<&[u8]>)> { + fn line(&mut self, drain: bool) -> Result<Option<MccLine>, (&[u8], nom::error::Error<&[u8]>)> { let line = if self.replay_last_line { self.replay_last_line = false; &self.last_raw_line diff --git a/video/closedcaption/src/scc_parse/imp.rs b/video/closedcaption/src/scc_parse/imp.rs index 32c1bfb04..207a43b35 100644 --- a/video/closedcaption/src/scc_parse/imp.rs +++ b/video/closedcaption/src/scc_parse/imp.rs @@ -139,10 +139,7 @@ fn parse_timecode( impl State { #[allow(clippy::type_complexity)] - fn get_line( - &mut self, - drain: bool, - ) -> Result<Option<SccLine>, (&[u8], nom::error::Error<&[u8]>)> { + fn line(&mut self, drain: bool) -> Result<Option<SccLine>, (&[u8], nom::error::Error<&[u8]>)> { let line = match self.reader.get_line_with_drain(drain) { None => { return Ok(None); diff --git a/video/closedcaption/src/tttocea608/imp.rs b/video/closedcaption/src/tttocea608/imp.rs index 698fb7266..94d83392f 100644 --- a/video/closedcaption/src/tttocea608/imp.rs +++ b/video/closedcaption/src/tttocea608/imp.rs @@ -1094,7 +1094,7 @@ impl ObjectImpl for TtToCea608 { } } - fn get_property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { + fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { match pspec.name() { "mode" => { let settings = self.settings.lock().unwrap(); diff --git a/video/closedcaption/src/tttojson/imp.rs b/video/closedcaption/src/tttojson/imp.rs index d61154ee0..947d474b1 100644 --- a/video/closedcaption/src/tttojson/imp.rs +++ b/video/closedcaption/src/tttojson/imp.rs @@ -264,7 +264,7 @@ impl ObjectImpl for TtToJson { } } - fn get_property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { + fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { match pspec.name() { "mode" => { let settings = self.settings.lock().unwrap(); diff --git a/video/gif/src/gifenc/imp.rs b/video/gif/src/gifenc/imp.rs index 4f28d5b39..9df54983f 100644 --- a/video/gif/src/gifenc/imp.rs +++ b/video/gif/src/gifenc/imp.rs @@ -170,7 +170,7 @@ impl ObjectImpl for GifEnc { } } - fn get_property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { + fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { match pspec.name() { "repeat" => { let settings = self.settings.lock().unwrap(); @@ -424,7 +424,7 @@ impl GifEnc { /// Helper method that takes a gstreamer video-frame and copies it into a /// tightly packed rgb(a) buffer, ready for consumption by the gif encoder. -fn get_tightly_packed_framebuffer(frame: &gst_video::VideoFrameRef<&gst::BufferRef>) -> Vec<u8> { +fn tightly_packed_framebuffer(frame: &gst_video::VideoFrameRef<&gst::BufferRef>) -> Vec<u8> { assert_eq!(frame.n_planes(), 1); // RGB and RGBA are tightly packed let line_size = (frame.info().width() * frame.n_components()) as usize; let line_stride = frame.info().stride()[0] as usize; diff --git a/video/hsv/src/hsvdetector/imp.rs b/video/hsv/src/hsvdetector/imp.rs index 0acf28d57..468abcbb1 100644 --- a/video/hsv/src/hsvdetector/imp.rs +++ b/video/hsv/src/hsvdetector/imp.rs @@ -232,7 +232,7 @@ impl ObjectImpl for HsvDetector { // Called whenever a value of a property is read. It can be called // at any time from any thread. - fn get_property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { + fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { match pspec.name() { "hue-ref" => { let settings = self.settings.lock().unwrap(); @@ -390,7 +390,7 @@ impl BaseTransformImpl for HsvDetector { } } - fn get_unit_size(&self, _element: &Self::Type, caps: &gst::Caps) -> Option<usize> { + fn unit_size(&self, _element: &Self::Type, caps: &gst::Caps) -> Option<usize> { gst_video::VideoInfo::from_caps(caps) .map(|info| info.size()) .ok() diff --git a/video/hsv/src/hsvfilter/imp.rs b/video/hsv/src/hsvfilter/imp.rs index e509271e2..5d24235be 100644 --- a/video/hsv/src/hsvfilter/imp.rs +++ b/video/hsv/src/hsvfilter/imp.rs @@ -206,7 +206,7 @@ impl ObjectImpl for HsvFilter { // Called whenever a value of a property is read. It can be called // at any time from any thread. - fn get_property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { + fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { match pspec.name() { "hue-shift" => { let settings = self.settings.lock().unwrap(); @@ -298,7 +298,7 @@ impl BaseTransformImpl for HsvFilter { const PASSTHROUGH_ON_SAME_CAPS: bool = false; const TRANSFORM_IP_ON_PASSTHROUGH: bool = false; - fn get_unit_size(&self, _element: &Self::Type, caps: &gst::Caps) -> Option<usize> { + fn unit_size(&self, _element: &Self::Type, caps: &gst::Caps) -> Option<usize> { gst_video::VideoInfo::from_caps(caps) .map(|info| info.size()) .ok() diff --git a/video/rav1e/src/rav1enc/imp.rs b/video/rav1e/src/rav1enc/imp.rs index 8438802ee..44ae80c47 100644 --- a/video/rav1e/src/rav1enc/imp.rs +++ b/video/rav1e/src/rav1enc/imp.rs @@ -364,7 +364,7 @@ impl ObjectImpl for Rav1Enc { } } - fn get_property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { + fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { match pspec.name() { "speed-preset" => { let settings = self.settings.lock().unwrap(); diff --git a/video/rspng/src/pngenc/imp.rs b/video/rspng/src/pngenc/imp.rs index e77820be8..16c54e71f 100644 --- a/video/rspng/src/pngenc/imp.rs +++ b/video/rspng/src/pngenc/imp.rs @@ -222,7 +222,7 @@ impl ObjectImpl for PngEncoder { } } - fn get_property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { + fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { match pspec.name() { "compression-level" => { let settings = self.settings.lock(); |