use gst::glib where applicable

24 files changed, 35 insertions, 25 deletions

diff --git a/video/closedcaption/Cargo.toml b/video/closedcaption/Cargo.toml
index 2056e3978..b8d4a09b4 100644
--- a/video/closedcaption/Cargo.toml
+++ b/video/closedcaption/Cargo.toml
@@ -8,7 +8,6 @@ description = "Rust Closed Caption Plugin"
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 
 [dependencies]
-glib = { git = "https://github.com/gtk-rs/gtk-rs-core" }
 nom = "6.0"
 either = "1"
 uuid = { version = "0.8", features = ["v4"] }
diff --git a/video/closedcaption/src/ccdetect/imp.rs b/video/closedcaption/src/ccdetect/imp.rs
index 488039df1..2af76e967 100644
--- a/video/closedcaption/src/ccdetect/imp.rs
+++ b/video/closedcaption/src/ccdetect/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::{gst_trace, gst_warning};
diff --git a/video/closedcaption/src/ccdetect/mod.rs b/video/closedcaption/src/ccdetect/mod.rs
index 609609c07..4f1a83114 100644
--- a/video/closedcaption/src/ccdetect/mod.rs
+++ b/video/closedcaption/src/ccdetect/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/video/closedcaption/src/cea608overlay/imp.rs b/video/closedcaption/src/cea608overlay/imp.rs
index 7fad68609..612d6f3a3 100644
--- a/video/closedcaption/src/cea608overlay/imp.rs
+++ b/video/closedcaption/src/cea608overlay/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::{gst_error, gst_info, gst_log, gst_trace, gst_warning};
diff --git a/video/closedcaption/src/cea608overlay/mod.rs b/video/closedcaption/src/cea608overlay/mod.rs
index 21605866b..61c4ee23b 100644
--- a/video/closedcaption/src/cea608overlay/mod.rs
+++ b/video/closedcaption/src/cea608overlay/mod.rs
@@ -21,7 +21,8 @@
 //   videotestsrc ! video/x-raw, width=1280, height=720 ! queue ! ccc.sink \
 //   filesrc location=input.srt ! subparse ! tttocea608 ! queue ! ccc.caption
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod imp;
 
diff --git a/video/closedcaption/src/cea608tojson/imp.rs b/video/closedcaption/src/cea608tojson/imp.rs
index c245b51a2..9544d898d 100644
--- a/video/closedcaption/src/cea608tojson/imp.rs
+++ b/video/closedcaption/src/cea608tojson/imp.rs
@@ -25,7 +25,7 @@
 //  * The Chunk object could have an "indent" field, that would get translated
 //    to tab offsets for small bandwidth savings
 
-use glib::subclass::prelude::*;
+use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::{gst_debug, gst_error, gst_log, gst_trace, gst_warning};
diff --git a/video/closedcaption/src/cea608tojson/mod.rs b/video/closedcaption/src/cea608tojson/mod.rs
index 88a1e2a55..42bbef79f 100644
--- a/video/closedcaption/src/cea608tojson/mod.rs
+++ b/video/closedcaption/src/cea608tojson/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/video/closedcaption/src/cea608tott/imp.rs b/video/closedcaption/src/cea608tott/imp.rs
index da27a013b..0b718e737 100644
--- a/video/closedcaption/src/cea608tott/imp.rs
+++ b/video/closedcaption/src/cea608tott/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_log, gst_trace};
diff --git a/video/closedcaption/src/cea608tott/mod.rs b/video/closedcaption/src/cea608tott/mod.rs
index f825453be..dadcf01ab 100644
--- a/video/closedcaption/src/cea608tott/mod.rs
+++ b/video/closedcaption/src/cea608tott/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/video/closedcaption/src/lib.rs b/video/closedcaption/src/lib.rs
index 8c948e3fe..45ed1f422 100644
--- a/video/closedcaption/src/lib.rs
+++ b/video/closedcaption/src/lib.rs
@@ -17,6 +17,8 @@
 
 #![recursion_limit = "128"]
 
+use gst::glib;
+
 #[allow(non_camel_case_types, non_upper_case_globals, unused)]
 #[allow(clippy::redundant_static_lifetimes, clippy::unreadable_literal)]
 #[allow(clippy::useless_transmute, clippy::trivially_copy_pass_by_ref)]
diff --git a/video/closedcaption/src/mcc_enc/imp.rs b/video/closedcaption/src/mcc_enc/imp.rs
index 8fcd1c790..dcadcf9ee 100644
--- a/video/closedcaption/src/mcc_enc/imp.rs
+++ b/video/closedcaption/src/mcc_enc/imp.rs
@@ -15,8 +15,7 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
-use glib::subclass::prelude::*;
+use gst::glib;
 use gst::prelude::*;
 use gst::structure;
 use gst::subclass::prelude::*;
