diff options
204 files changed, 306 insertions, 245 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> { 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; diff --git a/net/reqwest/Cargo.toml b/net/reqwest/Cargo.toml index 65a8d2d7e..7ac9f3142 100644 --- a/net/reqwest/Cargo.toml +++ b/net/reqwest/Cargo.toml @@ -9,7 +9,6 @@ edition = "2018" [dependencies] url = "2.1" -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } reqwest = { version = "0.11", features = ["cookies", "gzip"] } futures = "0.3" hyperx = "1.0" diff --git a/net/reqwest/src/lib.rs b/net/reqwest/src/lib.rs index a43041d69..915c62eab 100644 --- a/net/reqwest/src/lib.rs +++ b/net/reqwest/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 reqwesthttpsrc; fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> { diff --git a/net/reqwest/src/reqwesthttpsrc/imp.rs b/net/reqwest/src/reqwesthttpsrc/imp.rs index 46e3aeeff..0b46ccd7a 100644 --- a/net/reqwest/src/reqwesthttpsrc/imp.rs +++ b/net/reqwest/src/reqwesthttpsrc/imp.rs @@ -17,7 +17,7 @@ use url::Url; use once_cell::sync::Lazy; -use glib::subclass::prelude::*; +use gst::glib; use gst::prelude::*; use gst::subclass::prelude::*; use gst::{gst_debug, gst_error, gst_trace, gst_warning}; diff --git a/net/reqwest/src/reqwesthttpsrc/mod.rs b/net/reqwest/src/reqwesthttpsrc/mod.rs index 9f5c35c89..be4fd1ddf 100644 --- a/net/reqwest/src/reqwesthttpsrc/mod.rs +++ b/net/reqwest/src/reqwesthttpsrc/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/net/reqwest/tests/reqwesthttpsrc.rs b/net/reqwest/tests/reqwesthttpsrc.rs index 6eb7c9e0b..e30323d23 100644 --- a/net/reqwest/tests/reqwesthttpsrc.rs +++ b/net/reqwest/tests/reqwesthttpsrc.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::*; use std::sync::mpsc; diff --git a/net/rusoto/Cargo.toml b/net/rusoto/Cargo.toml index ad3163d1a..d8176ab79 100644 --- a/net/rusoto/Cargo.toml +++ b/net/rusoto/Cargo.toml @@ -12,7 +12,6 @@ edition = "2018" [dependencies] bytes = "1.0" futures = "0.3" -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_12"] } gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_12"] } rusoto_core = "0.46" diff --git a/net/rusoto/src/aws_transcriber/imp.rs b/net/rusoto/src/aws_transcriber/imp.rs index 5ef5c8569..ba5482464 100644 --- a/net/rusoto/src/aws_transcriber/imp.rs +++ b/net/rusoto/src/aws_transcriber/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/net/rusoto/src/aws_transcriber/mod.rs b/net/rusoto/src/aws_transcriber/mod.rs index 20ddb1eb6..b4fdf2703 100644 --- a/net/rusoto/src/aws_transcriber/mod.rs +++ b/net/rusoto/src/aws_transcriber/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 packet; diff --git a/net/rusoto/src/lib.rs b/net/rusoto/src/lib.rs index 46fff0237..91f11bb0b 100644 --- a/net/rusoto/src/lib.rs +++ b/net/rusoto/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 aws_transcriber; mod s3sink; mod s3src; diff --git a/net/rusoto/src/s3sink/imp.rs b/net/rusoto/src/s3sink/imp.rs index c02e91f5a..6ee2550cc 100644 --- a/net/rusoto/src/s3sink/imp.rs +++ b/net/rusoto/src/s3sink/imp.rs @@ -6,9 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use glib::prelude::*; -use glib::subclass::prelude::*; - +use gst::glib; use gst::prelude::*; use gst::subclass::prelude::*; use gst::{gst_error, gst_info, gst_trace}; diff --git a/net/rusoto/src/s3sink/mod.rs b/net/rusoto/src/s3sink/mod.rs index a9c96bcdc..57dc6a1d6 100644 --- a/net/rusoto/src/s3sink/mod.rs +++ b/net/rusoto/src/s3sink/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/net/rusoto/src/s3src/imp.rs b/net/rusoto/src/s3src/imp.rs index 07cb4ab05..53b2bc3bc 100644 --- a/net/rusoto/src/s3src/imp.rs +++ b/net/rusoto/src/s3src/imp.rs @@ -13,9 +13,8 @@ use futures::future; use once_cell::sync::Lazy; use rusoto_s3::*; -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}; diff --git a/net/rusoto/src/s3src/mod.rs b/net/rusoto/src/s3src/mod.rs index 941738aca..2d22df23d 100644 --- a/net/rusoto/src/s3src/mod.rs +++ b/net/rusoto/src/s3src/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/text/json/Cargo.toml b/text/json/Cargo.toml index 59b7641cd..14a606181 100644 --- a/text/json/Cargo.toml +++ b/text/json/Cargo.toml @@ -8,7 +8,6 @@ description = "Rust JSON Plugin" repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" [dependencies] -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } once_cell = "1.0" serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0", features = ["raw_value"] } diff --git a/text/json/src/jsongstenc/imp.rs b/text/json/src/jsongstenc/imp.rs index 090dabf8e..e427f6315 100644 --- a/text/json/src/jsongstenc/imp.rs +++ b/text/json/src/jsongstenc/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_log, gst_trace}; diff --git a/text/json/src/jsongstenc/mod.rs b/text/json/src/jsongstenc/mod.rs index b3fdb56b8..81a9aa15b 100644 --- a/text/json/src/jsongstenc/mod.rs +++ b/text/json/src/jsongstenc/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/text/json/src/jsongstparse/imp.rs b/text/json/src/jsongstparse/imp.rs index 02f936831..cbb224814 100644 --- a/text/json/src/jsongstparse/imp.rs +++ b/text/json/src/jsongstparse/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_info, gst_log, gst_trace, gst_warning}; diff --git a/text/json/src/jsongstparse/mod.rs b/text/json/src/jsongstparse/mod.rs index cc7eeda39..b40996d7c 100644 --- a/text/json/src/jsongstparse/mod.rs +++ b/text/json/src/jsongstparse/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/text/json/src/lib.rs b/text/json/src/lib.rs index 4d910698a..2187b2365 100644 --- a/text/json/src/lib.rs +++ b/text/json/src/lib.rs @@ -17,6 +17,8 @@ #![recursion_limit = "128"] +use gst::glib; + mod jsongstenc; mod jsongstparse; mod line_reader; diff --git a/text/regex/Cargo.toml b/text/regex/Cargo.toml index 563c7d957..ce2e74142 100644 --- a/text/regex/Cargo.toml +++ b/text/regex/Cargo.toml @@ -8,7 +8,6 @@ description = "Rust Regular Expression Plugin" repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" [dependencies] -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } once_cell = "1.0" regex = "1" diff --git a/text/regex/src/gstregex/imp.rs b/text/regex/src/gstregex/imp.rs index 99f50c37f..88e45b3da 100644 --- a/text/regex/src/gstregex/imp.rs +++ b/text/regex/src/gstregex/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::gst_error; use gst::prelude::*; use gst::subclass::prelude::*; diff --git a/text/regex/src/gstregex/mod.rs b/text/regex/src/gstregex/mod.rs index 45355aa1a..6884bb30c 100644 --- a/text/regex/src/gstregex/mod.rs +++ b/text/regex/src/gstregex/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/text/regex/src/lib.rs b/text/regex/src/lib.rs index 7389d8a3c..ae781132e 100644 --- a/text/regex/src/lib.rs +++ b/text/regex/src/lib.rs @@ -17,6 +17,8 @@ #![recursion_limit = "128"] +use gst::glib; + mod gstregex; fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> { diff --git a/text/regex/tests/regex.rs b/text/regex/tests/regex.rs index 273dbdf40..4826f06dd 100644 --- a/text/regex/tests/regex.rs +++ b/text/regex/tests/regex.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::*; fn init() { use std::sync::Once; diff --git a/text/wrap/Cargo.toml b/text/wrap/Cargo.toml index 07f523cf7..4c8831fec 100644 --- a/text/wrap/Cargo.toml +++ b/text/wrap/Cargo.toml @@ -8,7 +8,6 @@ description = "Rust Text Wrap Plugin" repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" [dependencies] -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } once_cell = "1.0" textwrap = { version = "0.13.2", features = ["hyphenation"] } hyphenation = "0.8" diff --git a/text/wrap/src/gsttextwrap/imp.rs b/text/wrap/src/gsttextwrap/imp.rs index 34361497d..861c2d5cb 100644 --- a/text/wrap/src/gsttextwrap/imp.rs +++ b/text/wrap/src/gsttextwrap/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_info, gst_log}; diff --git a/text/wrap/src/gsttextwrap/mod.rs b/text/wrap/src/gsttextwrap/mod.rs index 6b5acef21..5d9554f58 100644 --- a/text/wrap/src/gsttextwrap/mod.rs +++ b/text/wrap/src/gsttextwrap/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/text/wrap/src/lib.rs b/text/wrap/src/lib.rs index c9cf7863b..3dc8b2012 100644 --- a/text/wrap/src/lib.rs +++ b/text/wrap/src/lib.rs @@ -17,6 +17,8 @@ #![recursion_limit = "128"] +use gst::glib; + mod gsttextwrap; fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> { diff --git a/text/wrap/tests/textwrap.rs b/text/wrap/tests/textwrap.rs index f346e736b..74c18d6f5 100644 --- a/text/wrap/tests/textwrap.rs +++ b/text/wrap/tests/textwrap.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::*; fn init() { use std::sync::Once; diff --git a/tutorial/Cargo.toml b/tutorial/Cargo.toml index 63dde7293..551db4cb7 100644 --- a/tutorial/Cargo.toml +++ b/tutorial/Cargo.toml @@ -8,7 +8,6 @@ edition = "2018" description = "Rust Tutorial Plugin" [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-video = { package = "gstreamer-video", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } diff --git a/tutorial/src/identity/imp.rs b/tutorial/src/identity/imp.rs index 6b56e1b53..6f12f6782 100644 --- a/tutorial/src/identity/imp.rs +++ b/tutorial/src/identity/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_log, gst_trace}; diff --git a/tutorial/src/identity/mod.rs b/tutorial/src/identity/mod.rs index d7d45183a..15d18158b 100644 --- a/tutorial/src/identity/mod.rs +++ b/tutorial/src/identity/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/tutorial/src/lib.rs b/tutorial/src/lib.rs index f1ce2dd28..bb3ff865e 100644 --- a/tutorial/src/lib.rs +++ b/tutorial/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 identity; mod progressbin; mod rgb2gray; diff --git a/tutorial/src/progressbin/imp.rs b/tutorial/src/progressbin/imp.rs index 94a3909fd..47bab498d 100644 --- a/tutorial/src/progressbin/imp.rs +++ b/tutorial/src/progressbin/imp.rs @@ -6,8 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use glib::prelude::*; -use glib::subclass::prelude::*; +use gst::glib; use gst::gst_info; use gst::prelude::*; use gst::subclass::prelude::*; diff --git a/tutorial/src/progressbin/mod.rs b/tutorial/src/progressbin/mod.rs index d4f940f76..0e38f75a9 100644 --- a/tutorial/src/progressbin/mod.rs +++ b/tutorial/src/progressbin/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/tutorial/src/rgb2gray/imp.rs b/tutorial/src/rgb2gray/imp.rs index ef76f866b..3f5e724dc 100644 --- a/tutorial/src/rgb2gray/imp.rs +++ b/tutorial/src/rgb2gray/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_info}; diff --git a/tutorial/src/rgb2gray/mod.rs b/tutorial/src/rgb2gray/mod.rs index 988904d7d..28faa28d0 100644 --- a/tutorial/src/rgb2gray/mod.rs +++ b/tutorial/src/rgb2gray/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/tutorial/src/sinesrc/imp.rs b/tutorial/src/sinesrc/imp.rs index 7195e550e..b3556a241 100644 --- a/tutorial/src/sinesrc/imp.rs +++ b/tutorial/src/sinesrc/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, gst_log}; diff --git a/tutorial/src/sinesrc/mod.rs b/tutorial/src/sinesrc/mod.rs index 8e3964997..7342f268c 100644 --- a/tutorial/src/sinesrc/mod.rs +++ b/tutorial/src/sinesrc/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/tutorial/tutorial-1.md b/tutorial/tutorial-1.md index 68d95ec1d..2e2c3ec00 100644 --- a/tutorial/tutorial-1.md +++ b/tutorial/tutorial-1.md @@ -10,18 +10,17 @@ The final code for this plugin can be found [here](https://gitlab.freedesktop.or # Table of contents -1. [Project Structure](#project-structure) -1. [Plugin Initialization](#plugin-initialization) -1. [Type Registration](#type-registration) -1. [Type Class and Instance Initialization](#type-class-and-instance-initialization) -1. [Caps and Pad Templates](#caps-and-pad-templates) -1. [Caps Handling Part 1](#caps-handling-part-1) -1. [Caps Handling Part 2](#caps-handling-part-2) -1. [Conversion of BGRx Video Frames to Grayscale](#conversion-of-bgrx-video-frames-to-grayscale) -1. [Testing the new element](#testing-the-new-element) -1. [Properties](#properties) -1. [What next](#what-next) - + 1. [Project Structure](#project-structure) + 2. [Plugin Initialization](#plugin-initialization) + 3. [Type Registration](#type-registration) + 4. [Type Class and Instance Initialization](#type-class-and-instance-initialization) + 5. [Caps and Pad Templates](#caps-and-pad-templates) + 6. [Caps Handling Part 1](#caps-handling-part-1) + 7. [Caps Handling Part 2](#caps-handling-part-2) + 8. [Conversion of BGRx Video Frames to Grayscale](#conversion-of-bgrx-video-frames-to-grayscale) + 9. [Testing the new element](#testing-the-new-element) + 10. [Properties](#properties) + 11. [What next](#what-next) ## Project Structure @@ -41,7 +40,6 @@ edition = "2018" description = "Rust Tutorial Plugin" [dependencies] -glib = { git = "https://github.com/gtk-rs/glib" } 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-video = { package = "gstreamer-video", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } @@ -91,15 +89,16 @@ gst::plugin_define!( GStreamer requires this information to be statically available in the shared library, not returned by a function. The static plugin metadata that we provide here is -1. name of the plugin -1. short description for the plugin -1. name of the plugin entry point function -1. version number of the plugin -1. license of the plugin (only a fixed set of licenses is allowed here, [see](https://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPlugin.html#GstPluginDesc)) -1. source package name -1. binary package name (only really makes sense for e.g. Linux distributions) -1. origin of the plugin -1. release date of this version + + 1. name of the plugin + 1. short description for the plugin + 1. name of the plugin entry point function + 1. version number of the plugin + 1. license of the plugin (only a fixed set of licenses is allowed here, [see](https://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPlugin.html#GstPluginDesc)) + 1. source package name + 1. binary package name (only really makes sense for e.g. Linux distributions) + 1. origin of the plugin + 1. release date of this version Next we create `build.rs` in the project main directory. @@ -133,6 +132,8 @@ gst-inspect-1.0 target/debug/libgstrstutorial.so As a next step, we’re going to add another module `rgb2gray` to our project, and call a function called `register` from our `plugin_init` function. ```rust +use gst::glib; + mod rgb2gray; fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> { @@ -144,11 +145,7 @@ fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> { With that our `src/lib.rs` is complete, and all following code is only in `src/rgb2gray/imp.rs`. At the top of the new file we first need to add various `use-directives` to import various types, macros and functions we’re going to use into the current module’s scope. ```rust -use glib::subclass; -use glib::subclass::prelude::*; - -use gst::prelude::*; -use gst::subclass::prelude::*; +use gst::glib; use gst::{gst_debug, gst_info}; use gst_base::subclass::prelude::*; @@ -163,6 +160,8 @@ GStreamer is based on the GLib object system ([GObject](https://developer.gnome. So, as a next step we need to register a new type for our RGB to Grayscale converter GStreamer element with the GObject type system, and then register that type with GStreamer to be able to create new instances of it. We do this with the following code ```rust +use gst::glib; + #[derive(Default)] pub struct Rgb2Gray {} @@ -183,11 +182,11 @@ This defines a struct `Rgb2Gray` which is empty for now and an empty implementat We also add the following code is in `src/rgb2gray/mod.rs`: ```rust -use glib::prelude::*; +use gst::glib; +use gst::prelude::*; mod imp; -// The public Rust wrapper type for our element glib::wrapper! { pub struct Rgb2Gray(ObjectSubclass<imp::Rgb2Gray>) @extends gst_base::BaseTransform, gst::Element, gst::Object; } @@ -220,6 +219,8 @@ In addition, we also define a `register` function (the one that is already calle As a next step we implement the `new` funtion and `class_init` functions. In the first version, this struct is empty for now but we will later use it to store all state of our element. ```rust +use gst::glib; + #[derive(Default)] pub struct Rgb2Gray {} @@ -286,10 +287,12 @@ impl BaseTransformImpl for Rgb2Gray {} ``` ```rust -use glib::prelude::*; +use gst::glib; +use gst::prelude::*; mod imp; +// The public Rust wrapper type for our element glib::wrapper! { pub struct Rgb2Gray(ObjectSubclass<imp::Rgb2Gray>) @extends gst_base::BaseTransform, gst::Element, gst::Object; } diff --git a/tutorial/tutorial-2.md b/tutorial/tutorial-2.md index dfa0e56ba..cc3afac37 100644 --- a/tutorial/tutorial-2.md +++ b/tutorial/tutorial-2.md @@ -4,12 +4,12 @@ In this part, a raw audio sine wave source element is going to be written. The f ### Table of Contents -1. [Boilerplate](#boilerplate) -2. [Caps Negotiation](#caps-negotiation) -3. [Buffer Creation](#buffer-creation) -4. [(Pseudo) Live Mode](#pseudo-live-mode) -5. [Unlocking](#unlocking) -6. [Seeking](#seeking) + 1. [Boilerplate](#boilerplate) + 2. [Caps Negotiation](#caps-negotiation) + 3. [Buffer Creation](#buffer-creation) + 4. [(Pseudo) Live Mode](#pseudo-live-mode) + 5. [Unlocking](#unlocking) + 6. [Seeking](#seeking) ### Boilerplate @@ -22,8 +22,7 @@ So let's get started with all the boilerplate. This time our element will be bas In `src/sinesrc/imp.rs`: ```rust -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}; @@ -366,7 +365,8 @@ impl BaseSrcImpl for SineSrc { In `src/sinesrc/mod.rs`: ```rust -use glib::prelude::*; +use gst::glib; +use gst::prelude::*; mod imp; diff --git a/utils/fallbackswitch/Cargo.toml b/utils/fallbackswitch/Cargo.toml index 219fbd9a0..36fa114b9 100644 --- a/utils/fallbackswitch/Cargo.toml +++ b/utils/fallbackswitch/Cargo.toml @@ -9,7 +9,6 @@ description = "Fallback Switcher Plugin" [dependencies] libc = { version = "0.2", optional = true } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_14"] } 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_14"] } diff --git a/utils/fallbackswitch/examples/gtk_fallbackswitch.rs b/utils/fallbackswitch/examples/gtk_fallbackswitch.rs index c86cdbfa2..bf781b6b7 100644 --- a/utils/fallbackswitch/examples/gtk_fallbackswitch.rs +++ b/utils/fallbackswitch/examples/gtk_fallbackswitch.rs @@ -17,6 +17,7 @@ use gio::prelude::*; +use gst::glib; use gst::prelude::*; use gtk::prelude::*; diff --git a/utils/fallbackswitch/src/base/aggregator.rs b/utils/fallbackswitch/src/base/aggregator.rs index 78d794110..5b0579036 100644 --- a/utils/fallbackswitch/src/base/aggregator.rs +++ b/utils/fallbackswitch/src/base/aggregator.rs @@ -8,11 +8,12 @@ use super::ffi; use super::Aggregator; -use glib::prelude::*; use glib::signal::{connect_raw, SignalHandlerId}; use glib::translate::*; use glib::IsA; use glib::Value; +use gst::glib; +use gst::prelude::*; use std::boxed::Box as Box_; use std::mem; use std::ptr; diff --git a/utils/fallbackswitch/src/base/aggregator_pad.rs b/utils/fallbackswitch/src/base/aggregator_pad.rs index ecdbd4d03..a9ca17c9d 100644 --- a/utils/fallbackswitch/src/base/aggregator_pad.rs +++ b/utils/fallbackswitch/src/base/aggregator_pad.rs @@ -10,6 +10,7 @@ use super::ffi; use super::AggregatorPad; use glib::object::IsA; use glib::translate::*; +use gst::glib; pub trait AggregatorPadExtManual: 'static { fn segment(&self) -> gst::Segment; diff --git a/utils/fallbackswitch/src/base/auto/aggregator.rs b/utils/fallbackswitch/src/base/auto/aggregator.rs index 8c570ec06..66f6b9ad4 100644 --- a/utils/fallbackswitch/src/base/auto/aggregator.rs +++ b/utils/fallbackswitch/src/base/auto/aggregator.rs @@ -10,6 +10,7 @@ use glib::signal::connect_raw; use glib::signal::SignalHandlerId; use glib::translate::*; use glib::StaticType; +use gst::glib; use std::boxed::Box as Box_; use std::mem::transmute; diff --git a/utils/fallbackswitch/src/base/auto/aggregator_pad.rs b/utils/fallbackswitch/src/base/auto/aggregator_pad.rs index b9c3c92f9..fe7204dea 100644 --- a/utils/fallbackswitch/src/base/auto/aggregator_pad.rs +++ b/utils/fallbackswitch/src/base/auto/aggregator_pad.rs @@ -9,6 +9,7 @@ use glib::signal::connect_raw; use glib::signal::SignalHandlerId; use glib::translate::*; use glib::StaticType; +use gst::glib; use std::boxed::Box as Box_; use std::mem::transmute; diff --git a/utils/fallbackswitch/src/base/ffi.rs b/utils/fallbackswitch/src/base/ffi.rs index 94bf75e1e..e4004f557 100644 --- a/utils/fallbackswitch/src/base/ffi.rs +++ b/utils/fallbackswitch/src/base/ffi.rs @@ -14,7 +14,7 @@ use libc::{ }; #[allow(unused_imports)] -use glib::ffi::{gboolean, gconstpointer, gpointer, GType}; +use ::gst::glib::ffi::{gboolean, gconstpointer, gpointer, GType}; #[repr(C)] #[derive(Copy, Clone)] diff --git a/utils/fallbackswitch/src/base/mod.rs b/utils/fallbackswitch/src/base/mod.rs index ef0e352dd..62481954e 100644 --- a/utils/fallbackswitch/src/base/mod.rs +++ b/utils/fallbackswitch/src/base/mod.rs @@ -11,7 +11,7 @@ mod aggregator; mod aggregator_pad; pub mod prelude { - pub use glib::prelude::*; + pub use gst::glib::prelude::*; pub use gst::prelude::*; pub use super::aggregator::AggregatorExtManual; diff --git a/utils/fallbackswitch/src/base/subclass/aggregator.rs b/utils/fallbackswitch/src/base/subclass/aggregator.rs index 8196b81d2..8d694fb00 100644 --- a/utils/fallbackswitch/src/base/subclass/aggregator.rs +++ b/utils/fallbackswitch/src/base/subclass/aggregator.rs @@ -8,10 +8,9 @@ use super::super::ffi; -use glib::prelude::*; -use glib::subclass::prelude::*; use glib::translate::*; - +use gst::glib; +use gst::prelude::*; use gst::subclass::prelude::*; use std::ptr; diff --git a/utils/fallbackswitch/src/base/subclass/aggregator_pad.rs b/utils/fallbackswitch/src/base/subclass/aggregator_pad.rs index 6a8c67bba..3fb48710f 100644 --- a/utils/fallbackswitch/src/base/subclass/aggregator_pad.rs +++ b/utils/fallbackswitch/src/base/subclass/aggregator_pad.rs @@ -8,9 +8,9 @@ use super::super::ffi; -use glib::prelude::*; -use glib::subclass::prelude::*; use glib::translate::*; +use gst::glib; +use gst::prelude::*; use gst::subclass::prelude::*; diff --git a/utils/fallbackswitch/src/base/utils.rs b/utils/fallbackswitch/src/base/utils.rs index 2dc756e6e..d6b33da90 100644 --- a/utils/fallbackswitch/src/base/utils.rs +++ b/utils/fallbackswitch/src/base/utils.rs @@ -7,6 +7,7 @@ // except according to those terms. use glib::translate::mut_override; +use gst::glib; #[must_use = "if unused the Mutex will immediately unlock"] pub struct MutexGuard<'a>(&'a glib::ffi::GMutex); diff --git a/utils/fallbackswitch/src/fallbacksrc/custom_source/imp.rs b/utils/fallbackswitch/src/fallbacksrc/custom_source/imp.rs index 688187d72..8b4c49ba4 100644 --- a/utils/fallbackswitch/src/fallbacksrc/custom_source/imp.rs +++ b/utils/fallbackswitch/src/fallbacksrc/custom_source/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}; diff --git a/utils/fallbackswitch/src/fallbacksrc/custom_source/mod.rs b/utils/fallbackswitch/src/fallbacksrc/custom_source/mod.rs index a43c263c2..b3a958e25 100644 --- a/utils/fallbackswitch/src/fallbacksrc/custom_source/mod.rs +++ b/utils/fallbackswitch/src/fallbacksrc/custom_source/mod.rs @@ -15,6 +15,8 @@ // Free Software Foundation, Inc., 51 Franklin Street, Suite 500, // Boston, MA 02110-1335, USA. +use gst::glib; + mod imp; glib::wrapper! { diff --git a/utils/fallbackswitch/src/fallbacksrc/imp.rs b/utils/fallbackswitch/src/fallbacksrc/imp.rs index bd48b16cd..8cf51415f 100644 --- a/utils/fallbackswitch/src/fallbacksrc/imp.rs +++ b/utils/fallbackswitch/src/fallbacksrc/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_info, gst_warning}; diff --git a/utils/fallbackswitch/src/fallbacksrc/mod.rs b/utils/fallbackswitch/src/fallbacksrc/mod.rs index 1d155911f..33a66ba36 100644 --- a/utils/fallbackswitch/src/fallbacksrc/mod.rs +++ b/utils/fallbackswitch/src/fallbacksrc/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 custom_source; mod imp; diff --git a/utils/fallbackswitch/src/fallbacksrc/video_fallback/imp.rs b/utils/fallbackswitch/src/fallbacksrc/video_fallback/imp.rs index c51ed9caf..1221fa3ad 100644 --- a/utils/fallbackswitch/src/fallbacksrc/video_fallback/imp.rs +++ b/utils/fallbackswitch/src/fallbacksrc/video_fallback/imp.rs @@ -16,8 +16,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_info, gst_warning}; diff --git a/utils/fallbackswitch/src/fallbacksrc/video_fallback/mod.rs b/utils/fallbackswitch/src/fallbacksrc/video_fallback/mod.rs index 2577d7b57..db51a3ea7 100644 --- a/utils/fallbackswitch/src/fallbacksrc/video_fallback/mod.rs +++ b/utils/fallbackswitch/src/fallbacksrc/video_fallback/mod.rs @@ -16,6 +16,8 @@ // Free Software Foundation, Inc., 51 Franklin Street, Suite 500, // Boston, MA 02110-1335, USA. +use gst::glib; + mod imp; glib::wrapper! { diff --git a/utils/fallbackswitch/src/fallbackswitch/imp.rs b/utils/fallbackswitch/src/fallbackswitch/imp.rs index 0c856a97a..94b09f75c 100644 --- a/utils/fallbackswitch/src/fallbackswitch/imp.rs +++ b/utils/fallbackswitch/src/fallbackswitch/imp.rs @@ -15,6 +15,8 @@ // Free Software Foundation, Inc., 51 Franklin Street, Suite 500, // Boston, MA 02110-1335, USA. +use gst::glib; + #[cfg(not(feature = "v1_18"))] use self::gst_base::prelude::*; #[cfg(not(feature = "v1_18"))] diff --git a/utils/fallbackswitch/src/fallbackswitch/mod.rs b/utils/fallbackswitch/src/fallbackswitch/mod.rs index e44e48a3b..0042e10ba 100644 --- a/utils/fallbackswitch/src/fallbackswitch/mod.rs +++ b/utils/fallbackswitch/src/fallbackswitch/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::*; #[cfg(not(feature = "v1_18"))] use crate::gst_base_compat as gst_base; diff --git a/utils/fallbackswitch/src/lib.rs b/utils/fallbackswitch/src/lib.rs index aefe6853f..011747378 100644 --- a/utils/fallbackswitch/src/lib.rs +++ b/utils/fallbackswitch/src/lib.rs @@ -15,6 +15,8 @@ // Free Software Foundation, Inc., 51 Franklin Street, Suite 500, // Boston, MA 02110-1335, USA. +use gst::glib; + #[cfg(not(feature = "v1_18"))] #[path = "base/mod.rs"] pub mod gst_base_compat; diff --git a/utils/fallbackswitch/tests/fallbackswitch.rs b/utils/fallbackswitch/tests/fallbackswitch.rs index ca0092f11..3d9d75802 100644 --- a/utils/fallbackswitch/tests/fallbackswitch.rs +++ b/utils/fallbackswitch/tests/fallbackswitch.rs @@ -15,7 +15,6 @@ // Free Software Foundation, Inc., 51 Franklin Street, Suite 500, // Boston, MA 02110-1335, USA. -use glib::prelude::*; use gst::gst_debug; use gst::prelude::*; diff --git a/utils/togglerecord/Cargo.toml b/utils/togglerecord/Cargo.toml index 602201190..8adb35530 100644 --- a/utils/togglerecord/Cargo.toml +++ b/utils/togglerecord/Cargo.toml @@ -8,7 +8,6 @@ repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" 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" } gst-video = { package = "gstreamer-video", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } diff --git a/utils/togglerecord/examples/gtk_recording.rs b/utils/togglerecord/examples/gtk_recording.rs index d3eef9a5b..ee7fc0766 100644 --- a/utils/togglerecord/examples/gtk_recording.rs +++ b/utils/togglerecord/examples/gtk_recording.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 gio::prelude::*; diff --git a/utils/togglerecord/src/lib.rs b/utils/togglerecord/src/lib.rs index 05bb34c10..ef20fe77b 100644 --- a/utils/togglerecord/src/lib.rs +++ b/utils/togglerecord/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 togglerecord; fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> { diff --git a/utils/togglerecord/src/togglerecord/imp.rs b/utils/togglerecord/src/togglerecord/imp.rs index b916fbe44..1ba791022 100644 --- a/utils/togglerecord/src/togglerecord/imp.rs +++ b/utils/togglerecord/src/togglerecord/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_log, gst_trace, gst_warning}; diff --git a/utils/togglerecord/src/togglerecord/mod.rs b/utils/togglerecord/src/togglerecord/mod.rs index 382aa04e0..1c0fa6385 100644 --- a/utils/togglerecord/src/togglerecord/mod.rs +++ b/utils/togglerecord/src/togglerecord/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/utils/togglerecord/tests/tests.rs b/utils/togglerecord/tests/tests.rs index 6c96cb289..98db05547 100644 --- a/utils/togglerecord/tests/tests.rs +++ b/utils/togglerecord/tests/tests.rs @@ -15,8 +15,6 @@ // Free Software Foundation, Inc., 51 Franklin Street, Suite 500, // Boston, MA 02110-1335, USA. -use glib::prelude::*; - use gst::prelude::*; use either::*; diff --git a/video/cdg/Cargo.toml b/video/cdg/Cargo.toml index 9046b83f5..0b0fe9ce8 100644 --- a/video/cdg/Cargo.toml +++ b/video/cdg/Cargo.toml @@ -8,7 +8,6 @@ description = "CDG 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_12"] } gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_12"] } gst-video = { package = "gstreamer-video", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_12"] } diff --git a/video/cdg/src/cdgdec/imp.rs b/video/cdg/src/cdgdec/imp.rs index 2d2c6cd20..678af14be 100644 --- a/video/cdg/src/cdgdec/imp.rs +++ b/video/cdg/src/cdgdec/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::gst_debug; use gst::subclass::prelude::*; use gst_video::prelude::*; diff --git a/video/cdg/src/cdgdec/mod.rs b/video/cdg/src/cdgdec/mod.rs index 6e2e4e371..a942b8d98 100644 --- a/video/cdg/src/cdgdec/mod.rs +++ b/video/cdg/src/cdgdec/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/cdg/src/cdgparse/imp.rs b/video/cdg/src/cdgparse/imp.rs index 8f7dde79a..c89ab323f 100644 --- a/video/cdg/src/cdgparse/imp.rs +++ b/video/cdg/src/cdgparse/imp.rs @@ -6,8 +6,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use glib::subclass::prelude::*; use gst::format::Bytes; +use gst::glib; use gst::gst_debug; use gst::subclass::prelude::*; use gst::SECOND_VAL; diff --git a/video/cdg/src/cdgparse/mod.rs b/video/cdg/src/cdgparse/mod.rs index e1cf77f98..605f90f29 100644 --- a/video/cdg/src/cdgparse/mod.rs +++ b/video/cdg/src/cdgparse/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/cdg/src/lib.rs b/video/cdg/src/lib.rs index e6a4ffb2c..5e5e1e14c 100644 --- a/video/cdg/src/lib.rs +++ b/video/cdg/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 cdgdec; mod cdgparse; mod constants; diff --git a/video/cdg/src/typefind.rs b/video/cdg/src/typefind.rs index 4b9077778..9add2469f 100644 --- a/video/cdg/src/typefind.rs +++ b/video/cdg/src/typefind.rs @@ -6,6 +6,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +use gst::glib; + use crate::constants::{CDG_COMMAND, CDG_MASK, CDG_PACKET_PERIOD, CDG_PACKET_SIZE}; use gst::{Caps, TypeFind, TypeFindProbability}; use std::cmp; 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; diff --git a/video/dav1d/Cargo.toml b/video/dav1d/Cargo.toml index 87ca7b3d0..d0f37e630 100644 --- a/video/dav1d/Cargo.toml +++ b/video/dav1d/Cargo.toml @@ -9,7 +9,6 @@ description = "Dav1d Plugin" [dependencies] dav1d = "0.6" -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-video = { package = "gstreamer-video", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_12"] } diff --git a/video/dav1d/src/dav1ddec/imp.rs b/video/dav1d/src/dav1ddec/imp.rs index f94317fd0..fb179bb03 100644 --- a/video/dav1d/src/dav1ddec/imp.rs +++ b/video/dav1d/src/dav1ddec/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, gst_trace, gst_warning}; diff --git a/video/dav1d/src/dav1ddec/mod.rs b/video/dav1d/src/dav1ddec/mod.rs index efe7c32a8..dc13b2498 100644 --- a/video/dav1d/src/dav1ddec/mod.rs +++ b/video/dav1d/src/dav1ddec/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/dav1d/src/lib.rs b/video/dav1d/src/lib.rs index 6ad39629e..53311608b 100644 --- a/video/dav1d/src/lib.rs +++ b/video/dav1d/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 dav1ddec; fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> { diff --git a/video/flavors/Cargo.toml b/video/flavors/Cargo.toml index edf05bcd5..ad916afcd 100644 --- a/video/flavors/Cargo.toml +++ b/video/flavors/Cargo.toml @@ -8,7 +8,6 @@ edition = "2018" description = "Rust FLV Plugin" [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" } num-rational = { version = "0.4", default-features = false, features = [] } diff --git a/video/flavors/src/flvdemux/imp.rs b/video/flavors/src/flvdemux/imp.rs index 89bcdbf78..ee7e0b7b7 100644 --- a/video/flavors/src/flvdemux/imp.rs +++ b/video/flavors/src/flvdemux/imp.rs @@ -13,6 +13,7 @@ use std::sync::Mutex; #[rustfmt::skip] use ::flavors::parser as flavors; +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/flavors/src/flvdemux/mod.rs b/video/flavors/src/flvdemux/mod.rs index b27abffa7..86f9cc4c1 100644 --- a/video/flavors/src/flvdemux/mod.rs +++ b/video/flavors/src/flvdemux/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/flavors/src/lib.rs b/video/flavors/src/lib.rs index e7aa02669..154597771 100644 --- a/video/flavors/src/lib.rs +++ b/video/flavors/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 bytes; mod flvdemux; diff --git a/video/gif/Cargo.toml b/video/gif/Cargo.toml index c0834168e..2f3d8b56c 100644 --- a/video/gif/Cargo.toml +++ b/video/gif/Cargo.toml @@ -8,7 +8,6 @@ edition = "2018" description = "GStreamer GIF plugin" [dependencies] -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } gst-video = { package = "gstreamer-video", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } gif = "0.11" diff --git a/video/gif/src/gifenc/imp.rs b/video/gif/src/gifenc/imp.rs index 0fbc04d92..873e2271c 100644 --- a/video/gif/src/gifenc/imp.rs +++ b/video/gif/src/gifenc/imp.rs @@ -7,7 +7,7 @@ // except according to those terms. use atomic_refcell::AtomicRefCell; -use glib::subclass::prelude::*; +use gst::glib; use gst::gst_debug; use gst::subclass::prelude::*; use gst_video::prelude::*; diff --git a/video/gif/src/gifenc/mod.rs b/video/gif/src/gifenc/mod.rs index 8fc9da5b1..6ebf0c2c8 100644 --- a/video/gif/src/gifenc/mod.rs +++ b/video/gif/src/gifenc/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/gif/src/lib.rs b/video/gif/src/lib.rs index b1e637cee..2c8e7f4a1 100644 --- a/video/gif/src/lib.rs +++ b/video/gif/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 gifenc; fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> { diff --git a/video/hsv/Cargo.toml b/video/hsv/Cargo.toml index 80e8610f4..60cb476ca 100644 --- a/video/hsv/Cargo.toml +++ b/video/hsv/Cargo.toml @@ -8,7 +8,6 @@ edition = "2018" description = "HSV manipulation elements, written in Rust" [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-video = { package = "gstreamer-video", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } diff --git a/video/hsv/src/hsvdetector/imp.rs b/video/hsv/src/hsvdetector/imp.rs index 896e8c736..487492058 100644 --- a/video/hsv/src/hsvdetector/imp.rs +++ b/video/hsv/src/hsvdetector/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::*; diff --git a/video/hsv/src/hsvdetector/mod.rs b/video/hsv/src/hsvdetector/mod.rs index 65c4ddfae..c4c7b97b4 100644 --- a/video/hsv/src/hsvdetector/mod.rs +++ b/video/hsv/src/hsvdetector/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/hsv/src/hsvfilter/imp.rs b/video/hsv/src/hsvfilter/imp.rs index a527c13fd..1f124b1a2 100644 --- a/video/hsv/src/hsvfilter/imp.rs +++ b/video/hsv/src/hsvfilter/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_info}; diff --git a/video/hsv/src/hsvfilter/mod.rs b/video/hsv/src/hsvfilter/mod.rs index 720ed86ce..37cd6b635 100644 --- a/video/hsv/src/hsvfilter/mod.rs +++ b/video/hsv/src/hsvfilter/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/hsv/src/lib.rs b/video/hsv/src/lib.rs index d78efdb3d..fd3f63b91 100644 --- a/video/hsv/src/lib.rs +++ b/video/hsv/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 hsvdetector; mod hsvfilter; mod hsvutils; diff --git a/video/rav1e/Cargo.toml b/video/rav1e/Cargo.toml index eca2800fa..eb885835d 100644 --- a/video/rav1e/Cargo.toml +++ b/video/rav1e/Cargo.toml @@ -8,7 +8,6 @@ description = "rav1e AV1 Encoder 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-video = { package = "gstreamer-video", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_12"] } rav1e = { version = "0.4", default-features = false } diff --git a/video/rav1e/src/lib.rs b/video/rav1e/src/lib.rs index 1e0e307dd..9a0db00cb 100644 --- a/video/rav1e/src/lib.rs +++ b/video/rav1e/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 rav1enc; fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> { diff --git a/video/rav1e/src/rav1enc/imp.rs b/video/rav1e/src/rav1enc/imp.rs index 04a70ec2b..9a3133408 100644 --- a/video/rav1e/src/rav1enc/imp.rs +++ b/video/rav1e/src/rav1enc/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::gst_debug; use gst::subclass::prelude::*; use gst_video::prelude::*; diff --git a/video/rav1e/src/rav1enc/mod.rs b/video/rav1e/src/rav1enc/mod.rs index 409c59d07..7020ff6d9 100644 --- a/video/rav1e/src/rav1enc/mod.rs +++ b/video/rav1e/src/rav1enc/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/rav1e/tests/rav1enc.rs b/video/rav1e/tests/rav1enc.rs index 4e65e59cb..bae68a1ed 100644 --- a/video/rav1e/tests/rav1enc.rs +++ b/video/rav1e/tests/rav1enc.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use glib::prelude::*; +use gst::prelude::*; fn init() { use std::sync::Once; diff --git a/video/rspng/Cargo.toml b/video/rspng/Cargo.toml index ab1e79eaa..8649b1707 100644 --- a/video/rspng/Cargo.toml +++ b/video/rspng/Cargo.toml @@ -8,7 +8,6 @@ edition = "2018" description = "An PNG encoder/decoder written in pure Rust" [dependencies] -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } gst_video = { package = "gstreamer-video", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } png = "0.16.3" diff --git a/video/rspng/src/lib.rs b/video/rspng/src/lib.rs index 46ea97126..37ab4edc9 100644 --- a/video/rspng/src/lib.rs +++ b/video/rspng/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 pngenc; fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> { diff --git a/video/rspng/src/pngenc/imp.rs b/video/rspng/src/pngenc/imp.rs index 6836d78c4..bc0b01c0a 100644 --- a/video/rspng/src/pngenc/imp.rs +++ b/video/rspng/src/pngenc/imp.rs @@ -8,8 +8,7 @@ use std::{io, io::Write, sync::Arc}; -use glib::subclass::prelude::*; - +use gst::glib; use gst::prelude::*; use gst::subclass::prelude::*; use gst::{gst_debug, gst_error}; diff --git a/video/rspng/src/pngenc/mod.rs b/video/rspng/src/pngenc/mod.rs index c5a1d8789..9abe76ba9 100644 --- a/video/rspng/src/pngenc/mod.rs +++ b/video/rspng/src/pngenc/mod.rs @@ -6,8 +6,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use glib::prelude::*; use glib::GEnum; +use gst::glib; +use gst::prelude::*; mod imp; diff --git a/video/webp/Cargo.toml b/video/webp/Cargo.toml index f103b982a..8a98ed7d4 100644 --- a/video/webp/Cargo.toml +++ b/video/webp/Cargo.toml @@ -8,7 +8,6 @@ description = "WebP Plugin" repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" [dependencies] -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } once_cell = "1.0" libwebp-sys2 = { version = "0.1.2", features = ["demux", "0_5"] } diff --git a/video/webp/src/dec/imp.rs b/video/webp/src/dec/imp.rs index 0060284a2..88729e4be 100644 --- a/video/webp/src/dec/imp.rs +++ b/video/webp/src/dec/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_log, gst_trace}; diff --git a/video/webp/src/dec/mod.rs b/video/webp/src/dec/mod.rs index f8dff3580..b670a1900 100644 --- a/video/webp/src/dec/mod.rs +++ b/video/webp/src/dec/mod.rs @@ -19,7 +19,8 @@ // // gst-launch-1.0 filesrc location=animated.webp ! webpdec-rs ! videoconvert ! autovideosink -use glib::prelude::*; +use gst::glib; +use gst::prelude::*; mod imp; diff --git a/video/webp/src/lib.rs b/video/webp/src/lib.rs index 648912317..139974f0e 100644 --- a/video/webp/src/lib.rs +++ b/video/webp/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 dec; fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> { |