diff --git a/gstreamer-app/src/app_sink.rs b/gstreamer-app/src/app_sink.rs index cd68bcaec..76470e665 100644 --- a/gstreamer-app/src/app_sink.rs +++ b/gstreamer-app/src/app_sink.rs @@ -290,7 +290,7 @@ impl AppSink { pub fn set_callbacks(&self, callbacks: AppSinkCallbacks) { use once_cell::sync::Lazy; static SET_ONCE_QUARK: Lazy = - Lazy::new(|| glib::Quark::from_string("gstreamer-rs-app-sink-callbacks")); + Lazy::new(|| glib::Quark::from_str("gstreamer-rs-app-sink-callbacks")); unsafe { let sink = self.to_glib_none().0; diff --git a/gstreamer-app/src/app_src.rs b/gstreamer-app/src/app_src.rs index f002fc8a2..58e78e142 100644 --- a/gstreamer-app/src/app_src.rs +++ b/gstreamer-app/src/app_src.rs @@ -238,7 +238,7 @@ impl AppSrc { pub fn set_callbacks(&self, callbacks: AppSrcCallbacks) { use once_cell::sync::Lazy; static SET_ONCE_QUARK: Lazy = - Lazy::new(|| glib::Quark::from_string("gstreamer-rs-app-src-callbacks")); + Lazy::new(|| glib::Quark::from_str("gstreamer-rs-app-src-callbacks")); unsafe { let src = self.to_glib_none().0; diff --git a/gstreamer-player/src/subclass/player_video_renderer.rs b/gstreamer-player/src/subclass/player_video_renderer.rs index aa96ad696..e67a232c7 100644 --- a/gstreamer-player/src/subclass/player_video_renderer.rs +++ b/gstreamer-player/src/subclass/player_video_renderer.rs @@ -58,7 +58,7 @@ unsafe extern "C" fn video_renderer_create_video_sink *mut gst::ffi::GstElement { use once_cell::sync::Lazy; static VIDEO_SINK_QUARK: Lazy = - Lazy::new(|| glib::Quark::from_string("gstreamer-rs-player-video-sink")); + Lazy::new(|| glib::Quark::from_str("gstreamer-rs-player-video-sink")); let instance = &*(video_renderer as *mut T::Instance); let imp = instance.imp(); diff --git a/gstreamer-rtsp-server/src/subclass/rtsp_media_factory.rs b/gstreamer-rtsp-server/src/subclass/rtsp_media_factory.rs index e507d8f07..cf2a92ad8 100644 --- a/gstreamer-rtsp-server/src/subclass/rtsp_media_factory.rs +++ b/gstreamer-rtsp-server/src/subclass/rtsp_media_factory.rs @@ -284,7 +284,7 @@ unsafe extern "C" fn factory_create_pipeline( use once_cell::sync::Lazy; static PIPELINE_QUARK: Lazy = - Lazy::new(|| glib::Quark::from_string("gstreamer-rs-rtsp-media-pipeline")); + Lazy::new(|| glib::Quark::from_str("gstreamer-rs-rtsp-media-pipeline")); let instance = &*(ptr as *mut T::Instance); let imp = instance.imp(); diff --git a/gstreamer-video/src/video_meta.rs b/gstreamer-video/src/video_meta.rs index ade287562..baed1f68a 100644 --- a/gstreamer-video/src/video_meta.rs +++ b/gstreamer-video/src/video_meta.rs @@ -354,7 +354,7 @@ impl VideoRegionOfInterestMeta { #[doc(alias = "get_roi_type")] pub fn roi_type<'a>(&self) -> &'a str { - unsafe { glib::Quark::from_glib(self.0.roi_type).to_string() } + unsafe { glib::Quark::from_glib(self.0.roi_type).as_str() } } #[cfg(feature = "v1_14")] diff --git a/gstreamer/src/bus.rs b/gstreamer/src/bus.rs index 1e8489a3e..daa00725b 100644 --- a/gstreamer/src/bus.rs +++ b/gstreamer/src/bus.rs @@ -191,7 +191,7 @@ impl Bus { { use once_cell::sync::Lazy; static SET_ONCE_QUARK: Lazy = - Lazy::new(|| glib::Quark::from_string("gstreamer-rs-sync-handler")); + Lazy::new(|| glib::Quark::from_str("gstreamer-rs-sync-handler")); unsafe { let bus = self.to_glib_none().0; diff --git a/gstreamer/src/structure.rs b/gstreamer/src/structure.rs index 0b1286941..787ba5a3d 100644 --- a/gstreamer/src/structure.rs +++ b/gstreamer/src/structure.rs @@ -389,7 +389,7 @@ impl StructureRef { where <>::Checker as glib::value::ValueTypeChecker>::Error: GlibValueError, { - let name = glib::Quark::from_string(name); + let name = glib::Quark::from_str(name); self.get_by_quark(name) } @@ -398,14 +398,14 @@ impl StructureRef { where <>::Checker as glib::value::ValueTypeChecker>::Error: GlibValueError, { - let name = glib::Quark::from_string(name); + let name = glib::Quark::from_str(name); self.get_optional_by_quark(name) } #[doc(alias = "get_value")] #[doc(alias = "gst_structure_get_value")] pub fn value(&self, name: &str) -> Result<&SendValue, GetError> { - let name = glib::Quark::from_string(name); + let name = glib::Quark::from_str(name); self.value_by_quark(name) } @@ -416,7 +416,7 @@ impl StructureRef { { self.value_by_quark(name)? .get() - .map_err(|err| GetError::from_value_get_error(name.to_string(), err)) + .map_err(|err| GetError::from_value_get_error(name.as_str(), err)) } #[doc(alias = "gst_structure_id_get")] @@ -431,7 +431,7 @@ impl StructureRef { .ok() .map(|v| v.get()) .transpose() - .map_err(|err| GetError::from_value_get_error(name.to_string(), err)) + .map_err(|err| GetError::from_value_get_error(name.as_str(), err)) } #[doc(alias = "gst_structure_id_get_value")] @@ -440,7 +440,7 @@ impl StructureRef { let value = ffi::gst_structure_id_get_value(&self.0, name.into_glib()); if value.is_null() { - return Err(GetError::new_field_not_found(name.to_string())); + return Err(GetError::new_field_not_found(name.as_str())); } Ok(&*(value as *const SendValue))