vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Fri Apr 26 19:54:49 2013 +0300| [83660dd106e796edf08183ef11a84f274d39f18b] | committer: Rémi Denis-Courmont
aout: export aout_Filters*() functions > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=83660dd106e796edf08183ef11a84f274d39f18b --- include/vlc_aout.h | 16 +++++++++++++++- src/audio_output/aout_internal.h | 17 ++--------------- src/libvlccore.sym | 4 ++++ 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/include/vlc_aout.h b/include/vlc_aout.h index d9f5f40..cf6bb09 100644 --- a/include/vlc_aout.h +++ b/include/vlc_aout.h @@ -317,8 +317,22 @@ static inline int aout_ChannelsRestart (vlc_object_t *obj, const char *varname, return 0; } +/* Audio output filters */ +typedef struct aout_filters aout_filters_t; +typedef struct aout_request_vout aout_request_vout_t; + +VLC_API aout_filters_t *aout_FiltersNew(vlc_object_t *, + const audio_sample_format_t *, + const audio_sample_format_t *, + const aout_request_vout_t *) VLC_USED; +#define aout_FiltersNew(o,inf,outf,rv) \ + aout_FiltersNew(VLC_OBJECT(o),inf,outf,rv) +VLC_API void aout_FiltersDelete(vlc_object_t *, aout_filters_t *); +#define aout_FiltersDelete(o,f) \ + aout_FiltersDelete(VLC_OBJECT(o),f) +VLC_API bool aout_FiltersAdjustResampling(aout_filters_t *, int); +VLC_API block_t *aout_FiltersPlay(aout_filters_t *, block_t *, int rate); -/* */ VLC_API vout_thread_t * aout_filter_RequestVout( filter_t *, vout_thread_t *p_vout, video_format_t *p_fmt ); #endif /* VLC_AOUT_H */ diff --git a/src/audio_output/aout_internal.h b/src/audio_output/aout_internal.h index a3bd0de..abe6513 100644 --- a/src/audio_output/aout_internal.h +++ b/src/audio_output/aout_internal.h @@ -35,14 +35,13 @@ enum { AOUT_RESAMPLING_DOWN }; -typedef struct +struct aout_request_vout { struct vout_thread_t *(*pf_request_vout)( void *, struct vout_thread_t *, video_format_t *, bool ); void *p_private; -} aout_request_vout_t; +}; -typedef struct aout_filters aout_filters_t; typedef struct aout_volume aout_volume_t; typedef struct aout_dev aout_dev_t; @@ -100,18 +99,6 @@ static inline aout_owner_t *aout_owner (audio_output_t *aout) * Prototypes *****************************************************************************/ -/* From filters.c : */ -aout_filters_t *aout_FiltersNew(vlc_object_t *, const audio_sample_format_t *, - const audio_sample_format_t *, - const aout_request_vout_t *); -#define aout_FiltersNew(o,inf,outf,rv) \ - aout_FiltersNew(VLC_OBJECT(o),inf,outf,rv) -void aout_FiltersDelete(vlc_object_t *, aout_filters_t *); -#define aout_FiltersDelete(o,f) \ - aout_FiltersDelete(VLC_OBJECT(o),f) -bool aout_FiltersAdjustResampling(aout_filters_t *, int); -block_t *aout_FiltersPlay(aout_filters_t *, block_t *, int rate); - /* From mixer.c : */ aout_volume_t *aout_volume_New(vlc_object_t *, const audio_replay_gain_t *); #define aout_volume_New(o, g) aout_volume_New(VLC_OBJECT(o), g) diff --git a/src/libvlccore.sym b/src/libvlccore.sym index 4411e6e..fcee482 100644 --- a/src/libvlccore.sym +++ b/src/libvlccore.sym @@ -18,6 +18,10 @@ aout_MuteGet aout_DeviceGet aout_DeviceSet aout_DevicesList +aout_FiltersNew +aout_FiltersDelete +aout_FiltersPlay +aout_FiltersAdjustResampling block_Alloc block_FifoCount block_FifoEmpty _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
