mirrors/gstreamer-rs
mirrors/gstreamer-rs
1
1
Fork 1
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git synced 2025-02-27 00:06:22 +00:00
Code Issues Projects Releases Wiki Activity

Rename ChildProxy::set/get_property() to set/get_child_property() to prevent conflict with glib::ObjectExt

Browse source
This commit is contained in:
Sebastian Dröge 2017-07-31 17:14:00 +01:00
parent 96a0668c5f
commit eb567a5048
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gstreamer/src/child_proxy.rs
View file

@ -14,12 +14,12 @@ use std::ptr;
use ChildProxy; use ChildProxy;
pub trait ChildProxyExtManual { pub trait ChildProxyExtManual {
fn get_property(&self, name: &str) -> Option<glib::Value>; fn get_child_property(&self, name: &str) -> Option<glib::Value>;
fn set_property(&self, name: &str, value: &glib::Value) -> Result<(), glib::BoolError>; fn set_child_property(&self, name: &str, value: &glib::Value) -> Result<(), glib::BoolError>;
} }
impl<O: IsA<ChildProxy>> ChildProxyExtManual for O { impl<O: IsA<ChildProxy>> ChildProxyExtManual for O {
fn get_property(&self, name: &str) -> Option<glib::Value> { fn get_child_property(&self, name: &str) -> Option<glib::Value> {
unsafe { unsafe {
let found: bool = from_glib(ffi::gst_child_proxy_lookup( let found: bool = from_glib(ffi::gst_child_proxy_lookup(
self.to_glib_none().0, self.to_glib_none().0,
@ -41,7 +41,7 @@ impl<O: IsA<ChildProxy>> ChildProxyExtManual for O {
} }
} }
fn set_property(&self, name: &str, value: &glib::Value) -> Result<(), glib::BoolError> { fn set_child_property(&self, name: &str, value: &glib::Value) -> Result<(), glib::BoolError> {
unsafe { unsafe {
let found: bool = from_glib(ffi::gst_child_proxy_lookup( let found: bool = from_glib(ffi::gst_child_proxy_lookup(
self.to_glib_none().0, self.to_glib_none().0,