mirrors/gstreamer-rs
mirrors/gstreamer-rs
1
1
Fork 1
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git synced 2024-06-13 03:39:25 +00:00
Code Issues Projects Releases Wiki Activity

ges: Work around trait naming conflicts

Browse source 
Fixes #151
This commit is contained in:
Thibault Saunier 2018-11-04 16:20:40 -03:00 committed by Sebastian Dröge
parent 4ec7288f56
commit f9c95b62a4
5 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gir_GstEditingServices.toml
View file

@ -141,7 +141,7 @@ trait_name = "GESContainerExt"
[[object]] [[object]]
name = "GES.Pipeline" name = "GES.Pipeline"
status = "generate" status = "generate"
trait_name = "PipelineExt" trait_name = "GESPipelineExt"
[[object.function]] [[object.function]]
name = "set_render_settings" name = "set_render_settings"
[object.function.return] [object.function.return]
@ -160,7 +160,7 @@ trait_name = "PipelineExt"
[[object]] [[object]]
name = "GES.Track" name = "GES.Track"
status = "generate" status = "generate"
trait_name = "TrackExt" trait_name = "GESTrackExt"
[[object.function]] [[object.function]]
name = "add_element" name = "add_element"
[object.function.return] [object.function.return]

1
examples/src/bin/ges.rs
View file

@ -3,7 +3,6 @@ use gst::prelude::*;
extern crate gstreamer_editing_services as ges; extern crate gstreamer_editing_services as ges;
use ges::prelude::*; use ges::prelude::*;
use ges::PipelineExt;
use std::env; use std::env;

8
gstreamer-editing-services/src/auto/mod.rs
View file

@ -35,7 +35,7 @@ pub use self::layer::LayerExt;
mod pipeline; mod pipeline;
pub use self::pipeline::Pipeline; pub use self::pipeline::Pipeline;
pub use self::pipeline::PipelineExt; pub use self::pipeline::GESPipelineExt;
mod project; mod project;
pub use self::project::Project; pub use self::project::Project;
@ -51,7 +51,7 @@ pub use self::timeline_element::TimelineElementExt;
mod track; mod track;
pub use self::track::Track; pub use self::track::Track;
pub use self::track::TrackExt; pub use self::track::GESTrackExt;
mod track_element; mod track_element;
pub use self::track_element::TrackElement; pub use self::track_element::TrackElement;
@ -86,11 +86,11 @@ pub mod traits {
pub use super::ExtractableExt; pub use super::ExtractableExt;
pub use super::GroupExt; pub use super::GroupExt;
pub use super::LayerExt; pub use super::LayerExt;
pub use super::PipelineExt; pub use super::GESPipelineExt;
pub use super::ProjectExt; pub use super::ProjectExt;
pub use super::TimelineExt; pub use super::TimelineExt;
pub use super::TimelineElementExt; pub use super::TimelineElementExt;
pub use super::TrackExt; pub use super::GESTrackExt;
pub use super::TrackElementExt; pub use super::TrackElementExt;
pub use super::UriClipExt; pub use super::UriClipExt;
pub use super::UriClipAssetExt; pub use super::UriClipAssetExt;

4
gstreamer-editing-services/src/auto/pipeline.rs
View file

@ -51,7 +51,7 @@ impl Default for Pipeline {
} }
} }
pub trait PipelineExt { pub trait GESPipelineExt {
fn get_mode(&self) -> PipelineFlags; fn get_mode(&self) -> PipelineFlags;
fn get_thumbnail(&self, caps: &gst::Caps) -> Option<gst::Sample>; fn get_thumbnail(&self, caps: &gst::Caps) -> Option<gst::Sample>;
@ -105,7 +105,7 @@ pub trait PipelineExt {
fn connect_property_video_sink_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId; fn connect_property_video_sink_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
} }
impl<O: IsA<Pipeline> + IsA<glib::object::Object>> PipelineExt for O { impl<O: IsA<Pipeline> + IsA<glib::object::Object>> GESPipelineExt for O {
fn get_mode(&self) -> PipelineFlags { fn get_mode(&self) -> PipelineFlags {
unsafe { unsafe {
from_glib(ffi::ges_pipeline_get_mode(self.to_glib_none().0)) from_glib(ffi::ges_pipeline_get_mode(self.to_glib_none().0))

4
gstreamer-editing-services/src/auto/track.rs
View file

@ -43,7 +43,7 @@ impl Track {
} }
} }
pub trait TrackExt { pub trait GESTrackExt {
fn add_element<P: IsA<TrackElement>>(&self, object: &P) -> Result<(), glib::error::BoolError>; fn add_element<P: IsA<TrackElement>>(&self, object: &P) -> Result<(), glib::error::BoolError>;
fn commit(&self) -> bool; fn commit(&self) -> bool;
@ -91,7 +91,7 @@ pub trait TrackExt {
fn connect_property_track_type_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId; fn connect_property_track_type_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
} }
impl<O: IsA<Track> + IsA<glib::object::Object>> TrackExt for O { impl<O: IsA<Track> + IsA<glib::object::Object>> GESTrackExt for O {
fn add_element<P: IsA<TrackElement>>(&self, object: &P) -> Result<(), glib::error::BoolError> { fn add_element<P: IsA<TrackElement>>(&self, object: &P) -> Result<(), glib::error::BoolError> {
unsafe { unsafe {
glib::error::BoolError::from_glib(ffi::ges_track_add_element(self.to_glib_none().0, object.to_glib_none().0), "Failed to add element") glib::error::BoolError::from_glib(ffi::ges_track_add_element(self.to_glib_none().0, object.to_glib_none().0), "Failed to add element")