Move export/re-export cleanup

gobject-subclass/src/object.rs

@@ -19,7 +19,7 @@ use gobject_ffi;
 use glib;
 use glib::translate::*;
 
-use properties::*;
+pub use properties::*;
 
 pub trait ObjectImpl<T: ObjectType>: 'static {
     fn set_property(&self, _obj: &glib::Object, _id: u32, _value: &glib::Value) {

gst-plugin-audiofx/Cargo.toml

@@ -6,6 +6,7 @@ repository = "https://github.com/sdroege/gst-plugin-rs"
 license = "MIT/Apache-2.0"
 
 [dependencies]
+gobject-subclass = { path="../gobject-subclass" }
 gst-plugin = { path="../gst-plugin" }
 glib = { git = "https://github.com/gtk-rs/glib" }
 gstreamer = { git = "https://github.com/sdroege/gstreamer-rs" }

gst-plugin-audiofx/src/audioecho.rs

@@ -13,8 +13,8 @@ use gst_audio;
 
 use gst_plugin::base_transform::*;
 use gst_plugin::element::*;
-use gst_plugin::object::*;
-use gst_plugin::properties::*;
+
+use gobject_subclass::object::*;
 
 use std::sync::Mutex;
 use std::{cmp, i32, iter, u64};

gst-plugin-audiofx/src/lib.rs

@@ -10,6 +10,7 @@
 
 extern crate byte_slice_cast;
 extern crate glib;
+extern crate gobject_subclass;
 #[macro_use]
 extern crate gst_plugin;
 #[macro_use]

gst-plugin-simple/Cargo.toml

@@ -8,6 +8,7 @@ license = "MIT/Apache-2.0"
 [dependencies]
 url = "1.1"
 glib = { git = "https://github.com/gtk-rs/glib" }
+gobject-subclass = { path="../gobject-subclass" }
 gst-plugin = { path="../gst-plugin" }
 gstreamer = { git = "https://github.com/sdroege/gstreamer-rs" }
 gstreamer-base = { git = "https://github.com/sdroege/gstreamer-rs" }

gst-plugin-simple/src/demuxer.rs

@@ -12,8 +12,8 @@ use std::collections::BTreeMap;
 use std::u32;
 use std::u64;
 
+use gobject_subclass::object::*;
 use gst_plugin::element::*;
-use gst_plugin::object::*;
 
 use error::*;
 

gst-plugin-simple/src/lib.rs

@@ -7,6 +7,7 @@
 // except according to those terms.
 
 extern crate glib;
+extern crate gobject_subclass;
 extern crate gst_plugin;
 #[macro_use]
 extern crate gstreamer as gst;

gst-plugin-simple/src/sink.rs

@@ -15,15 +15,16 @@ use gst;
 use gst::prelude::*;
 use gst_base::prelude::*;
 
-use error::*;
+use gobject_subclass::object::*;
+
 use gst_plugin::base_sink::*;
 use gst_plugin::element::*;
-use gst_plugin::object::*;
-use gst_plugin::properties::*;
 use gst_plugin::uri_handler::*;
 
 pub use gst_plugin::base_sink::BaseSink;
 
+use error::*;
+
 use UriValidator;
 
 pub trait SinkImpl: Send + 'static {

gst-plugin-simple/src/source.rs

@@ -17,15 +17,16 @@ use gst;
 use gst::prelude::*;
 use gst_base::prelude::*;
 
-use error::*;
+use gobject_subclass::object::*;
+
 use gst_plugin::base_src::*;
 use gst_plugin::element::*;
-use gst_plugin::object::*;
-use gst_plugin::properties::*;
 use gst_plugin::uri_handler::*;
 
 pub use gst_plugin::base_src::BaseSrc;
 
+use error::*;
+
 use UriValidator;
 
 pub trait SourceImpl: Send + 'static {

gst-plugin-togglerecord/Cargo.toml

@@ -8,6 +8,7 @@ license = "LGPL-2.1+"
 glib = { git = "https://github.com/gtk-rs/glib" }
 gstreamer = { git = "https://github.com/sdroege/gstreamer-rs" }
 gstreamer-video = { git = "https://github.com/sdroege/gstreamer-rs" }
+gobject-subclass = { path="../gobject-subclass" }
 gst-plugin = { path = "../gst-plugin" }
 gtk = { git = "https://github.com/gtk-rs/gtk", features = ["v3_6"], optional = true }
 gio = { git = "https://github.com/gtk-rs/gio", optional = true }

gst-plugin-togglerecord/src/lib.rs

@@ -18,6 +18,7 @@
 #![crate_type = "cdylib"]
 
 extern crate glib;
+extern crate gobject_subclass;
 #[macro_use]
 extern crate gst_plugin;
 #[macro_use]

gst-plugin-togglerecord/src/togglerecord.rs

@@ -21,9 +21,8 @@ use gst;
 use gst::prelude::*;
 use gst_video;
 
+use gobject_subclass::object::*;
 use gst_plugin::element::*;
-use gst_plugin::object::*;
-use gst_plugin::properties::*;
 
 use std::cmp;
 use std::collections::HashMap;

gst-plugin-tutorial/Cargo.toml

@@ -6,6 +6,7 @@ repository = "https://github.com/sdroege/gst-plugin-rs"
 license = "MIT/Apache-2.0"
 
 [dependencies]
+gobject-subclass = { path="../gobject-subclass" }
 gst-plugin = { path="../gst-plugin" }
 glib = { git = "https://github.com/gtk-rs/glib" }
 gstreamer = { git = "https://github.com/sdroege/gstreamer-rs" }

gst-plugin-tutorial/src/lib.rs

@@ -7,6 +7,7 @@
 // except according to those terms.
 
 extern crate glib;
+extern crate gobject_subclass;
 #[macro_use]
 extern crate gst_plugin;
 #[macro_use]

gst-plugin-tutorial/src/rgb2gray.rs

@@ -11,10 +11,9 @@ use gst;
 use gst::prelude::*;
 use gst_video;
 
+use gobject_subclass::object::*;
 use gst_plugin::base_transform::*;
 use gst_plugin::element::*;
-use gst_plugin::object::*;
-use gst_plugin::properties::*;
 
 use std::i32;
 use std::sync::Mutex;

gst-plugin-tutorial/src/sinesrc.rs

@@ -14,10 +14,9 @@ use gst_base::prelude::*;
 
 use byte_slice_cast::*;
 
+use gobject_subclass::object::*;
 use gst_plugin::base_src::*;
 use gst_plugin::element::*;
-use gst_plugin::object::*;
-use gst_plugin::properties::*;
 
 use std::ops::Rem;
 use std::sync::Mutex;

gst-plugin/src/base_sink.rs

@@ -20,7 +20,9 @@ use gst;
 use gst::prelude::*;
 use gst_base;
 
-use anyimpl::*;
+use gobject_subclass::anyimpl::*;
+use gobject_subclass::object::*;
+
 use element::*;
 use object::*;
 

gst-plugin/src/base_src.rs

@@ -20,7 +20,9 @@ use gst;
 use gst::prelude::*;
 use gst_base;
 
-use anyimpl::*;
+use gobject_subclass::anyimpl::*;
+use gobject_subclass::object::*;
+
 use element::*;
 use object::*;
 

gst-plugin/src/base_transform.rs

@@ -20,7 +20,9 @@ use gst;
 use gst::prelude::*;
 use gst_base;
 
-use anyimpl::*;
+use gobject_subclass::anyimpl::*;
+use gobject_subclass::object::*;
+
 use element::*;
 use object::*;
 

gst-plugin/src/bin.rs

@@ -18,7 +18,9 @@ use glib::translate::*;
 use gst;
 use gst::prelude::*;
 
-use anyimpl::*;
+use gobject_subclass::anyimpl::*;
+use gobject_subclass::object::*;
+
 use element::*;
 use object::*;
 

gst-plugin/src/element.rs

@@ -21,7 +21,9 @@ use glib::translate::*;
 use gst;
 use gst::prelude::*;
 
-use anyimpl::*;
+use gobject_subclass::anyimpl::*;
+use gobject_subclass::object::*;
+
 use object::*;
 
 pub trait ElementImpl<T: ElementBase>: ObjectImpl<T> + AnyImpl + Send + Sync + 'static

gst-plugin/src/lib.rs

@@ -10,8 +10,8 @@ extern crate byteorder;
 
 pub extern crate glib_sys as glib_ffi;
 pub extern crate gobject_sys as gobject_ffi;
-pub extern crate gstreamer_sys as gst_ffi;
 extern crate gstreamer_base_sys as gst_base_ffi;
+pub extern crate gstreamer_sys as gst_ffi;
 
 #[macro_use]
 extern crate lazy_static;
@@ -26,10 +26,6 @@ extern crate gstreamer_base as gst_base;
 #[macro_use]
 extern crate gobject_subclass;
 
-pub use gobject_subclass::anyimpl;
-pub use gobject_subclass::guard;
-pub use gobject_subclass::properties;
-
 pub mod object;
 
 #[macro_use]

gst-plugin/src/object.rs

@@ -1,7 +1,7 @@
 use std::ptr;
 use std::sync::atomic::AtomicBool;
 
-pub use gobject_subclass::object::*;
+use gobject_subclass::object::*;
 
 #[repr(C)]
 pub struct ElementInstanceStruct<T: ObjectType> {

gst-plugin/src/pipeline.rs

@@ -18,7 +18,9 @@ use glib::translate::*;
 use gst;
 use gst::prelude::*;
 
-use anyimpl::*;
+use gobject_subclass::anyimpl::*;
+use gobject_subclass::object::*;
+
 use bin::*;
 use element::*;
 use object::*;

gst-plugin/src/uri_handler.rs

@@ -16,8 +16,8 @@ use glib::translate::*;
 use gst;
 use libc;
 
-use anyimpl::*;
-use object::*;
+use gobject_subclass::anyimpl::*;
+use gobject_subclass::object::*;
 
 pub trait URIHandlerImpl: AnyImpl + Send + Sync + 'static {
     fn get_uri(&self, element: &gst::URIHandler) -> Option<String>;