diff --git a/video/closedcaption/src/mcc_enc/mod.rs b/video/closedcaption/src/mcc_enc/mod.rs
index 8689e0ed9..2d9a9ac43 100644
--- a/video/closedcaption/src/mcc_enc/mod.rs
+++ b/video/closedcaption/src/mcc_enc/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 headers;
 mod imp;
diff --git a/video/closedcaption/src/mcc_parse/imp.rs b/video/closedcaption/src/mcc_parse/imp.rs
index 861bf30a4..5d4996899 100644
--- a/video/closedcaption/src/mcc_parse/imp.rs
+++ b/video/closedcaption/src/mcc_parse/imp.rs
@@ -15,8 +15,7 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
-use glib::subclass::prelude::*;
+use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::{
diff --git a/video/closedcaption/src/mcc_parse/mod.rs b/video/closedcaption/src/mcc_parse/mod.rs
index 1f5a6ed05..b4ef031dd 100644
--- a/video/closedcaption/src/mcc_parse/mod.rs
+++ b/video/closedcaption/src/mcc_parse/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;
 mod parser;
diff --git a/video/closedcaption/src/scc_enc/imp.rs b/video/closedcaption/src/scc_enc/imp.rs
index 072755005..20ec459da 100644
--- a/video/closedcaption/src/scc_enc/imp.rs
+++ b/video/closedcaption/src/scc_enc/imp.rs
@@ -16,7 +16,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::structure;
 use gst::subclass::prelude::*;
diff --git a/video/closedcaption/src/scc_enc/mod.rs b/video/closedcaption/src/scc_enc/mod.rs
index 9eb340444..e157456be 100644
--- a/video/closedcaption/src/scc_enc/mod.rs
+++ b/video/closedcaption/src/scc_enc/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/video/closedcaption/src/scc_parse/imp.rs b/video/closedcaption/src/scc_parse/imp.rs
index dccbabbab..47d5f6fbf 100644
--- a/video/closedcaption/src/scc_parse/imp.rs
+++ b/video/closedcaption/src/scc_parse/imp.rs
@@ -16,7 +16,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/video/closedcaption/src/scc_parse/mod.rs b/video/closedcaption/src/scc_parse/mod.rs
index 362a93e95..2a74e294d 100644
--- a/video/closedcaption/src/scc_parse/mod.rs
+++ b/video/closedcaption/src/scc_parse/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;
 mod parser;
diff --git a/video/closedcaption/src/tttocea608/imp.rs b/video/closedcaption/src/tttocea608/imp.rs
index 6534d2b91..a880f3ebe 100644
--- a/video/closedcaption/src/tttocea608/imp.rs
+++ b/video/closedcaption/src/tttocea608/imp.rs
@@ -15,8 +15,7 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-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, gst_warning};
diff --git a/video/closedcaption/src/tttocea608/mod.rs b/video/closedcaption/src/tttocea608/mod.rs
index 3e240132e..165490587 100644
--- a/video/closedcaption/src/tttocea608/mod.rs
+++ b/video/closedcaption/src/tttocea608/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/video/closedcaption/src/tttojson/imp.rs b/video/closedcaption/src/tttojson/imp.rs
index c3c9799a9..8b79617a3 100644
--- a/video/closedcaption/src/tttojson/imp.rs
+++ b/video/closedcaption/src/tttojson/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::gst_log;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
diff --git a/video/closedcaption/src/tttojson/mod.rs b/video/closedcaption/src/tttojson/mod.rs
index 6c1c3b411..b79be3c81 100644
--- a/video/closedcaption/src/tttojson/mod.rs
+++ b/video/closedcaption/src/tttojson/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/video/closedcaption/src/ttutils.rs b/video/closedcaption/src/ttutils.rs
index 2c3be5396..aa1c81ca8 100644
--- a/video/closedcaption/src/ttutils.rs
+++ b/video/closedcaption/src/ttutils.rs
@@ -15,6 +15,7 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
+use gst::glib;
 use serde::{Deserialize, Serialize};
 
 #[derive(
diff --git a/video/closedcaption/tests/mcc_enc.rs b/video/closedcaption/tests/mcc_enc.rs
index f8fe6016e..e438416f7 100644
--- a/video/closedcaption/tests/mcc_enc.rs
+++ b/video/closedcaption/tests/mcc_enc.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::*;
 
 use pretty_assertions::assert_eq;