use gst::glib where applicable

26 files changed, 39 insertions, 29 deletions

diff --git a/audio/audiofx/Cargo.toml b/audio/audiofx/Cargo.toml
index cc0aa8dca..94a00ec28 100644
--- a/audio/audiofx/Cargo.toml
+++ b/audio/audiofx/Cargo.toml
@@ -8,7 +8,6 @@ description = "Rust AudioFx Plugin"
 edition = "2018"
 
 [dependencies]
-glib = { git = "https://github.com/gtk-rs/gtk-rs-core" }
 gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_16"] }
 gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_16"] }
 gst-audio = { package = "gstreamer-audio", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_16"] }
diff --git a/audio/audiofx/src/audioecho/imp.rs b/audio/audiofx/src/audioecho/imp.rs
index 08b17fed3..b3524c129 100644
--- a/audio/audiofx/src/audioecho/imp.rs
+++ b/audio/audiofx/src/audioecho/imp.rs
@@ -6,7 +6,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_base::subclass::prelude::*;
diff --git a/audio/audiofx/src/audioecho/mod.rs b/audio/audiofx/src/audioecho/mod.rs
index 2cbfd6342..f33475c3b 100644
--- a/audio/audiofx/src/audioecho/mod.rs
+++ b/audio/audiofx/src/audioecho/mod.rs
@@ -6,7 +6,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;
 mod ring_buffer;
diff --git a/audio/audiofx/src/audioloudnorm/imp.rs b/audio/audiofx/src/audioloudnorm/imp.rs
index b2eb149ac..2925e7746 100644
--- a/audio/audiofx/src/audioloudnorm/imp.rs
+++ b/audio/audiofx/src/audioloudnorm/imp.rs
@@ -18,7 +18,7 @@
 // License along with FFmpeg; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-use glib::subclass::prelude::*;
+use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::{gst_debug, gst_error, gst_info, gst_log};
diff --git a/audio/audiofx/src/audioloudnorm/mod.rs b/audio/audiofx/src/audioloudnorm/mod.rs
index c49a35851..449a2a500 100644
--- a/audio/audiofx/src/audioloudnorm/mod.rs
+++ b/audio/audiofx/src/audioloudnorm/mod.rs
@@ -18,7 +18,8 @@
 // License along with FFmpeg; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod imp;
 
diff --git a/audio/audiofx/src/audiornnoise/imp.rs b/audio/audiofx/src/audiornnoise/imp.rs
index 6af68e108..42efd72f9 100644
--- a/audio/audiofx/src/audiornnoise/imp.rs
+++ b/audio/audiofx/src/audiornnoise/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};
diff --git a/audio/audiofx/src/audiornnoise/mod.rs b/audio/audiofx/src/audiornnoise/mod.rs
index 4cc4cf76d..7149f6c7e 100644
--- a/audio/audiofx/src/audiornnoise/mod.rs
+++ b/audio/audiofx/src/audiornnoise/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/audio/audiofx/src/ebur128level/imp.rs b/audio/audiofx/src/ebur128level/imp.rs
index 233ac8697..940c21d23 100644
--- a/audio/audiofx/src/ebur128level/imp.rs
+++ b/audio/audiofx/src/ebur128level/imp.rs
@@ -6,7 +6,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/audio/audiofx/src/ebur128level/mod.rs b/audio/audiofx/src/ebur128level/mod.rs
index 7df27dacc..e84beb19a 100644
--- a/audio/audiofx/src/ebur128level/mod.rs
+++ b/audio/audiofx/src/ebur128level/mod.rs
@@ -6,7 +6,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/audio/audiofx/src/lib.rs b/audio/audiofx/src/lib.rs
index 013dd4d20..1d2cc11c7 100644
--- a/audio/audiofx/src/lib.rs
+++ b/audio/audiofx/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 audioecho;
 mod audioloudnorm;
 mod audiornnoise;
diff --git a/audio/audiofx/tests/audioloudnorm.rs b/audio/audiofx/tests/audioloudnorm.rs
index 00c74746e..b81633593 100644
--- a/audio/audiofx/tests/audioloudnorm.rs
+++ b/audio/audiofx/tests/audioloudnorm.rs
@@ -14,7 +14,7 @@
 // License along with this library; if not, write to the
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
-use glib::prelude::*;
+
 use gst::prelude::*;
 
 use byte_slice_cast::*;
