From 0327e98b5fbce7575a0e9843730d311630cf7fce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Sun, 22 Nov 2020 12:40:16 +0200
Subject: [PATCH] gstreamer-rtsp: Update manual code to 2018 edition

---
 gstreamer-rtsp/Cargo.toml | 23 ++++++++++-------------
 gstreamer-rtsp/src/lib.rs | 20 ++++----------------
 2 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/gstreamer-rtsp/Cargo.toml b/gstreamer-rtsp/Cargo.toml
index baf504e0c..0c4d76ed0 100644
--- a/gstreamer-rtsp/Cargo.toml
+++ b/gstreamer-rtsp/Cargo.toml
@@ -11,32 +11,29 @@ homepage = "https://gstreamer.freedesktop.org"
 documentation = "https://gstreamer.pages.freedesktop.org/gstreamer-rs/gstreamer_rtsp/"
 keywords = ["gstreamer", "multimedia", "audio", "video", "gnome"]
 build = "build.rs"
+edition = "2018"
 
 [dependencies]
 bitflags = "1.0"
 libc = "0.2"
-glib-sys = { git = "https://github.com/gtk-rs/gtk-rs" }
-gobject-sys = { git = "https://github.com/gtk-rs/gtk-rs" }
-gstreamer-sys = { path = "../gstreamer/sys", features = ["v1_8"] }
-gstreamer-rtsp-sys = { path = "../gstreamer-rtsp/sys", features = ["v1_8"] }
-gstreamer-sdp-sys = { path = "../gstreamer-sdp/sys", features = ["v1_8"] }
+ffi = { package = "gstreamer-rtsp-sys", path = "../gstreamer-rtsp/sys", features = ["v1_8"] }
 glib = { git = "https://github.com/gtk-rs/gtk-rs" }
-gstreamer = { path = "../gstreamer" }
-gstreamer-sdp = { path = "../gstreamer-sdp" }
+gst = { package = "gstreamer", path = "../gstreamer" }
+gst-sdp = { package = "gstreamer-sdp", path = "../gstreamer-sdp" }
 
 [build-dependencies]
 gstreamer-rs-lgpl-docs = { path = "../docs", optional = true }
 
 [features]
 default = []
-v1_10 = ["gstreamer/v1_10", "gstreamer-sdp/v1_10", "gstreamer-rtsp-sys/v1_10"]
-v1_12 = ["gstreamer/v1_12", "gstreamer-sdp/v1_12", "gstreamer-rtsp-sys/v1_12", "v1_10"]
-v1_14 = ["gstreamer/v1_14", "gstreamer-sdp/v1_14", "gstreamer-rtsp-sys/v1_14", "v1_12"]
-v1_16 = ["gstreamer/v1_16", "gstreamer-sdp/v1_16", "gstreamer-rtsp-sys/v1_16", "v1_14"]
-v1_18 = ["gstreamer/v1_18", "gstreamer-sdp/v1_18", "gstreamer-rtsp-sys/v1_18", "v1_16"]
+v1_10 = ["gst/v1_10", "gst-sdp/v1_10", "ffi/v1_10"]
+v1_12 = ["gst/v1_12", "gst-sdp/v1_12", "ffi/v1_12", "v1_10"]
+v1_14 = ["gst/v1_14", "gst-sdp/v1_14", "ffi/v1_14", "v1_12"]
+v1_16 = ["gst/v1_16", "gst-sdp/v1_16", "ffi/v1_16", "v1_14"]
+v1_18 = ["gst/v1_18", "gst-sdp/v1_18", "ffi/v1_18", "v1_16"]
 embed-lgpl-docs = ["gstreamer-rs-lgpl-docs"]
 purge-lgpl-docs = ["gstreamer-rs-lgpl-docs"]
-dox = ["v1_18", "gstreamer-rtsp-sys/dox", "glib/dox", "gstreamer/dox", "gstreamer-sdp/dox"]
+dox = ["v1_18", "ffi/dox", "glib/dox", "gst/dox", "gst-sdp/dox"]
 
 [package.metadata.docs.rs]
 features = ["dox", "embed-lgpl-docs"]
diff --git a/gstreamer-rtsp/src/lib.rs b/gstreamer-rtsp/src/lib.rs
index f5af50ac3..9b8bfa794 100644
--- a/gstreamer-rtsp/src/lib.rs
+++ b/gstreamer-rtsp/src/lib.rs
@@ -8,23 +8,11 @@
 
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
 
-#[macro_use]
-extern crate bitflags;
-extern crate libc;
-
-#[macro_use]
-extern crate glib;
-extern crate glib_sys;
-extern crate gobject_sys;
-extern crate gstreamer as gst;
-extern crate gstreamer_rtsp_sys as gst_rtsp_sys;
-extern crate gstreamer_sdp as gst_sdp;
-extern crate gstreamer_sdp_sys as gst_sdp_sys;
-extern crate gstreamer_sys as gst_sys;
+pub use ffi;
 
 macro_rules! assert_initialized_main_thread {
     () => {
-        if unsafe { ::gst_sys::gst_is_initialized() } != ::glib_sys::GTRUE {
+        if unsafe { gst::ffi::gst_is_initialized() } != glib::ffi::GTRUE {
             panic!("GStreamer has not been initialized. Call `gst::init` first.");
         }
     };
@@ -38,7 +26,7 @@ macro_rules! skip_assert_initialized {
 #[allow(clippy::too_many_arguments)]
 #[allow(clippy::match_same_arms)]
 mod auto;
-pub use auto::*;
+pub use crate::auto::*;
 
 // Re-export all the traits in a prelude module, so that applications
 // can always "use gst::prelude::*" without getting conflicts
@@ -46,5 +34,5 @@ pub mod prelude {
     pub use glib::prelude::*;
     pub use gst::prelude::*;
 
-    pub use auto::traits::*;
+    pub use crate::auto::traits::*;
 }