rafaelcaricio/gstreamer-rs
1
0
Fork 0
forked from mirrors/gstreamer-rs
Code Pull requests Activity

URIHandler: rename get_type

Browse source 
Avoid a conflict with the `get_type` function declared by the
`glib_object_subclass!` macro.
This commit is contained in:
François Laignel 2018-12-03 20:24:17 +01:00
parent 237fd55a4a
commit 8c3df63b95
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gstreamer/src/subclass/uri_handler.rs
View file

@ -26,7 +26,7 @@ use URIType;
pub trait URIHandlerImpl: super::element::ElementImpl + Send + Sync + 'static { pub trait URIHandlerImpl: super::element::ElementImpl + Send + Sync + 'static {
fn get_uri(&self, element: &URIHandler) -> Option<String>; fn get_uri(&self, element: &URIHandler) -> Option<String>;
fn set_uri(&self, element: &URIHandler, uri: Option<String>) -> Result<(), glib::Error>; fn set_uri(&self, element: &URIHandler, uri: Option<String>) -> Result<(), glib::Error>;
fn get_type() -> URIType; fn get_uri_type() -> URIType;
fn get_protocols() -> Vec<String>; fn get_protocols() -> Vec<String>;
} }
@ -36,7 +36,7 @@ unsafe extern "C" fn uri_handler_get_type<T: ObjectSubclass>(
where where
T: URIHandlerImpl, T: URIHandlerImpl,
{ {
<T as URIHandlerImpl>::get_type().to_glib() <T as URIHandlerImpl>::get_uri_type().to_glib()
} }
unsafe extern "C" fn uri_handler_get_protocols<T: ObjectSubclass>( unsafe extern "C" fn uri_handler_get_protocols<T: ObjectSubclass>(