.travis.yml

@@ -26,9 +26,9 @@ script:
 
 before_install:
 - curl -L https://people.freedesktop.org/~slomo/gstreamer.tar.gz | tar xz
-- sed -i "s;prefix=/root/gstreamer;prefix=$PWD/gstreamer;g" $PWD/gstreamer/lib/pkgconfig/*.pc
-- export PKG_CONFIG_PATH=$PWD/gstreamer/lib/pkgconfig
-- export GST_PLUGIN_SYSTEM_PATH=$PWD/gstreamer/lib/gstreamer-1.0
+- sed -i "s;prefix=/root/gstreamer;prefix=$PWD/gstreamer;g" $PWD/gstreamer/lib/x86_64-linux-gnu/pkgconfig/*.pc
+- export PKG_CONFIG_PATH=$PWD/gstreamer/lib/x86_64-linux-gnu/pkgconfig
+- export GST_PLUGIN_SYSTEM_PATH=$PWD/gstreamer/lib/x86_64-linux-gnu/gstreamer-1.0
 - export GST_PLUGIN_SCANNER=$PWD/gstreamer/libexec/gstreamer-1.0/gst-plugin-scanner
 - export PATH=$PATH:$PWD/gstreamer/bin
-- export LD_LIBRARY_PATH=$PWD/gstreamer/lib:$LD_LIBRARY_PATH
+- export LD_LIBRARY_PATH=$PWD/gstreamer/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH

gst-plugin-audiofx/Cargo.toml

 [package]
 name = "gst-plugin-audiofx"
-version = "0.1.0"
+version = "0.3.0"
 authors = ["Sebastian Dröge <sebastian@centricular.com>"]
 repository = "https://github.com/sdroege/gst-plugin-rs"
 license = "MIT/Apache-2.0"
 
 [dependencies]
-gst-plugin = { path="../gst-plugin" }
-glib = { git = "https://github.com/gtk-rs/glib" }
-gstreamer = { git = "https://github.com/sdroege/gstreamer-rs" }
-gstreamer-base = { git = "https://github.com/sdroege/gstreamer-rs" }
-gstreamer-audio = { git = "https://github.com/sdroege/gstreamer-rs" }
-byte-slice-cast = "0.1"
+gobject-subclass = "0.2"
+gst-plugin = { version = "0.3", path="../gst-plugin" }
+glib = "0.6"
+gstreamer = "0.12"
+gstreamer-base = "0.12"
+gstreamer-audio = "0.12"
+byte-slice-cast = "0.2"
 num-traits = "0.2"
 
 [lib]

gst-plugin-audiofx/src/audioecho.rs

@@ -11,18 +11,18 @@ use gst;
 use gst::prelude::*;
 use gst_audio;
 
-use gst_plugin::properties::*;
-use gst_plugin::object::*;
-use gst_plugin::element::*;
 use gst_plugin::base_transform::*;
+use gst_plugin::element::*;
+
+use gobject_subclass::object::*;
 
-use std::{cmp, iter, i32, u64};
 use std::sync::Mutex;
+use std::{cmp, i32, iter, u64};
 
 use byte_slice_cast::*;
 
-use num_traits::float::Float;
 use num_traits::cast::{FromPrimitive, ToPrimitive};
+use num_traits::float::Float;
 
 const DEFAULT_MAX_DELAY: u64 = gst::SECOND_VAL;
 const DEFAULT_DELAY: u64 = 500 * gst::MSECOND_VAL;
@@ -161,7 +161,8 @@ impl AudioEcho {
         state: &mut State,
         settings: &Settings,
     ) {
-        let delay_frames = (settings.delay as usize) * (state.info.channels() as usize)
+        let delay_frames = (settings.delay as usize)
+            * (state.info.channels() as usize)
             * (state.info.rate() as usize) / (gst::SECOND_VAL as usize);
 
         for (i, (o, e)) in data.iter_mut().zip(state.buffer.iter(delay_frames)) {
@@ -245,11 +246,11 @@ impl BaseTransformImpl<BaseTransform> for AudioEcho {
 
         match state.info.format() {
             gst_audio::AUDIO_FORMAT_F64 => {
-                let data = map.as_mut_slice().as_mut_slice_of::<f64>().unwrap();
+                let data = map.as_mut_slice_of::<f64>().unwrap();
                 Self::process(data, state, &settings);
             }
             gst_audio::AUDIO_FORMAT_F32 => {
-                let data = map.as_mut_slice().as_mut_slice_of::<f32>().unwrap();
+                let data = map.as_mut_slice_of::<f32>().unwrap();
                 Self::process(data, state, &settings);
             }
             _ => return gst::FlowReturn::NotNegotiated,

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-file/Cargo.toml

 [package]
 name = "gst-plugin-file"
-version = "0.1.0"
+version = "0.3.0"
 authors = ["Sebastian Dröge <sebastian@centricular.com>"]
 repository = "https://github.com/sdroege/gst-plugin-rs"
 license = "MIT/Apache-2.0"
 
 [dependencies]
 url = "1.1"
-gst-plugin = { path="../gst-plugin" }
-gst-plugin-simple = { path="../gst-plugin-simple" }
-gstreamer = { git = "https://github.com/sdroege/gstreamer-rs" }
+gst-plugin = { version = "0.3", path="../gst-plugin" }
+gst-plugin-simple = { version = "0.3", path="../gst-plugin-simple" }
+gstreamer = "0.12"
 
 [lib]
 name = "gstrsfile"

gst-plugin-file/src/filesink.rs

@@ -12,6 +12,7 @@ use url::Url;
 
 use std::io::Write;
 
+use gst_plugin::error::*;
 use gst_plugin_simple::error::*;
 use gst_plugin_simple::sink::*;
 use gst_plugin_simple::UriValidator;
@@ -93,7 +94,7 @@ impl SinkImpl for FileSink {
                 [
                     "Could not open file for writing '{}': {}",
                     location.to_str().unwrap_or("Non-UTF8 path"),
-                    err.to_string()
+                    err.to_string(),
                 ]
             ))
         }));

gst-plugin-file/src/filesrc.rs

@@ -6,11 +6,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::u64;
-use std::io::{Read, Seek, SeekFrom};
 use std::fs::File;
+use std::io::{Read, Seek, SeekFrom};
+use std::u64;
 use url::Url;
 
+use gst_plugin::error::*;
 use gst_plugin_simple::error::*;
 use gst_plugin_simple::source::*;
 use gst_plugin_simple::UriValidator;
@@ -104,7 +105,7 @@ impl SourceImpl for FileSrc {
                 [
                     "Could not open file for reading '{}': {}",
                     location.to_str().unwrap_or("Non-UTF8 path"),
-                    err.to_string()
+                    err.to_string(),
                 ]
             ))
         }));

gst-plugin-file/src/lib.rs

@@ -15,14 +15,14 @@ extern crate gst_plugin_simple;
 extern crate gstreamer as gst;
 extern crate url;
 
-use gst_plugin_simple::source::*;
 use gst_plugin_simple::sink::*;
+use gst_plugin_simple::source::*;
 
-mod filesrc;
 mod filesink;
+mod filesrc;
 
-use filesrc::FileSrc;
 use filesink::FileSink;
+use filesrc::FileSrc;
 
 fn plugin_init(plugin: &gst::Plugin) -> bool {
     source_register(

gst-plugin-flv/Cargo.toml

 [package]
 name = "gst-plugin-flv"
-version = "0.1.0"
+version = "0.3.0"
 authors = ["Sebastian Dröge <sebastian@centricular.com>"]
 repository = "https://github.com/sdroege/gst-plugin-rs"
 license = "MIT/Apache-2.0"
 
 [dependencies]
 url = "1.1"
-gst-plugin = { path="../gst-plugin" }
-gst-plugin-simple = { path="../gst-plugin-simple" }
-gstreamer = { git = "https://github.com/sdroege/gstreamer-rs" }
-num-rational = { version = "0.1", default-features = false, features = [] }
+gst-plugin = { version = "0.3", path="../gst-plugin" }
+gst-plugin-simple = { version = "0.3", path="../gst-plugin-simple" }
+gstreamer = "0.12"
+num-rational = { version = "0.2", default-features = false, features = [] }
 nom = "3.0"
 flavors = {git = "https://github.com/rust-av/flavors.git"}
-muldiv = "0.1"
+muldiv = "0.2"
 
 [lib]
 name = "gstrsflv"

gst-plugin-flv/src/flvdemux.rs

@@ -17,8 +17,8 @@ use flavors::parser as flavors;
 use gst_plugin::adapter::*;
 use gst_plugin::bytes::*;
 use gst_plugin::element::*;
+use gst_plugin::error::*;
 use gst_plugin_simple::demuxer::*;
-use gst_plugin_simple::error::*;
 
 use gst;
 
@@ -83,7 +83,9 @@ struct AudioFormat {
 // Ignores bitrate
 impl PartialEq for AudioFormat {
     fn eq(&self, other: &Self) -> bool {
-        self.format.eq(&other.format) && self.rate.eq(&other.rate) && self.width.eq(&other.width)
+        self.format.eq(&other.format)
+            && self.rate.eq(&other.rate)
+            && self.width.eq(&other.width)
             && self.channels.eq(&other.channels)
             && self.aac_sequence_header.eq(&other.aac_sequence_header)
     }
@@ -346,12 +348,10 @@ impl VideoFormat {
         if let Some(par) = self.pixel_aspect_ratio {
             if *par.numer() != 0 && par.numer() != par.denom() {
                 caps.as_mut().map(|c| {
-                    c.get_mut().unwrap().set_simple(&[
-                        (
-                            "pixel-aspect-ratio",
-                            &gst::Fraction::new(*par.numer(), *par.denom()),
-                        ),
-                    ])
+                    c.get_mut().unwrap().set_simple(&[(
+                        "pixel-aspect-ratio",
+                        &gst::Fraction::new(*par.numer(), *par.denom()),
+                    )])
                 });
             }
         }
@@ -359,9 +359,10 @@ impl VideoFormat {
         if let Some(fps) = self.framerate {
             if *fps.numer() != 0 {
                 caps.as_mut().map(|c| {
-                    c.get_mut().unwrap().set_simple(&[
-                        ("framerate", &gst::Fraction::new(*fps.numer(), *fps.denom())),
-                    ])
+                    c.get_mut().unwrap().set_simple(&[(
+                        "framerate",
+                        &gst::Fraction::new(*fps.numer(), *fps.denom()),
+                    )])
                 });
             }
         }
@@ -373,7 +374,8 @@ impl VideoFormat {
 // Ignores bitrate
 impl PartialEq for VideoFormat {
     fn eq(&self, other: &Self) -> bool {
-        self.format.eq(&other.format) && self.width.eq(&other.width)
+        self.format.eq(&other.format)
+            && self.width.eq(&other.width)
             && self.height.eq(&other.height)
             && self.pixel_aspect_ratio.eq(&other.pixel_aspect_ratio)
             && self.framerate.eq(&other.framerate)
@@ -516,7 +518,8 @@ impl FlvDemux {
 
         self.adapter.flush(15).unwrap();
 
-        let buffer = self.adapter
+        let buffer = self
+            .adapter
             .get_buffer(tag_header.data_size as usize)
             .unwrap();
         let map = buffer.map_readable().unwrap();
@@ -670,7 +673,8 @@ impl FlvDemux {
                     match header.packet_type {
                         flavors::AACPacketType::SequenceHeader => {
                             self.adapter.flush(15 + 1 + 1).unwrap();
-                            let buffer = self.adapter
+                            let buffer = self
+                                .adapter
                                 .get_buffer((tag_header.data_size - 1 - 1) as usize)
                                 .unwrap();
                             gst_debug!(
@@ -725,7 +729,8 @@ impl FlvDemux {
             self.adapter.flush(offset as usize).unwrap();
         }
 
-        let mut buffer = self.adapter
+        let mut buffer = self
+            .adapter
             .get_buffer((tag_header.data_size - 1 - offset) as usize)
             .unwrap();
 
@@ -846,7 +851,8 @@ impl FlvDemux {
                     match header.packet_type {
                         flavors::AVCPacketType::SequenceHeader => {
                             self.adapter.flush(15 + 1 + 4).unwrap();
-                            let buffer = self.adapter
+                            let buffer = self
+                                .adapter
                                 .get_buffer((tag_header.data_size - 1 - 4) as usize)
                                 .unwrap();
                             gst_debug!(
@@ -911,7 +917,8 @@ impl FlvDemux {
             self.adapter.flush(offset as usize).unwrap();
         }
 
-        let mut buffer = self.adapter
+        let mut buffer = self
+            .adapter
             .get_buffer((tag_header.data_size - 1 - offset) as usize)
             .unwrap();
 

gst-plugin-http/Cargo.toml

 [package]
 name = "gst-plugin-http"
-version = "0.1.0"
+version = "0.3.0"
 authors = ["Sebastian Dröge <sebastian@centricular.com>"]
 repository = "https://github.com/sdroege/gst-plugin-rs"
 license = "MIT/Apache-2.0"
 
 [dependencies]
 url = "1.1"
-gst-plugin = { path="../gst-plugin" }
-gst-plugin-simple = { path="../gst-plugin-simple" }
+gst-plugin = { version = "0.3", path="../gst-plugin" }
+gst-plugin-simple = { version = "0.3", path="../gst-plugin-simple" }
 reqwest = "0.8"
-gstreamer = { git = "https://github.com/sdroege/gstreamer-rs" }
+gstreamer = "0.12"
 
 [lib]
 name = "gstrshttp"

gst-plugin-http/src/httpsrc.rs

@@ -6,12 +6,15 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::u64;
+use reqwest::header::{
+    AcceptRanges, ByteRangeSpec, ContentLength, ContentRange, ContentRangeSpec, Range, RangeUnit,
+};
+use reqwest::{Client, Response};
 use std::io::Read;
+use std::u64;
 use url::Url;
-use reqwest::{Client, Response};
-use reqwest::header::{AcceptRanges, ByteRangeSpec, ContentLength, ContentRange, ContentRangeSpec,
-                      Range, RangeUnit};
+
+use gst_plugin::error::*;
 
 use gst_plugin_simple::error::*;
 use gst_plugin_simple::source::*;

gst-plugin-simple/Cargo.toml

 [package]
 name = "gst-plugin-simple"
-version = "0.1.0"
+version = "0.3.0"
 authors = ["Sebastian Dröge <sebastian@centricular.com>"]
 repository = "https://github.com/sdroege/gst-plugin-rs"
 license = "MIT/Apache-2.0"
 
 [dependencies]
 url = "1.1"
-glib = { git = "https://github.com/gtk-rs/glib" }
-gst-plugin = { path="../gst-plugin" }
-gstreamer = { git = "https://github.com/sdroege/gstreamer-rs" }
-gstreamer-base = { git = "https://github.com/sdroege/gstreamer-rs" }
+glib = "0.6"
+gobject-subclass = "0.2"
+gst-plugin = { version = "0.3", path="../gst-plugin" }
+gstreamer = "0.12"
+gstreamer-base = "0.12"
 
 [lib]
 name = "gst_plugin_simple"

gst-plugin-simple/src/demuxer.rs

@@ -8,14 +8,13 @@
 
 use std::sync::Mutex;
 
+use std::collections::BTreeMap;
 use std::u32;
 use std::u64;
-use std::collections::BTreeMap;
 
-use gst_plugin::object::*;
+use gobject_subclass::object::*;
 use gst_plugin::element::*;
-
-use error::*;
+use gst_plugin::error::*;
 
 use gst;
 use gst::prelude::*;
@@ -339,12 +338,7 @@ impl Demuxer {
         mode: gst::PadMode,
         active: bool,
     ) -> bool {
-        let element = parent
-            .as_ref()
-            .cloned()
-            .unwrap()
-            .downcast::<Element>()
-            .unwrap();
+        let element = parent.as_ref().unwrap().downcast_ref::<Element>().unwrap();
         let demuxer = element.get_impl().downcast_ref::<Demuxer>().unwrap();
 
         if active {
@@ -353,7 +347,7 @@ impl Demuxer {
                 .peer_query_duration::<gst::format::Bytes>()
                 .and_then(|v| v.0);
 
-            if !demuxer.start(&element, upstream_size, mode == gst::PadMode::Pull) {
+            if !demuxer.start(element, upstream_size, mode == gst::PadMode::Pull) {
                 return false;
             }
 
@@ -368,7 +362,7 @@ impl Demuxer {
                 let _ = demuxer.sinkpad.stop_task();
             }
 
-            demuxer.stop(&element)
+            demuxer.stop(element)
         }
     }
 
@@ -377,25 +371,20 @@ impl Demuxer {
         parent: &Option<gst::Object>,
         buffer: gst::Buffer,
     ) -> gst::FlowReturn {
-        let element = parent
-            .as_ref()
-            .cloned()
-            .unwrap()
-            .downcast::<Element>()
-            .unwrap();
+        let element = parent.as_ref().unwrap().downcast_ref::<Element>().unwrap();
         let demuxer = element.get_impl().downcast_ref::<Demuxer>().unwrap();
 
         let mut res = {
             let demuxer_impl = &mut demuxer.imp.lock().unwrap();
 
-            gst_trace!(demuxer.cat, obj: &element, "Handling buffer {:?}", buffer);
+            gst_trace!(demuxer.cat, obj: element, "Handling buffer {:?}", buffer);
 
-            match demuxer_impl.handle_buffer(&element, Some(buffer)) {
+            match demuxer_impl.handle_buffer(element, Some(buffer)) {
                 Ok(res) => res,
                 Err(flow_error) => {
                     gst_error!(
                         demuxer.cat,
-                        obj: &element,
+                        obj: element,
                         "Failed handling buffer: {:?}",
                         flow_error
                     );
@@ -412,33 +401,33 @@ impl Demuxer {
 
         // Loop until AllEos, NeedMoreData or error when pushing downstream
         loop {
-            gst_trace!(demuxer.cat, obj: &element, "Handled {:?}", res);
+            gst_trace!(demuxer.cat, obj: element, "Handled {:?}", res);
 
             match res {
                 HandleBufferResult::NeedMoreData => {
                     return gst::FlowReturn::Ok;
                 }
                 HandleBufferResult::StreamAdded(stream) => {
-                    demuxer.add_stream(&element, stream.index, stream.caps, &stream.stream_id);
+                    demuxer.add_stream(element, stream.index, stream.caps, &stream.stream_id);
                 }
                 HandleBufferResult::HaveAllStreams => {
-                    demuxer.added_all_streams(&element);
+                    demuxer.added_all_streams(element);
                 }
                 HandleBufferResult::StreamChanged(stream) => {
-                    demuxer.stream_format_changed(&element, stream.index, stream.caps);
+                    demuxer.stream_format_changed(element, stream.index, stream.caps);
                 }
                 HandleBufferResult::StreamsChanged(streams) => for stream in streams {
-                    demuxer.stream_format_changed(&element, stream.index, stream.caps);
+                    demuxer.stream_format_changed(element, stream.index, stream.caps);
                 },
                 HandleBufferResult::BufferForStream(index, buffer) => {
-                    let flow_ret = demuxer.stream_push_buffer(&element, index, buffer);
+                    let flow_ret = demuxer.stream_push_buffer(element, index, buffer);
 
                     if flow_ret != gst::FlowReturn::Ok {
                         return flow_ret;
                     }
                 }
                 HandleBufferResult::Eos(index) => {
-                    demuxer.stream_eos(&element, index);
+                    demuxer.stream_eos(element, index);
                     return gst::FlowReturn::Eos;
                 }
                 HandleBufferResult::Again => {
@@ -446,16 +435,16 @@ impl Demuxer {
                 }
             };
 
-            gst_trace!(demuxer.cat, obj: &element, "Calling again");
+            gst_trace!(demuxer.cat, obj: element, "Calling again");
 
             res = {
                 let demuxer_impl = &mut demuxer.imp.lock().unwrap();
-                match demuxer_impl.handle_buffer(&element, None) {
+                match demuxer_impl.handle_buffer(element, None) {
                     Ok(res) => res,
                     Err(flow_error) => {
                         gst_error!(
                             demuxer.cat,
-                            obj: &element,
+                            obj: element,
                             "Failed calling again: {:?}",
                             flow_error
                         );
@@ -475,28 +464,18 @@ impl Demuxer {
     fn sink_event(pad: &gst::Pad, parent: &Option<gst::Object>, event: gst::Event) -> bool {
         use gst::EventView;
 
-        let element = parent
-            .as_ref()
-            .cloned()
-            .unwrap()
-            .downcast::<Element>()
-            .unwrap();
+        let element = parent.as_ref().unwrap().downcast_ref::<Element>().unwrap();
         let demuxer = element.get_impl().downcast_ref::<Demuxer>().unwrap();
 
         match event.view() {
             EventView::Eos(..) => {
                 let demuxer_impl = &mut demuxer.imp.lock().unwrap();
 
-                gst_debug!(demuxer.cat, obj: &element, "End of stream");
-                match demuxer_impl.end_of_stream(&element) {
+                gst_debug!(demuxer.cat, obj: element, "End of stream");
+                match demuxer_impl.end_of_stream(element) {
                     Ok(_) => (),
                     Err(ref msg) => {
-                        gst_error!(
-                            demuxer.cat,
-                            obj: &element,
-                            "Failed end of stream: {:?}",
-                            msg
-                        );
+                        gst_error!(demuxer.cat, obj: element, "Failed end of stream: {:?}", msg);
                         element.post_error_message(msg);
                     }
                 }
@@ -510,12 +489,7 @@ impl Demuxer {
     fn src_query(pad: &gst::Pad, parent: &Option<gst::Object>, query: &mut gst::QueryRef) -> bool {
         use gst::QueryView;
 
-        let element = parent
-            .as_ref()
-            .cloned()
-            .unwrap()
-            .downcast::<Element>()
-            .unwrap();
+        let element = parent.as_ref().unwrap().downcast_ref::<Element>().unwrap();
         let demuxer = element.get_impl().downcast_ref::<Demuxer>().unwrap();
 
         match query.view_mut() {
@@ -527,7 +501,7 @@ impl Demuxer {
                     let position = demuxer_impl.get_position(&element);
                     gst_trace!(
                         demuxer.cat,
-                        obj: &element,
+                        obj: element,
                         "Returning position {:?}",
                         position
                     );
@@ -551,7 +525,7 @@ impl Demuxer {
                     let duration = demuxer_impl.get_duration(&element);
                     gst_trace!(
                         demuxer.cat,
-                        obj: &element,
+                        obj: element,
                         "Returning duration {:?}",
                         duration
                     );

gst-plugin-simple/src/error.rs

@@ -7,60 +7,12 @@
 // except according to those terms.
 
 use std::error::Error;
-use std::fmt::{Display, Formatter};
 use std::fmt::Error as FmtError;
+use std::fmt::{Display, Formatter};
 
 use glib;
 use gst;
 
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum FlowError {
-    Flushing,
-    Eos,
-    NotNegotiated(gst::ErrorMessage),
-    Error(gst::ErrorMessage),
-}
-
-impl Into<gst::FlowReturn> for FlowError {
-    fn into(self) -> gst::FlowReturn {
-        (&self).into()
-    }
-}
-
-impl<'a> Into<gst::FlowReturn> for &'a FlowError {
-    fn into(self) -> gst::FlowReturn {
-        match *self {
-            FlowError::Flushing => gst::FlowReturn::Flushing,
-            FlowError::Eos => gst::FlowReturn::Eos,
-            FlowError::NotNegotiated(..) => gst::FlowReturn::NotNegotiated,
-            FlowError::Error(..) => gst::FlowReturn::Error,
-        }
-    }
-}
-
-impl Display for FlowError {
-    fn fmt(&self, f: &mut Formatter) -> Result<(), FmtError> {
-        match *self {
-            FlowError::Flushing | FlowError::Eos => f.write_str(self.description()),
-            FlowError::NotNegotiated(ref m) => {
-                f.write_fmt(format_args!("{}: {}", self.description(), m))
-            }
-            FlowError::Error(ref m) => f.write_fmt(format_args!("{}: {}", self.description(), m)),
-        }
-    }
-}
-
-impl Error for FlowError {
-    fn description(&self) -> &str {
-        match *self {
-            FlowError::Flushing => "Flushing",
-            FlowError::Eos => "Eos",
-            FlowError::NotNegotiated(..) => "Not Negotiated",
-            FlowError::Error(..) => "Error",
-        }
-    }
-}
-
 #[derive(Debug, PartialEq, Eq)]
 pub struct UriError {
     error: gst::URIError,

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;
@@ -14,9 +15,9 @@ extern crate gstreamer_base as gst_base;
 
 extern crate url;
 
-pub mod source;
-pub mod sink;
 pub mod demuxer;
 pub mod error;
+pub mod sink;
+pub mod source;
 
 pub type UriValidator = Fn(&url::Url) -> Result<(), error::UriError> + Send + Sync + 'static;

gst-plugin-simple/src/sink.rs

@@ -15,15 +15,17 @@ use gst;
 use gst::prelude::*;
 use gst_base::prelude::*;
 
-use gst_plugin::object::*;
-use gst_plugin::properties::*;
-use gst_plugin::element::*;
+use gobject_subclass::object::*;
+
 use gst_plugin::base_sink::*;
+use gst_plugin::element::*;
+use gst_plugin::error::*;
 use gst_plugin::uri_handler::*;
-use error::*;
 
 pub use gst_plugin::base_sink::BaseSink;
 
+use error::*;
+
 use UriValidator;
 
 pub trait SinkImpl: Send + 'static {
@@ -41,15 +43,13 @@ struct Sink {
     imp: Mutex<Box<SinkImpl>>,
 }
 
-static PROPERTIES: [Property; 1] = [
-    Property::String(
-        "uri",
-        "URI",
-        "URI to read from",
-        None,
-        PropertyMutability::ReadWrite,
-    ),
-];
+static PROPERTIES: [Property; 1] = [Property::String(
+    "uri",
+    "URI",
+    "URI to read from",
+    None,
+    PropertyMutability::ReadWrite,
+)];
 
 impl Sink {
     fn new(sink: &BaseSink, sink_info: &SinkInfo) -> Self {

gst-plugin-simple/src/source.rs

@@ -17,15 +17,17 @@ use gst;
 use gst::prelude::*;
 use gst_base::prelude::*;
 
-use gst_plugin::object::*;
-use gst_plugin::properties::*;
-use gst_plugin::element::*;
+use gobject_subclass::object::*;
+
 use gst_plugin::base_src::*;
+use gst_plugin::element::*;
+use gst_plugin::error::*;
 use gst_plugin::uri_handler::*;
-use error::*;
 
 pub use gst_plugin::base_src::BaseSrc;
 
+use error::*;
+
 use UriValidator;
 
 pub trait SourceImpl: Send + 'static {
@@ -59,15 +61,13 @@ struct Source {
     push_only: bool,
 }
 
-static PROPERTIES: [Property; 1] = [
-    Property::String(
-        "uri",
-        "URI",
-        "URI to read from",
-        None,
-        PropertyMutability::ReadWrite,
-    ),
-];
+static PROPERTIES: [Property; 1] = [Property::String(
+    "uri",
+    "URI",
+    "URI to read from",
+    None,
+    PropertyMutability::ReadWrite,
+)];
 
 impl Source {
     fn new(source: &BaseSrc, source_info: &SourceInfo) -> Self {

gst-plugin-togglerecord/Cargo.toml

 [package]
 name = "gst-plugin-togglerecord"
-version = "0.1.0"
+version = "0.3.0"
 authors = ["Sebastian Dröge <sebastian@centricular.com>"]
 license = "LGPL-2.1+"
 
 [dependencies]
-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" }
-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 }
-send-cell = { version = "0.1", optional = true }
+glib = "0.6"
+gstreamer = "0.12"
+gstreamer-video = "0.12"
+gobject-subclass = "0.2"
+gst-plugin = { version = "0.3", path = "../gst-plugin" }
+gtk = { version = "0.5", features = ["v3_6"], optional = true }
+gio = { version = "0.5", optional = true }
 
 [dev-dependencies]
 either = "1.0"
@@ -24,5 +24,5 @@ path = "src/lib.rs"
 [[example]]
 name = "gtk-recording"
 path = "examples/gtk_recording.rs"
-required-features = ["gtk", "gio", "send-cell"]
+required-features = ["gtk", "gio"]
 

gst-plugin-togglerecord/examples/gtk_recording.rs

@@ -26,9 +26,7 @@ use gst::prelude::*;
 extern crate gtk;
 use gtk::prelude::*;
 
-extern crate send_cell;
-use send_cell::SendCell;
-
+use std::cell::RefCell;
 use std::env;
 
 fn create_pipeline() -> (
@@ -219,11 +217,18 @@ fn create_ui(app: &gtk::Application) {
 
     app.add_window(&window);
 
-    let video_sink_clone = video_sink.clone();
-    let togglerecord_clone = togglerecord.clone();
-    gtk::timeout_add(100, move || {
-        let video_sink = &video_sink_clone;
-        let togglerecord = &togglerecord_clone;
+    let video_sink_weak = video_sink.downgrade();
+    let togglerecord_weak = togglerecord.downgrade();
+    let timeout_id = gtk::timeout_add(100, move || {
+        let video_sink = match video_sink_weak.upgrade() {
+            Some(video_sink) => video_sink,
+            None => return glib::Continue(true),
+        };
+
+        let togglerecord = match togglerecord_weak.upgrade() {
+            Some(togglerecord) => togglerecord,
+            None => return glib::Continue(true),
+        };
 
         let position = video_sink
             .query_position::<gst::ClockTime>()
@@ -240,9 +245,12 @@ fn create_ui(app: &gtk::Application) {
         glib::Continue(true)
     });
 
-    let togglerecord_clone = togglerecord.clone();
+    let togglerecord_weak = togglerecord.downgrade();
     record_button.connect_clicked(move |button| {
-        let togglerecord = &togglerecord_clone;
+        let togglerecord = match togglerecord_weak.upgrade() {
+            Some(togglerecord) => togglerecord,
+            None => return,
+        };
 
         let recording = !togglerecord
             .get_property("record")
@@ -254,9 +262,13 @@ fn create_ui(app: &gtk::Application) {
         button.set_label(if recording { "Stop" } else { "Record" });
     });
 
-    let record_button_clone = record_button.clone();
+    let record_button_weak = record_button.downgrade();
     finish_button.connect_clicked(move |button| {
-        let record_button = &record_button_clone;
+        let record_button = match record_button_weak.upgrade() {
+            Some(record_button) => record_button,
+            None => return,
+        };
+
         record_button.set_sensitive(false);
         button.set_sensitive(false);
 
@@ -264,19 +276,27 @@ fn create_ui(app: &gtk::Application) {
         audio_pad.send_event(gst::Event::new_eos().build());
     });
 
-    let app_clone = app.clone();
+    let app_weak = app.downgrade();
     window.connect_delete_event(move |_, _| {
-        let app = &app_clone;
+        let app = match app_weak.upgrade() {
+            Some(app) => app,
+            None => return Inhibit(false),
+        };
+
         app.quit();
         Inhibit(false)
     });
 
     let bus = pipeline.get_bus().unwrap();
-    let app_clone = SendCell::new(app.clone());
+    let app_weak = glib::SendWeakRef::from(app.downgrade());
     bus.add_watch(move |_, msg| {
         use gst::MessageView;
 
-        let app = app_clone.borrow();
+        let app = match app_weak.upgrade() {
+            Some(app) => app,
+            None => return glib::Continue(false),
+        };
+
         match msg.view() {
             MessageView::Eos(..) => app.quit(),
             MessageView::Error(err) => {
@@ -294,15 +314,22 @@ fn create_ui(app: &gtk::Application) {
         glib::Continue(true)
     });
 
-    let pipeline_clone = pipeline.clone();
+    let ret = pipeline.set_state(gst::State::Playing);
+    assert_ne!(ret, gst::StateChangeReturn::Failure);
+
+    // Pipeline reference is owned by the closure below, so will be
+    // destroyed once the app is destroyed
+    let timeout_id = RefCell::new(Some(timeout_id));
     app.connect_shutdown(move |_| {
-        let pipeline = &pipeline_clone;
         let ret = pipeline.set_state(gst::State::Null);
         assert_ne!(ret, gst::StateChangeReturn::Failure);
-    });
 
-    let ret = pipeline.set_state(gst::State::Playing);
-    assert_ne!(ret, gst::StateChangeReturn::Failure);
+        bus.remove_watch();
+
+        if let Some(timeout_id) = timeout_id.borrow_mut().take() {
+            glib::source_remove(timeout_id);
+        }
+    });
 }
 
 fn main() {