From 2d2459ed524cdc26322ae62c9886450f48a648d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 17 Oct 2019 13:04:29 +0300 Subject: [PATCH] Export traits from the crate level and ensure that all traits are in the preludes --- gstreamer-audio/src/lib.rs | 4 ++-- gstreamer-base/src/lib.rs | 9 ++++++++- gstreamer-base/src/subclass/base_parse.rs | 1 + gstreamer-rtsp-server/src/lib.rs | 2 ++ gstreamer-video/src/lib.rs | 8 +++++--- gstreamer/src/lib.rs | 8 ++++++++ 6 files changed, 26 insertions(+), 6 deletions(-) diff --git a/gstreamer-audio/src/lib.rs b/gstreamer-audio/src/lib.rs index 8660b5a34..74e88910a 100644 --- a/gstreamer-audio/src/lib.rs +++ b/gstreamer-audio/src/lib.rs @@ -53,9 +53,9 @@ pub use audio_channel_position::*; mod audio_stream_align; mod audio_decoder; -pub use audio_decoder::*; +pub use audio_decoder::AudioDecoderExtManual; mod audio_encoder; -pub use audio_encoder::*; +pub use audio_encoder::AudioEncoderExtManual; use glib::translate::{from_glib_full, ToGlibPtr}; pub fn audio_buffer_clip( diff --git a/gstreamer-base/src/lib.rs b/gstreamer-base/src/lib.rs index 38890feee..d31cbad66 100644 --- a/gstreamer-base/src/lib.rs +++ b/gstreamer-base/src/lib.rs @@ -52,11 +52,19 @@ pub use flow_combiner::*; #[cfg(any(feature = "v1_14", feature = "dox"))] mod aggregator; #[cfg(any(feature = "v1_14", feature = "dox"))] +pub use aggregator::AggregatorExtManual; +#[cfg(any(feature = "v1_14", feature = "dox"))] mod aggregator_pad; +#[cfg(any(feature = "v1_14", feature = "dox"))] +pub use aggregator_pad::AggregatorPadExtManual; mod base_parse; +pub use base_parse::BaseParseExtManual; mod base_sink; +pub use base_sink::BaseSinkExtManual; mod base_src; +pub use base_src::BaseSrcExtManual; mod base_transform; +pub use base_transform::BaseTransformExtManual; pub mod base_parse_frame; pub use base_parse_frame::BaseParseFrame; @@ -77,7 +85,6 @@ pub mod prelude { pub use aggregator_pad::AggregatorPadExtManual; pub use auto::traits::*; pub use base_parse::BaseParseExtManual; - pub use base_parse_frame::BaseParseFrame; pub use base_sink::BaseSinkExtManual; pub use base_src::BaseSrcExtManual; pub use base_transform::BaseTransformExtManual; diff --git a/gstreamer-base/src/subclass/base_parse.rs b/gstreamer-base/src/subclass/base_parse.rs index 98aab65c7..bd43f2d2e 100644 --- a/gstreamer-base/src/subclass/base_parse.rs +++ b/gstreamer-base/src/subclass/base_parse.rs @@ -21,6 +21,7 @@ use gst::subclass::prelude::*; use BaseParse; use BaseParseClass; +use BaseParseFrame; pub trait BaseParseImpl: BaseParseImplExt + ElementImpl + Send + Sync + 'static { fn start(&self, element: &BaseParse) -> Result<(), gst::ErrorMessage> { diff --git a/gstreamer-rtsp-server/src/lib.rs b/gstreamer-rtsp-server/src/lib.rs index 7570cd19d..6ecb15650 100644 --- a/gstreamer-rtsp-server/src/lib.rs +++ b/gstreamer-rtsp-server/src/lib.rs @@ -67,6 +67,8 @@ pub use rtsp_client::RTSPClientExtManual; pub use rtsp_media_factory::RTSPMediaFactoryExtManual; pub use rtsp_server::RTSPServerExtManual; pub use rtsp_session_pool::RTSPSessionPoolExtManual; +pub use rtsp_stream::RTSPStreamExtManual; +pub use rtsp_stream_transport::RTSPStreamTransportExtManual; pub use rtsp_context::*; pub use rtsp_token::*; diff --git a/gstreamer-video/src/lib.rs b/gstreamer-video/src/lib.rs index cb83fbb16..084311e2d 100644 --- a/gstreamer-video/src/lib.rs +++ b/gstreamer-video/src/lib.rs @@ -52,7 +52,7 @@ pub use video_info::*; pub mod video_frame; pub use video_frame::{VideoBufferExt, VideoFrame, VideoFrameRef}; mod video_overlay; -pub use video_overlay::*; +pub use video_overlay::VideoOverlayExtManual; mod video_event; pub use video_event::*; mod functions; @@ -73,17 +73,19 @@ mod video_time_code_interval; pub use video_time_code_interval::VideoTimeCodeInterval; mod video_buffer_pool; pub use video_buffer_pool::{ - VideoAlignment, BUFFER_POOL_OPTION_VIDEO_AFFINE_TRANSFORMATION_META, + VideoAlignment, VideoBufferPoolConfig, BUFFER_POOL_OPTION_VIDEO_AFFINE_TRANSFORMATION_META, BUFFER_POOL_OPTION_VIDEO_ALIGNMENT, BUFFER_POOL_OPTION_VIDEO_GL_TEXTURE_UPLOAD_META, BUFFER_POOL_OPTION_VIDEO_META, }; mod video_codec_frame; mod video_decoder; +pub use video_decoder::VideoDecoderExtManual; mod video_encoder; pub use video_codec_frame::VideoCodecFrame; +pub use video_encoder::VideoEncoderExtManual; pub mod video_codec_state; -pub use video_codec_state::VideoCodecState; +pub use video_codec_state::{VideoCodecState, VideoCodecStateContext}; mod utils; pub const VIDEO_ENCODER_FLOW_NEED_DATA: gst::FlowSuccess = gst::FlowSuccess::CustomSuccess; diff --git a/gstreamer/src/lib.rs b/gstreamer/src/lib.rs index 086e6ec77..c63083f2a 100644 --- a/gstreamer/src/lib.rs +++ b/gstreamer/src/lib.rs @@ -159,7 +159,9 @@ mod element; mod bin; mod allocator; +pub use allocator::AllocatorExtManual; mod pipeline; +pub use pipeline::GstPipelineExtManual; mod allocation_params; pub use self::allocation_params::AllocationParams; @@ -239,6 +241,7 @@ pub use plugin_feature::PluginFeatureExtManual; pub use tag_setter::TagSetterExtManual; mod plugin; +pub use plugin::GstPluginExtManual; #[cfg(any(feature = "v1_10", feature = "dox"))] mod stream; #[cfg(any(feature = "v1_10", feature = "dox"))] @@ -322,6 +325,7 @@ pub mod prelude { pub use meta::MetaAPI; + pub use allocator::AllocatorExtManual; pub use bin::GstBinExtManual; pub use element::ElementExtManual; @@ -345,12 +349,16 @@ pub mod prelude { pub use device_monitor::DeviceMonitorExtManual; pub use device_provider::DeviceProviderExtManual; pub use gobject::GObjectExtManualGst; + pub use message::MessageErrorDomain; pub use object::GstObjectExtManual; pub use pad::PadExtManual; pub use param_spec::GstParamSpecExt; + pub use pipeline::GstPipelineExtManual; + pub use plugin::GstPluginExtManual; pub use plugin_feature::PluginFeatureExtManual; pub use proxy_pad::ProxyPadExtManual; pub use tag_setter::TagSetterExtManual; + pub use typefind::TypeFindImpl; pub use value::GstValueExt; pub use miniobject::MiniObject;