mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2025-01-09 10:45:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #26 from teltek/feature_gst_v0.14.0

Browse source 
Update to the new version of the GStreamer Rust bindings, 0.14.0
This commit is contained in:
Alfonso Rodríguez Pereira 2019-06-27 13:10:10 +02:00 committed by GitHub
commit def42b5514
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -26,5 +26,5 @@ install:
- rustup component add clippy-preview - rustup component add clippy-preview
script: script:
- cargo fmt -- --check - cargo fmt -- --check
- touch ./src/*.rs && cargo clippy -- -A cast_ptr_alignment -A new_ret_no_self - touch ./src/*.rs && cargo clippy -- -A clippy::cast_ptr_alignment -A clippy::new_ret_no_self
- cargo build - cargo build

10
Cargo.toml
View file

@ -6,11 +6,11 @@ repository = "https://github.com/teltek/gst-plugin-ndi"
license = "LGPL" license = "LGPL"
[dependencies] [dependencies]
glib = { version = "0.7.1", features = ["subclassing"] } glib = { version = "0.8.0", features = ["subclassing"] }
gstreamer = { version = "0.13.0", features = ["subclassing"] } gstreamer = { version = "0.14.0", features = ["subclassing"] }
gstreamer-base = { version = "0.13.0", features = ["subclassing"] } gstreamer-base = { version = "0.14.0", features = ["subclassing"] }
gstreamer-audio = "0.13.0" gstreamer-audio = "0.14.0"
gstreamer-video = "0.13.0" gstreamer-video = "0.14.0"
lazy_static = "1.1.0" lazy_static = "1.1.0"
byte-slice-cast = "0.2.0" byte-slice-cast = "0.2.0"

2
src/lib.rs
View file

@ -254,7 +254,7 @@ fn stop_ndi(cat: gst::DebugCategory, element: &gst_base::BaseSrc, id: i8) -> boo
} }
gst_plugin_define!( gst_plugin_define!(
"ndi", ndi,
"NewTek NDI Plugin", "NewTek NDI Plugin",
plugin_init, plugin_init,
"1.0.0", "1.0.0",

11
src/ndiaudiosrc.rs
View file

@ -111,7 +111,7 @@ impl ObjectSubclass for NdiAudioSrc {
cat: gst::DebugCategory::new( cat: gst::DebugCategory::new(
"ndiaudiosrc", "ndiaudiosrc",
gst::DebugColorFlags::empty(), gst::DebugColorFlags::empty(),
"NewTek NDI Audio Source", Some("NewTek NDI Audio Source"),
), ),
settings: Mutex::new(Default::default()), settings: Mutex::new(Default::default()),
state: Mutex::new(Default::default()), state: Mutex::new(Default::default()),
@ -297,7 +297,7 @@ impl BaseSrcImpl for NdiAudioSrc {
fn set_caps( fn set_caps(
&self, &self,
element: &gst_base::BaseSrc, element: &gst_base::BaseSrc,
caps: &gst::CapsRef, caps: &gst::Caps,
) -> Result<(), gst::LoggableError> { ) -> Result<(), gst::LoggableError> {
let info = match gst_audio::AudioInfo::from_caps(caps) { let info = match gst_audio::AudioInfo::from_caps(caps) {
None => { None => {
@ -544,5 +544,10 @@ impl BaseSrcImpl for NdiAudioSrc {
} }
pub fn register(plugin: &gst::Plugin) -> Result<(), glib::BoolError> { pub fn register(plugin: &gst::Plugin) -> Result<(), glib::BoolError> {
gst::Element::register(Some(plugin), "ndiaudiosrc", 0, NdiAudioSrc::get_type()) gst::Element::register(
Some(plugin),
"ndiaudiosrc",
gst::Rank::None,
NdiAudioSrc::get_type(),
)
} }

11
src/ndivideosrc.rs
View file

@ -112,7 +112,7 @@ impl ObjectSubclass for NdiVideoSrc {
cat: gst::DebugCategory::new( cat: gst::DebugCategory::new(
"ndivideosrc", "ndivideosrc",
gst::DebugColorFlags::empty(), gst::DebugColorFlags::empty(),
"NewTek NDI Video Source", Some("NewTek NDI Video Source"),
), ),
settings: Mutex::new(Default::default()), settings: Mutex::new(Default::default()),
state: Mutex::new(Default::default()), state: Mutex::new(Default::default()),
@ -305,7 +305,7 @@ impl BaseSrcImpl for NdiVideoSrc {
fn set_caps( fn set_caps(
&self, &self,
element: &gst_base::BaseSrc, element: &gst_base::BaseSrc,
caps: &gst::CapsRef, caps: &gst::Caps,
) -> Result<(), gst::LoggableError> { ) -> Result<(), gst::LoggableError> {
let info = match gst_video::VideoInfo::from_caps(caps) { let info = match gst_video::VideoInfo::from_caps(caps) {
None => { None => {
@ -533,5 +533,10 @@ impl BaseSrcImpl for NdiVideoSrc {
} }
pub fn register(plugin: &gst::Plugin) -> Result<(), glib::BoolError> { pub fn register(plugin: &gst::Plugin) -> Result<(), glib::BoolError> {
gst::Element::register(Some(plugin), "ndivideosrc", 0, NdiVideoSrc::get_type()) gst::Element::register(
Some(plugin),
"ndivideosrc",
gst::Rank::None,
NdiVideoSrc::get_type(),
)
} }