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

gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrançois Laignel <fengalin@free.fr>2021-06-03 21:20:54 +0300
committerFrançois Laignel <fengalin@free.fr>2021-06-03 21:53:16 +0300
commit8dfc872544b26aa5eaf4b12da7d9c5e0361467ca (patch)
treee314ee0cfde5930ac50a5bfd985b34d1129362b0 /generic/sodium
parent91c8fd146dd477ce744bec944395672719a13ebe (diff)
use gst::glib where applicable
Diffstat (limited to 'generic/sodium')
-rw-r--r--generic/sodium/Cargo.toml1
-rw-r--r--generic/sodium/examples/decrypt_example.rs2
-rw-r--r--generic/sodium/examples/encrypt_example.rs2
-rw-r--r--generic/sodium/src/decrypter/imp.rs3
-rw-r--r--generic/sodium/src/decrypter/mod.rs3
-rw-r--r--generic/sodium/src/encrypter/imp.rs3
-rw-r--r--generic/sodium/src/encrypter/mod.rs3
-rw-r--r--generic/sodium/src/lib.rs2
-rw-r--r--generic/sodium/tests/decrypter.rs2
-rw-r--r--generic/sodium/tests/encrypter.rs2
10 files changed, 12 insertions, 11 deletions
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;