From 00281e98f008d6a3bcfe43e697a967272c30758b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 4 Feb 2023 16:44:40 +0200 Subject: [PATCH] gstreamer: Rename `TagSetter::add()` to `TagSetter::add_tag()` to not conflict with `Bin::add()` Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/issues/440 Part-of: --- examples/src/bin/tagsetter.rs | 3 ++- gstreamer/src/tag_setter.rs | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/src/bin/tagsetter.rs b/examples/src/bin/tagsetter.rs index 9e31f03fe..25c6ce06d 100644 --- a/examples/src/bin/tagsetter.rs +++ b/examples/src/bin/tagsetter.rs @@ -76,7 +76,8 @@ fn example_main() -> Result<(), Error> { // Set the "title" tag to "Special randomized white-noise". // The second parameter gst::TagMergeMode::Append tells the tagsetter to append this title // if there already is one. - tagsetter.add::(&"Special randomized white-noise", gst::TagMergeMode::Append); + tagsetter + .add_tag::(&"Special randomized white-noise", gst::TagMergeMode::Append); let bus = pipeline.bus().unwrap(); diff --git a/gstreamer/src/tag_setter.rs b/gstreamer/src/tag_setter.rs index 8e31d5f37..e98ea6a5f 100644 --- a/gstreamer/src/tag_setter.rs +++ b/gstreamer/src/tag_setter.rs @@ -6,11 +6,11 @@ use crate::{tags::*, TagMergeMode, TagSetter}; pub trait TagSetterExtManual: 'static { #[doc(alias = "gst_tag_setter_add_tag_value")] - fn add<'a, T: Tag<'a>>(&self, value: &T::TagType, mode: TagMergeMode); + fn add_tag<'a, T: Tag<'a>>(&self, value: &T::TagType, mode: TagMergeMode); } impl> TagSetterExtManual for O { - fn add<'a, T: Tag<'a>>(&self, value: &T::TagType, mode: TagMergeMode) { + fn add_tag<'a, T: Tag<'a>>(&self, value: &T::TagType, mode: TagMergeMode) { unsafe { let v = value.to_send_value();