From 79fc47b41f7ec8c117748e79e38dbd0c04fec914 Mon Sep 17 00:00:00 2001 From: Daniel Vilar Date: Tue, 11 Sep 2018 09:47:17 +0200 Subject: [PATCH] Updated gstreamer rust bindings to version 0.12 and gstreamer plugin to 0.3 --- gst-plugin-ndi/Cargo.toml | 15 +++++++-------- gst-plugin-ndi/src/lib.rs | 5 ++--- gst-plugin-ndi/src/ndiaudiosrc.rs | 3 +-- gst-plugin-ndi/src/ndivideosrc.rs | 3 +-- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/gst-plugin-ndi/Cargo.toml b/gst-plugin-ndi/Cargo.toml index e4d6caec..e79d6760 100644 --- a/gst-plugin-ndi/Cargo.toml +++ b/gst-plugin-ndi/Cargo.toml @@ -6,15 +6,14 @@ repository = "https://gitlab.teltek.es/rubenrua/ndi-rs.git" license = "unknow" # TODO MIT/Apache-2.0 [dependencies] -gst-plugin = "0.2" -glib = "0.5" -gstreamer = "0.11" -gstreamer-base = "0.11" -gstreamer-video = "0.11" -gstreamer-audio = "0.11" +gobject-subclass = "0.2" +gst-plugin = "0.3" +glib = "0.6" +gstreamer = "0.12" +gstreamer-base = "0.12" +gstreamer-video = "0.12" +gstreamer-audio = "0.12" lazy_static = "1.1.0" -byte-slice-cast = "0.1" # TODO delete -num-traits = "0.2" # TODO delete [lib] name = "gstndi" diff --git a/gst-plugin-ndi/src/lib.rs b/gst-plugin-ndi/src/lib.rs index 58a7c271..c55e2726 100644 --- a/gst-plugin-ndi/src/lib.rs +++ b/gst-plugin-ndi/src/lib.rs @@ -9,6 +9,8 @@ // except according to those terms. extern crate glib; +extern crate gobject_subclass; + #[macro_use] extern crate gst_plugin; #[macro_use] @@ -17,8 +19,6 @@ extern crate gstreamer_audio as gst_audio; extern crate gstreamer_base as gst_base; extern crate gstreamer_video as gst_video; -extern crate byte_slice_cast; -extern crate num_traits; #[macro_use] extern crate lazy_static; @@ -27,7 +27,6 @@ mod ndiaudiosrc; pub mod ndilib; use std::{thread, time}; -//use std::time::{SystemTime, UNIX_EPOCH}; use std::ffi::{CStr, CString}; use ndilib::*; use gst_plugin::base_src::*; diff --git a/gst-plugin-ndi/src/ndiaudiosrc.rs b/gst-plugin-ndi/src/ndiaudiosrc.rs index cba58f6a..28356f4f 100644 --- a/gst-plugin-ndi/src/ndiaudiosrc.rs +++ b/gst-plugin-ndi/src/ndiaudiosrc.rs @@ -8,8 +8,7 @@ use gst_base::prelude::*; use gst_plugin::base_src::*; use gst_plugin::element::*; -use gst_plugin::object::*; -use gst_plugin::properties::*; +use gobject_subclass::object::*; use std::sync::Mutex; use std::{i32, u32}; diff --git a/gst-plugin-ndi/src/ndivideosrc.rs b/gst-plugin-ndi/src/ndivideosrc.rs index 910b74a6..a273eefb 100644 --- a/gst-plugin-ndi/src/ndivideosrc.rs +++ b/gst-plugin-ndi/src/ndivideosrc.rs @@ -9,8 +9,7 @@ use gst::Fraction; use gst_plugin::base_src::*; use gst_plugin::element::*; -use gst_plugin::object::*; -use gst_plugin::properties::*; +use gobject_subclass::object::*; use std::sync::Mutex; use std::{i32, u32};