From be0403ce2428a8eda7cd3e1028eebfc386a136df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Tue, 1 May 2018 18:47:36 +0300
Subject: [PATCH] threadshare: Switch to gobject-subclass

---
 gst-plugin-threadshare/Cargo.toml    | 1 +
 gst-plugin-threadshare/src/appsrc.rs | 3 +--
 gst-plugin-threadshare/src/lib.rs    | 1 +
 gst-plugin-threadshare/src/proxy.rs  | 3 +--
 gst-plugin-threadshare/src/queue.rs  | 3 +--
 gst-plugin-threadshare/src/udpsrc.rs | 3 +--
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/gst-plugin-threadshare/Cargo.toml b/gst-plugin-threadshare/Cargo.toml
index f95e4ddd..7ec7fe91 100644
--- a/gst-plugin-threadshare/Cargo.toml
+++ b/gst-plugin-threadshare/Cargo.toml
@@ -9,6 +9,7 @@ glib-sys = { git = "https://github.com/gtk-rs/sys" }
 gstreamer-sys = { git = "https://github.com/sdroege/gstreamer-sys" }
 glib = { git = "https://github.com/gtk-rs/glib" }
 gstreamer = { git = "https://github.com/sdroege/gstreamer-rs" }
+gobject-subclass = { git = "https://github.com/sdroege/gobject-subclass" }
 gst-plugin = { git = "https://github.com/sdroege/gst-plugin-rs" }
 tokio = { git = "https://github.com/tokio-rs/tokio" }
 tokio-reactor = { git = "https://github.com/tokio-rs/tokio" }
diff --git a/gst-plugin-threadshare/src/appsrc.rs b/gst-plugin-threadshare/src/appsrc.rs
index b59e1e37..3eaf298e 100644
--- a/gst-plugin-threadshare/src/appsrc.rs
+++ b/gst-plugin-threadshare/src/appsrc.rs
@@ -20,9 +20,8 @@ use glib::prelude::*;
 use gst;
 use gst::prelude::*;
 
+use gobject_subclass::object::*;
 use gst_plugin::element::*;
-use gst_plugin::object::*;
-use gst_plugin::properties::*;
 
 use std::sync::Mutex;
 use std::{u16, u32};
diff --git a/gst-plugin-threadshare/src/lib.rs b/gst-plugin-threadshare/src/lib.rs
index 912576be..9d7f6aa8 100644
--- a/gst-plugin-threadshare/src/lib.rs
+++ b/gst-plugin-threadshare/src/lib.rs
@@ -21,6 +21,7 @@ extern crate glib_sys as glib_ffi;
 extern crate gstreamer_sys as gst_ffi;
 
 extern crate glib;
+extern crate gobject_subclass;
 #[macro_use]
 extern crate gst_plugin;
 #[macro_use]
diff --git a/gst-plugin-threadshare/src/proxy.rs b/gst-plugin-threadshare/src/proxy.rs
index 49212374..f2541ad9 100644
--- a/gst-plugin-threadshare/src/proxy.rs
+++ b/gst-plugin-threadshare/src/proxy.rs
@@ -20,9 +20,8 @@ use glib::prelude::*;
 use gst;
 use gst::prelude::*;
 
+use gobject_subclass::object::*;
 use gst_plugin::element::*;
-use gst_plugin::object::*;
-use gst_plugin::properties::*;
 
 use std::collections::HashMap;
 use std::collections::VecDeque;
diff --git a/gst-plugin-threadshare/src/queue.rs b/gst-plugin-threadshare/src/queue.rs
index 6bdacc74..772ae3db 100644
--- a/gst-plugin-threadshare/src/queue.rs
+++ b/gst-plugin-threadshare/src/queue.rs
@@ -20,9 +20,8 @@ use glib::prelude::*;
 use gst;
 use gst::prelude::*;
 
+use gobject_subclass::object::*;
 use gst_plugin::element::*;
-use gst_plugin::object::*;
-use gst_plugin::properties::*;
 
 use std::collections::VecDeque;
 use std::sync::Mutex;
diff --git a/gst-plugin-threadshare/src/udpsrc.rs b/gst-plugin-threadshare/src/udpsrc.rs
index d37f7cf0..f777cf45 100644
--- a/gst-plugin-threadshare/src/udpsrc.rs
+++ b/gst-plugin-threadshare/src/udpsrc.rs
@@ -20,9 +20,8 @@ use glib::prelude::*;
 use gst;
 use gst::prelude::*;
 
+use gobject_subclass::object::*;
 use gst_plugin::element::*;
-use gst_plugin::object::*;
-use gst_plugin::properties::*;
 
 use std::sync::Mutex;
 use std::u16;