diff --git a/audio/audiofx/tests/ebur128level.rs b/audio/audiofx/tests/ebur128level.rs
index 057a44ef5..776014a65 100644
--- a/audio/audiofx/tests/ebur128level.rs
+++ b/audio/audiofx/tests/ebur128level.rs
@@ -6,6 +6,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use gst::glib;
 use gst::prelude::*;
 
 fn init() {
diff --git a/audio/claxon/Cargo.toml b/audio/claxon/Cargo.toml
index 20f9b7d61..05523f47c 100644
--- a/audio/claxon/Cargo.toml
+++ b/audio/claxon/Cargo.toml
@@ -8,7 +8,6 @@ description = "Claxon FLAC Decoder Plugin"
 edition = "2018"
 
 [dependencies]
-glib = { git = "https://github.com/gtk-rs/gtk-rs-core" }
 gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
 gst-audio = { package = "gstreamer-audio", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
 claxon = { version = "0.4" }
diff --git a/audio/claxon/src/claxondec/imp.rs b/audio/claxon/src/claxondec/imp.rs
index 29fcb90ee..b4e81057c 100644
--- a/audio/claxon/src/claxondec/imp.rs
+++ b/audio/claxon/src/claxondec/imp.rs
@@ -6,7 +6,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::subclass::prelude::*;
 use gst::{gst_debug, gst_error};
 use gst_audio::prelude::*;
diff --git a/audio/claxon/src/claxondec/mod.rs b/audio/claxon/src/claxondec/mod.rs
index 29f5d34d5..a9356ffc1 100644
--- a/audio/claxon/src/claxondec/mod.rs
+++ b/audio/claxon/src/claxondec/mod.rs
@@ -6,7 +6,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/audio/claxon/src/lib.rs b/audio/claxon/src/lib.rs
index 18039cd94..2476b877c 100644
--- a/audio/claxon/src/lib.rs
+++ b/audio/claxon/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 claxondec;
 
 fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> {
diff --git a/audio/csound/Cargo.toml b/audio/csound/Cargo.toml
index 349ed15a9..c809dfe48 100644
--- a/audio/csound/Cargo.toml
+++ b/audio/csound/Cargo.toml
@@ -8,7 +8,6 @@ edition = "2018"
 description = "An Audio filter plugin based on Csound"
 
 [dependencies]
-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" }
 gst-audio = { package = "gstreamer-audio", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
diff --git a/audio/csound/examples/effect_example.rs b/audio/csound/examples/effect_example.rs
index 4993555a9..2f8b78abf 100644
--- a/audio/csound/examples/effect_example.rs
+++ b/audio/csound/examples/effect_example.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::error::Error;
@@ -40,25 +39,25 @@ const CSD: &str = "
     sr = 44100
     ksmps = 7
 
-    nchnls_i = 1 
-    nchnls = 2   
+    nchnls_i = 1
+    nchnls = 2
 
     gasig  init 0
-    gidel  = 1	
+    gidel  = 1
 
     instr 1
 
         ain in
             outs ain, ain
 
-        vincr gasig, ain	
+        vincr gasig, ain
     endin
 
     instr 2
 
         ifeedback = p4
 
-        aseg linseg 1., p3, 0.0 
+        aseg linseg 1., p3, 0.0
 
         abuf2	delayr	gidel
         adelL 	deltap	.4
diff --git a/audio/csound/src/filter/imp.rs b/audio/csound/src/filter/imp.rs
index c191a62a4..08d207ad6 100644
--- a/audio/csound/src/filter/imp.rs
+++ b/audio/csound/src/filter/imp.rs
@@ -15,7 +15,7 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::subclass::prelude::*;
+use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::{
diff --git a/audio/csound/src/filter/mod.rs b/audio/csound/src/filter/mod.rs
index 702d7b888..53d083853 100644
--- a/audio/csound/src/filter/mod.rs
+++ b/audio/csound/src/filter/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/audio/csound/src/lib.rs b/audio/csound/src/lib.rs
index 2c7f15958..1e920fbe1 100644
--- a/audio/csound/src/lib.rs
+++ b/audio/csound/src/lib.rs
@@ -15,6 +15,8 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
+use gst::glib;
+
 mod filter;
 
 fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> {
diff --git a/audio/csound/tests/csound_filter.rs b/audio/csound/tests/csound_filter.rs
index 1c0547632..16907a4dd 100644
--- a/audio/csound/tests/csound_filter.rs
+++ b/audio/csound/tests/csound_filter.rs
@@ -14,7 +14,6 @@
 // License along with this library; if not, write to the
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
-use glib::prelude::*;
 use gst::prelude::*;
 
 use byte_slice_cast::*;
@@ -33,13 +32,13 @@ macro_rules! CSD {
             <CsInstruments>
             sr = 44100 ; default sample rate
             ksmps = {}
-            nchnls_i = {} 
+            nchnls_i = {}
             nchnls = {}
             0dbfs  = 1
 
-            instr 1 
+            instr 1
 
-            {} ;input	
+            {} ;input
                 {}	; csound output
 
             endin
diff --git a/audio/lewton/Cargo.toml b/audio/lewton/Cargo.toml
index 6f8638ca8..136fc74c5 100644
--- a/audio/lewton/Cargo.toml
+++ b/audio/lewton/Cargo.toml
@@ -8,7 +8,6 @@ description = "lewton Vorbis Decoder Plugin"
 edition = "2018"
 
 [dependencies]
-glib = { git = "https://github.com/gtk-rs/gtk-rs-core" }
 gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
 gst-audio = { package = "gstreamer-audio", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
 lewton = { version = "0.10", default-features = false }
diff --git a/audio/lewton/src/lewtondec/imp.rs b/audio/lewton/src/lewtondec/imp.rs
index 26cef0c56..2902d2145 100644
--- a/audio/lewton/src/lewtondec/imp.rs
+++ b/audio/lewton/src/lewtondec/imp.rs
@@ -6,7 +6,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::subclass::prelude::*;
 use gst::{gst_debug, gst_error, gst_warning};
 use gst_audio::audio_decoder_error;
diff --git a/audio/lewton/src/lewtondec/mod.rs b/audio/lewton/src/lewtondec/mod.rs
index b7cf101a7..a0e7731e1 100644
--- a/audio/lewton/src/lewtondec/mod.rs
+++ b/audio/lewton/src/lewtondec/mod.rs
@@ -6,7 +6,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/audio/lewton/src/lib.rs b/audio/lewton/src/lib.rs
index fa63d81b0..da5bb434d 100644
--- a/audio/lewton/src/lib.rs
+++ b/audio/lewton/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 lewtondec;
 
 fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> {