glib

servo · Feb 29, 2024 · 9424e94 · 9424e94
1 parent 0977825
commit 9424e94
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/backends/gstreamer/datachannel.rs b/backends/gstreamer/datachannel.rs
@@ -1,4 +1,5 @@
-use glib::{ObjectExt, ToSendValue};
+use glib::object::ObjectExt;
+use glib::value::ToSendValue;
 use gst_webrtc::{WebRTCDataChannel, WebRTCDataChannelState};
 use servo_media_webrtc::thread::InternalEvent;
 use servo_media_webrtc::WebRtcController as WebRtcThread;

diff --git a/backends/gstreamer/lib.rs b/backends/gstreamer/lib.rs
@@ -13,12 +13,12 @@ mod source;
 pub mod webrtc;
 
 use device_monitor::GStreamerDeviceMonitor;
-use glib::once_cell::sync::Lazy;
 use gst::prelude::*;
 use ipc_channel::ipc::IpcSender;
 use log::warn;
 use media_stream::GStreamerMediaStream;
 use mime::Mime;
+use once_cell::sync::Lazy;
 use once_cell::sync::OnceCell;
 use registry_scanner::GSTREAMER_REGISTRY_SCANNER;
 use servo_media::{Backend, BackendInit, SupportsMediaType};

diff --git a/backends/gstreamer/media_stream.rs b/backends/gstreamer/media_stream.rs
@@ -1,7 +1,7 @@
 use super::BACKEND_BASE_TIME;
-use glib::once_cell::sync::Lazy;
 use gst;
 use gst::prelude::*;
+use once_cell::sync::Lazy;
 use servo_media_streams::registry::{
     get_stream, register_stream, unregister_stream, MediaStreamId,
 };

diff --git a/backends/gstreamer/media_stream_source.rs b/backends/gstreamer/media_stream_source.rs
@@ -1,9 +1,9 @@
 use crate::media_stream::{GStreamerMediaStream, RTP_CAPS_OPUS, RTP_CAPS_VP8};
-use glib::once_cell::sync::Lazy;
 use glib::subclass::prelude::*;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst_base::UniqueFlowCombiner;
+use once_cell::sync::Lazy;
 use servo_media_streams::{MediaStream, MediaStreamType};
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Mutex};

diff --git a/backends/gstreamer/registry_scanner.rs b/backends/gstreamer/registry_scanner.rs
@@ -1,4 +1,4 @@
-use glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 use std::collections::HashSet;
 use std::str::FromStr;
 

diff --git a/backends/gstreamer/source.rs b/backends/gstreamer/source.rs
@@ -1,7 +1,7 @@
-use glib::once_cell::sync::Lazy;
 use glib::subclass::prelude::*;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
+use once_cell::sync::Lazy;
 use std::convert::TryFrom;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Mutex;
@@ -242,7 +242,8 @@ mod imp {
                 .expect("Could not create appsrc element");
 
             let pad_templ = klass.pad_template("src").unwrap();
-            let ghost_pad = gst::GhostPad::builder_from_template(&pad_templ).name("src")
+            let ghost_pad = gst::GhostPad::builder_from_template(&pad_templ)
+                .name("src")
                 .query_function(|pad, parent, query| {
                     ServoSrc::catch_panic_pad_function(
                         parent,