Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrançois Laignel <fengalin@free.fr>2021-06-03 21:20:54 +0300
committerFrançois Laignel <fengalin@free.fr>2021-06-03 21:53:16 +0300
commit8dfc872544b26aa5eaf4b12da7d9c5e0361467ca (patch)
treee314ee0cfde5930ac50a5bfd985b34d1129362b0 /generic
parent91c8fd146dd477ce744bec944395672719a13ebe (diff)
use gst::glib where applicable
Diffstat (limited to 'generic')
-rw-r--r--generic/file/Cargo.toml1
-rw-r--r--generic/file/src/file_location.rs1
-rw-r--r--generic/file/src/filesink/imp.rs2
-rw-r--r--generic/file/src/filesink/mod.rs3
-rw-r--r--generic/file/src/filesrc/imp.rs2
-rw-r--r--generic/file/src/filesrc/mod.rs3
-rw-r--r--generic/file/src/lib.rs2
-rw-r--r--generic/sodium/Cargo.toml1
-rw-r--r--generic/sodium/examples/decrypt_example.rs2
-rw-r--r--generic/sodium/examples/encrypt_example.rs2
-rw-r--r--generic/sodium/src/decrypter/imp.rs3
-rw-r--r--generic/sodium/src/decrypter/mod.rs3
-rw-r--r--generic/sodium/src/encrypter/imp.rs3
-rw-r--r--generic/sodium/src/encrypter/mod.rs3
-rw-r--r--generic/sodium/src/lib.rs2
-rw-r--r--generic/sodium/tests/decrypter.rs2
-rw-r--r--generic/sodium/tests/encrypter.rs2
-rw-r--r--generic/threadshare/Cargo.toml1
-rw-r--r--generic/threadshare/examples/benchmark.rs2
-rw-r--r--generic/threadshare/src/appsrc/imp.rs4
-rw-r--r--generic/threadshare/src/appsrc/mod.rs3
-rw-r--r--generic/threadshare/src/inputselector/imp.rs4
-rw-r--r--generic/threadshare/src/inputselector/mod.rs3
-rw-r--r--generic/threadshare/src/jitterbuffer/ffi.rs1
-rw-r--r--generic/threadshare/src/jitterbuffer/imp.rs4
-rw-r--r--generic/threadshare/src/jitterbuffer/jitterbuffer.rs3
-rw-r--r--generic/threadshare/src/jitterbuffer/mod.rs3
-rw-r--r--generic/threadshare/src/lib.rs1
-rw-r--r--generic/threadshare/src/proxy/imp.rs4
-rw-r--r--generic/threadshare/src/proxy/mod.rs3
-rw-r--r--generic/threadshare/src/queue/imp.rs4
-rw-r--r--generic/threadshare/src/queue/mod.rs3
-rw-r--r--generic/threadshare/src/socket.rs1
-rw-r--r--generic/threadshare/src/tcpclientsrc/imp.rs4
-rw-r--r--generic/threadshare/src/tcpclientsrc/mod.rs3
-rw-r--r--generic/threadshare/src/udpsink/imp.rs4
-rw-r--r--generic/threadshare/src/udpsink/mod.rs3
-rw-r--r--generic/threadshare/src/udpsrc/imp.rs4
-rw-r--r--generic/threadshare/src/udpsrc/mod.rs3
-rw-r--r--generic/threadshare/tests/appsrc.rs1
-rw-r--r--generic/threadshare/tests/inputselector.rs1
-rw-r--r--generic/threadshare/tests/pad.rs1
-rw-r--r--generic/threadshare/tests/pipeline.rs1
-rw-r--r--generic/threadshare/tests/proxy.rs1
-rw-r--r--generic/threadshare/tests/queue.rs1
-rw-r--r--generic/threadshare/tests/tcpclientsrc.rs1
-rw-r--r--generic/threadshare/tests/udpsink.rs2
-rw-r--r--generic/threadshare/tests/udpsrc.rs2
48 files changed, 55 insertions, 58 deletions
diff --git a/generic/file/Cargo.toml b/generic/file/Cargo.toml
index 7da17899e..3070d82a6 100644
--- a/generic/file/Cargo.toml
+++ b/generic/file/Cargo.toml
@@ -9,7 +9,6 @@ edition = "2018"
[dependencies]
url = "2"
-glib = { git = "https://github.com/gtk-rs/gtk-rs-core" }
gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
once_cell = "1.0"
diff --git a/generic/file/src/file_location.rs b/generic/file/src/file_location.rs
index 22d4c4071..8d567228b 100644
--- a/generic/file/src/file_location.rs
+++ b/generic/file/src/file_location.rs
@@ -1,3 +1,4 @@
+use gst::glib;
use url::Url;
use std::convert::AsRef;
diff --git a/generic/file/src/filesink/imp.rs b/generic/file/src/filesink/imp.rs
index 712bd7d7c..7a0dd9e77 100644
--- a/generic/file/src/filesink/imp.rs
+++ b/generic/file/src/filesink/imp.rs
@@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-use glib::subclass::prelude::*;
+use gst::glib;
use gst::prelude::*;
use gst::subclass::prelude::*;
use gst::{gst_debug, gst_error, gst_info, gst_trace};
diff --git a/generic/file/src/filesink/mod.rs b/generic/file/src/filesink/mod.rs
index 442b2fe21..d5fb310d4 100644
--- a/generic/file/src/filesink/mod.rs
+++ b/generic/file/src/filesink/mod.rs
@@ -8,7 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
mod imp;
diff --git a/generic/file/src/filesrc/imp.rs b/generic/file/src/filesrc/imp.rs
index 739465908..be01cb902 100644
--- a/generic/file/src/filesrc/imp.rs
+++ b/generic/file/src/filesrc/imp.rs
@@ -7,7 +7,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-use glib::subclass::prelude::*;
+use gst::glib;
use gst::prelude::*;
use gst::subclass::prelude::*;
use gst::{gst_debug, gst_error, gst_info};
diff --git a/generic/file/src/filesrc/mod.rs b/generic/file/src/filesrc/mod.rs
index caad10abf..5e7771585 100644
--- a/generic/file/src/filesrc/mod.rs
+++ b/generic/file/src/filesrc/mod.rs
@@ -7,7 +7,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
mod imp;
diff --git a/generic/file/src/lib.rs b/generic/file/src/lib.rs
index 114deab69..04fff665d 100644
--- a/generic/file/src/lib.rs
+++ b/generic/file/src/lib.rs
@@ -6,6 +6,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
+use gst::glib;
+
mod file_location;
mod filesink;
mod filesrc;
diff --git a/generic/sodium/Cargo.toml b/generic/sodium/Cargo.toml
index 7cb0f9fa6..5c0e6f0d5 100644
--- a/generic/sodium/Cargo.toml
+++ b/generic/sodium/Cargo.toml
@@ -8,7 +8,6 @@ license = "MIT"
edition = "2018"
[dependencies]
-glib = { git = "https://github.com/gtk-rs/gtk-rs-core" }
gst = { git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_14"], package="gstreamer" }
gst-base = { git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_14"], package = "gstreamer-base" }
sodiumoxide = "0.2.1"
diff --git a/generic/sodium/examples/decrypt_example.rs b/generic/sodium/examples/decrypt_example.rs
index 78817e44a..1a8a199a6 100644
--- a/generic/sodium/examples/decrypt_example.rs
+++ b/generic/sodium/examples/decrypt_example.rs
@@ -22,7 +22,7 @@
//
// SPDX-License-Identifier: MIT
-use glib::prelude::*;
+use gst::glib;
use gst::prelude::*;
use sodiumoxide::crypto::box_;
diff --git a/generic/sodium/examples/encrypt_example.rs b/generic/sodium/examples/encrypt_example.rs
index c4e6f66b6..29aa586f0 100644
--- a/generic/sodium/examples/encrypt_example.rs
+++ b/generic/sodium/examples/encrypt_example.rs
@@ -22,7 +22,7 @@
//
// SPDX-License-Identifier: MIT
-use glib::prelude::*;
+use gst::glib;
use gst::prelude::*;
use sodiumoxide::crypto::box_;
diff --git a/generic/sodium/src/decrypter/imp.rs b/generic/sodium/src/decrypter/imp.rs
index 296e96552..ce8a840a9 100644
--- a/generic/sodium/src/decrypter/imp.rs
+++ b/generic/sodium/src/decrypter/imp.rs
@@ -22,8 +22,7 @@
//
// SPDX-License-Identifier: MIT
-use glib::prelude::*;
-use glib::subclass::prelude::*;
+use gst::glib;
use gst::prelude::*;
use gst::subclass::prelude::*;
use gst::{gst_debug, gst_error, gst_log};
diff --git a/generic/sodium/src/decrypter/mod.rs b/generic/sodium/src/decrypter/mod.rs
index 96f48a09b..3875815df 100644
--- a/generic/sodium/src/decrypter/mod.rs
+++ b/generic/sodium/src/decrypter/mod.rs
@@ -22,7 +22,8 @@
//
// SPDX-License-Identifier: MIT
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
mod imp;
diff --git a/generic/sodium/src/encrypter/imp.rs b/generic/sodium/src/encrypter/imp.rs
index 849cde470..3b5bde2af 100644
--- a/generic/sodium/src/encrypter/imp.rs
+++ b/generic/sodium/src/encrypter/imp.rs
@@ -22,8 +22,7 @@
//
// SPDX-License-Identifier: MIT
-use glib::prelude::*;
-use glib::subclass::prelude::*;
+use gst::glib;
use gst::prelude::*;
use gst::subclass::prelude::*;
use gst::{gst_debug, gst_error, gst_log};
diff --git a/generic/sodium/src/encrypter/mod.rs b/generic/sodium/src/encrypter/mod.rs
index be74c5867..75a19cdef 100644
--- a/generic/sodium/src/encrypter/mod.rs
+++ b/generic/sodium/src/encrypter/mod.rs
@@ -22,7 +22,8 @@
//
// SPDX-License-Identifier: MIT
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
mod imp;
diff --git a/generic/sodium/src/lib.rs b/generic/sodium/src/lib.rs
index 32bd7b656..6266049a4 100644
--- a/generic/sodium/src/lib.rs
+++ b/generic/sodium/src/lib.rs
@@ -20,6 +20,8 @@
//
// SPDX-License-Identifier: MIT
+use gst::glib;
+
const TYPEFIND_HEADER: &[u8; 12] = b"gst-sodium10";
// `core::slice::<impl [T]>::len` is not yet stable as a const fn
// const TYPEFIND_HEADER_SIZE: usize = TYPEFIND_HEADER.len();
diff --git a/generic/sodium/tests/decrypter.rs b/generic/sodium/tests/decrypter.rs
index 864cc04c5..8feafaefd 100644
--- a/generic/sodium/tests/decrypter.rs
+++ b/generic/sodium/tests/decrypter.rs
@@ -22,7 +22,7 @@
//
// SPDX-License-Identifier: MIT
-use glib::prelude::*;
+use gst::glib;
use gst::prelude::*;
use std::sync::{Arc, Mutex};
diff --git a/generic/sodium/tests/encrypter.rs b/generic/sodium/tests/encrypter.rs
index c945b0777..e55c0aa46 100644
--- a/generic/sodium/tests/encrypter.rs
+++ b/generic/sodium/tests/encrypter.rs
@@ -22,7 +22,7 @@
//
// SPDX-License-Identifier: MIT
-use glib::prelude::*;
+use gst::glib;
use gst::prelude::*;
use once_cell::sync::Lazy;
diff --git a/generic/threadshare/Cargo.toml b/generic/threadshare/Cargo.toml
index 6e14d2075..bc04ae7be 100644
--- a/generic/threadshare/Cargo.toml
+++ b/generic/threadshare/Cargo.toml
@@ -9,7 +9,6 @@ edition = "2018"
[dependencies]
libc = "0.2"
-glib = { git = "https://github.com/gtk-rs/gtk-rs-core" }
gio = { git = "https://github.com/gtk-rs/gtk-rs-core" }
gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features=["v1_10"] }
gst-net = { package = "gstreamer-net", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
diff --git a/generic/threadshare/examples/benchmark.rs b/generic/threadshare/examples/benchmark.rs
index 86d84d21d..e01f92e09 100644
--- a/generic/threadshare/examples/benchmark.rs
+++ b/generic/threadshare/examples/benchmark.rs
@@ -15,7 +15,7 @@
// Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
// Boston, MA 02110-1335, USA.
-use glib::prelude::*;
+use gst::glib;
use gst::prelude::*;
use std::env;
diff --git a/generic/threadshare/src/appsrc/imp.rs b/generic/threadshare/src/appsrc/imp.rs
index bba794f95..bb0f622e8 100644
--- a/generic/threadshare/src/appsrc/imp.rs
+++ b/generic/threadshare/src/appsrc/imp.rs
@@ -21,9 +21,7 @@ use futures::future::BoxFuture;
use futures::lock::Mutex as FutMutex;
use futures::prelude::*;
-use glib::prelude::*;
-use glib::subclass::prelude::*;
-
+use gst::glib;
use gst::prelude::*;
use gst::subclass::prelude::*;
use gst::{gst_debug, gst_error, gst_log, gst_trace};
diff --git a/generic/threadshare/src/appsrc/mod.rs b/generic/threadshare/src/appsrc/mod.rs
index ab965eded..47de9f675 100644
--- a/generic/threadshare/src/appsrc/mod.rs
+++ b/generic/threadshare/src/appsrc/mod.rs
@@ -16,7 +16,8 @@
// Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
// Boston, MA 02110-1335, USA.
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
mod imp;
diff --git a/generic/threadshare/src/inputselector/imp.rs b/generic/threadshare/src/inputselector/imp.rs
index 4d502ff64..d5dd63702 100644
--- a/generic/threadshare/src/inputselector/imp.rs
+++ b/generic/threadshare/src/inputselector/imp.rs
@@ -19,9 +19,7 @@ use futures::future::BoxFuture;
use futures::future::{abortable, AbortHandle};
use futures::prelude::*;
-use glib::prelude::*;
-use glib::subclass::prelude::*;
-
+use gst::glib;
use gst::prelude::*;
use gst::subclass::prelude::*;
use gst::{gst_debug, gst_log, gst_trace};
diff --git a/generic/threadshare/src/inputselector/mod.rs b/generic/threadshare/src/inputselector/mod.rs
index 141a32a29..13eb2c82e 100644
--- a/generic/threadshare/src/inputselector/mod.rs
+++ b/generic/threadshare/src/inputselector/mod.rs
@@ -15,7 +15,8 @@
// Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
// Boston, MA 02110-1335, USA.
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
mod imp;
diff --git a/generic/threadshare/src/jitterbuffer/ffi.rs b/generic/threadshare/src/jitterbuffer/ffi.rs
index cc1eb41d2..5175316c7 100644
--- a/generic/threadshare/src/jitterbuffer/ffi.rs
+++ b/generic/threadshare/src/jitterbuffer/ffi.rs
@@ -16,6 +16,7 @@
// Boston, MA 02110-1335, USA.
use glib::ffi::{gboolean, gpointer, GList, GType};
+use gst::glib;
use gst::ffi::GstClockTime;
use libc::{c_int, c_uint, c_ulonglong, c_ushort, c_void};
diff --git a/generic/threadshare/src/jitterbuffer/imp.rs b/generic/threadshare/src/jitterbuffer/imp.rs
index ba0df1b1c..e89d939fb 100644
--- a/generic/threadshare/src/jitterbuffer/imp.rs
+++ b/generic/threadshare/src/jitterbuffer/imp.rs
@@ -19,9 +19,7 @@ use futures::future::BoxFuture;
use futures::future::{abortable, AbortHandle, Aborted};
use futures::prelude::*;
-use glib::prelude::*;
-use glib::subclass::prelude::*;
-
+use gst::glib;
use gst::prelude::*;
use gst::subclass::prelude::*;
use gst::{gst_debug, gst_error, gst_info, gst_log, gst_trace};
diff --git a/generic/threadshare/src/jitterbuffer/jitterbuffer.rs b/generic/threadshare/src/jitterbuffer/jitterbuffer.rs
index aca555f3c..67e244026 100644
--- a/generic/threadshare/src/jitterbuffer/jitterbuffer.rs
+++ b/generic/threadshare/src/jitterbuffer/jitterbuffer.rs
@@ -19,8 +19,9 @@ use super::ffi;
use std::ptr;
-use glib::prelude::*;
use glib::translate::*;
+use gst::glib;
+use gst::prelude::*;
use std::mem;
diff --git a/generic/threadshare/src/jitterbuffer/mod.rs b/generic/threadshare/src/jitterbuffer/mod.rs
index 693d7f4a7..579048853 100644
--- a/generic/threadshare/src/jitterbuffer/mod.rs
+++ b/generic/threadshare/src/jitterbuffer/mod.rs
@@ -15,7 +15,8 @@
// Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
// Boston, MA 02110-1335, USA.
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
mod ffi;
mod imp;
diff --git a/generic/threadshare/src/lib.rs b/generic/threadshare/src/lib.rs
index c319f675f..eab19956f 100644
--- a/generic/threadshare/src/lib.rs
+++ b/generic/threadshare/src/lib.rs
@@ -41,6 +41,7 @@ mod proxy;
mod queue;
use glib::translate::*;
+use gst::glib;
fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> {
udpsrc::register(plugin)?;
diff --git a/generic/threadshare/src/proxy/imp.rs b/generic/threadshare/src/proxy/imp.rs
index 8cbd61aa4..4ee74019d 100644
--- a/generic/threadshare/src/proxy/imp.rs
+++ b/generic/threadshare/src/proxy/imp.rs
@@ -19,9 +19,7 @@ use futures::channel::oneshot;
use futures::future::BoxFuture;
use futures::prelude::*;
-use glib::prelude::*;
-use glib::subclass::prelude::*;
-
+use gst::glib;
use gst::prelude::*;
use gst::subclass::prelude::*;
use gst::{gst_debug, gst_error, gst_log, gst_trace};
diff --git a/generic/threadshare/src/proxy/mod.rs b/generic/threadshare/src/proxy/mod.rs
index 417267a65..4351ff7d9 100644
--- a/generic/threadshare/src/proxy/mod.rs
+++ b/generic/threadshare/src/proxy/mod.rs
@@ -15,7 +15,8 @@
// Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
// Boston, MA 02110-1335, USA.
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
mod imp;
diff --git a/generic/threadshare/src/queue/imp.rs b/generic/threadshare/src/queue/imp.rs
index afe843a59..cc62a0fa6 100644
--- a/generic/threadshare/src/queue/imp.rs
+++ b/generic/threadshare/src/queue/imp.rs
@@ -19,9 +19,7 @@ use futures::channel::oneshot;
use futures::future::BoxFuture;
use futures::prelude::*;
-use glib::prelude::*;
-use glib::subclass::prelude::*;
-
+use gst::glib;
use gst::prelude::*;
use gst::subclass::prelude::*;
use gst::{gst_debug, gst_error, gst_log, gst_trace};
diff --git a/generic/threadshare/src/queue/mod.rs b/generic/threadshare/src/queue/mod.rs
index ccf8cb406..5fc0e57c3 100644
--- a/generic/threadshare/src/queue/mod.rs
+++ b/generic/threadshare/src/queue/mod.rs
@@ -15,7 +15,8 @@
// Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
// Boston, MA 02110-1335, USA.
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
mod imp;
diff --git a/generic/threadshare/src/socket.rs b/generic/threadshare/src/socket.rs
index 2e7046749..169a62d31 100644
--- a/generic/threadshare/src/socket.rs
+++ b/generic/threadshare/src/socket.rs
@@ -18,6 +18,7 @@
use futures::future::BoxFuture;
+use gst::glib;
use gst::prelude::*;
use gst::{gst_debug, gst_error, gst_log};
diff --git a/generic/threadshare/src/tcpclientsrc/imp.rs b/generic/threadshare/src/tcpclientsrc/imp.rs
index a6dedd524..2d5808973 100644
--- a/generic/threadshare/src/tcpclientsrc/imp.rs
+++ b/generic/threadshare/src/tcpclientsrc/imp.rs
@@ -20,9 +20,7 @@ use futures::future::BoxFuture;
use futures::lock::Mutex as FutMutex;
use futures::prelude::*;
-use glib::prelude::*;
-use glib::subclass::prelude::*;
-
+use gst::glib;
use gst::prelude::*;
use gst::subclass::prelude::*;
use gst::{gst_debug, gst_error, gst_log, gst_trace};
diff --git a/generic/threadshare/src/tcpclientsrc/mod.rs b/generic/threadshare/src/tcpclientsrc/mod.rs
index e34cd4e2f..7e8d12aa8 100644
--- a/generic/threadshare/src/tcpclientsrc/mod.rs
+++ b/generic/threadshare/src/tcpclientsrc/mod.rs
@@ -16,7 +16,8 @@
// Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
// Boston, MA 02110-1335, USA.
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
mod imp;
diff --git a/generic/threadshare/src/udpsink/imp.rs b/generic/threadshare/src/udpsink/imp.rs
index fc5c89171..2a6f96b74 100644
--- a/generic/threadshare/src/udpsink/imp.rs
+++ b/generic/threadshare/src/udpsink/imp.rs
@@ -20,9 +20,7 @@ use futures::future::BoxFuture;
use futures::lock::Mutex;
use futures::prelude::*;
-use glib::prelude::*;
-use glib::subclass::prelude::*;
-
+use gst::glib;
use gst::prelude::*;
use gst::subclass::prelude::*;
use gst::EventView;
diff --git a/generic/threadshare/src/udpsink/mod.rs b/generic/threadshare/src/udpsink/mod.rs
index 1776694a5..ceff6b02a 100644
--- a/generic/threadshare/src/udpsink/mod.rs
+++ b/generic/threadshare/src/udpsink/mod.rs
@@ -15,7 +15,8 @@
// Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
// Boston, MA 02110-1335, USA.
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
mod imp;
diff --git a/generic/threadshare/src/udpsrc/imp.rs b/generic/threadshare/src/udpsrc/imp.rs
index d0b9dcfcf..347cc4445 100644
--- a/generic/threadshare/src/udpsrc/imp.rs
+++ b/generic/threadshare/src/udpsrc/imp.rs
@@ -19,9 +19,7 @@ use futures::future::BoxFuture;
use futures::lock::Mutex as FutMutex;
use futures::prelude::*;
-use glib::prelude::*;
-use glib::subclass::prelude::*;
-
+use gst::glib;
use gst::prelude::*;
use gst::subclass::prelude::*;
use gst::{gst_debug, gst_error, gst_log, gst_trace};
diff --git a/generic/threadshare/src/udpsrc/mod.rs b/generic/threadshare/src/udpsrc/mod.rs
index 37ffb0d10..cdb7c3d25 100644
--- a/generic/threadshare/src/udpsrc/mod.rs
+++ b/generic/threadshare/src/udpsrc/mod.rs
@@ -15,7 +15,8 @@
// Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
// Boston, MA 02110-1335, USA.
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
mod imp;
diff --git a/generic/threadshare/tests/appsrc.rs b/generic/threadshare/tests/appsrc.rs
index a6712b683..387c9e754 100644
--- a/generic/threadshare/tests/appsrc.rs
+++ b/generic/threadshare/tests/appsrc.rs
@@ -15,7 +15,6 @@
// Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
// Boston, MA 02110-1335, USA.
-use glib::prelude::*;
use gst::prelude::*;
fn init() {
diff --git a/generic/threadshare/tests/inputselector.rs b/generic/threadshare/tests/inputselector.rs
index 90a7ceb45..7f7dc8260 100644
--- a/generic/threadshare/tests/inputselector.rs
+++ b/generic/threadshare/tests/inputselector.rs
@@ -15,7 +15,6 @@
// Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
// Boston, MA 02110-1335, USA.
-use glib::prelude::*;
use gst::prelude::*;
fn init() {
diff --git a/generic/threadshare/tests/pad.rs b/generic/threadshare/tests/pad.rs
index f23a5f9df..686a6f484 100644
--- a/generic/threadshare/tests/pad.rs
+++ b/generic/threadshare/tests/pad.rs
@@ -22,6 +22,7 @@ use futures::lock::Mutex as FutMutex;
use futures::prelude::*;
use glib::GBoxed;
+use gst::glib;
use gst::prelude::*;
use gst::subclass::prelude::*;
diff --git a/generic/threadshare/tests/pipeline.rs b/generic/threadshare/tests/pipeline.rs
index 30b91520a..321da1390 100644
--- a/generic/threadshare/tests/pipeline.rs
+++ b/generic/threadshare/tests/pipeline.rs
@@ -15,6 +15,7 @@
// Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
// Boston, MA 02110-1335, USA.
+use gst::glib;
use gst::prelude::*;
use gst::{gst_debug, gst_error};
diff --git a/generic/threadshare/tests/proxy.rs b/generic/threadshare/tests/proxy.rs
index 319e812ee..5c2b28df8 100644
--- a/generic/threadshare/tests/proxy.rs
+++ b/generic/threadshare/tests/proxy.rs
@@ -15,7 +15,6 @@
// Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
// Boston, MA 02110-1335, USA.
-use glib::prelude::*;
use gst::prelude::*;
use std::sync::{Arc, Mutex};
diff --git a/generic/threadshare/tests/queue.rs b/generic/threadshare/tests/queue.rs
index bf0ce17bf..f107ff50e 100644
--- a/generic/threadshare/tests/queue.rs
+++ b/generic/threadshare/tests/queue.rs
@@ -15,7 +15,6 @@
// Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
// Boston, MA 02110-1335, USA.
-use glib::prelude::*;
use gst::prelude::*;
use std::sync::{Arc, Mutex};
diff --git a/generic/threadshare/tests/tcpclientsrc.rs b/generic/threadshare/tests/tcpclientsrc.rs
index 55f2df1de..c60417bfe 100644
--- a/generic/threadshare/tests/tcpclientsrc.rs
+++ b/generic/threadshare/tests/tcpclientsrc.rs
@@ -16,7 +16,6 @@
// Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
// Boston, MA 02110-1335, USA.
-use glib::prelude::*;
use gst::prelude::*;
use std::io::Write;
diff --git a/generic/threadshare/tests/udpsink.rs b/generic/threadshare/tests/udpsink.rs
index b5670a411..4590ceef7 100644
--- a/generic/threadshare/tests/udpsink.rs
+++ b/generic/threadshare/tests/udpsink.rs
@@ -17,7 +17,7 @@
use std::thread;
-use glib::prelude::*;
+use gst::prelude::*;
fn init() {
use std::sync::Once;
diff --git a/generic/threadshare/tests/udpsrc.rs b/generic/threadshare/tests/udpsrc.rs
index 5eac57541..095c89c71 100644
--- a/generic/threadshare/tests/udpsrc.rs
+++ b/generic/threadshare/tests/udpsrc.rs
@@ -15,7 +15,7 @@
// Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
// Boston, MA 02110-1335, USA.
-use glib::prelude::*;
+use gst::prelude::*;
use std::thread;