vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Mon Jul 11 18:34:54 2011 +0300| [2bb92db6f1f120fb750ae3e0546407d05b9db959] | committer: Rémi Denis-Courmont
Remove __ prefix in *New() core functions > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2bb92db6f1f120fb750ae3e0546407d05b9db959 --- src/audio_output/aout_internal.h | 4 ++-- src/audio_output/common.c | 3 ++- src/input/access.c | 7 ++++--- src/input/access.h | 8 ++++---- src/input/demux.c | 10 +++++----- src/input/demux.h | 4 ++-- 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/audio_output/aout_internal.h b/src/audio_output/aout_internal.h index 4a23673..da8a438 100644 --- a/src/audio_output/aout_internal.h +++ b/src/audio_output/aout_internal.h @@ -121,9 +121,9 @@ void aout_OutputDelete( aout_instance_t * p_aout ); /* From common.c : */ -#define aout_New(a) __aout_New(VLC_OBJECT(a)) /* Release with vlc_object_release() */ -aout_instance_t * __aout_New ( vlc_object_t * ); +aout_instance_t *aout_New ( vlc_object_t * ); +#define aout_New(a) aout_New(VLC_OBJECT(a)) void aout_FifoInit( vlc_object_t *, aout_fifo_t *, uint32_t ); #define aout_FifoInit(o, f, r) aout_FifoInit(VLC_OBJECT(o), f, r) diff --git a/src/audio_output/common.c b/src/audio_output/common.c index 659e445..dae3894 100644 --- a/src/audio_output/common.c +++ b/src/audio_output/common.c @@ -43,10 +43,11 @@ /* Local functions */ static void aout_Destructor( vlc_object_t * p_this ); +#undef aout_New /***************************************************************************** * aout_New: initialize aout structure *****************************************************************************/ -aout_instance_t * __aout_New( vlc_object_t * p_parent ) +aout_instance_t *aout_New( vlc_object_t * p_parent ) { aout_instance_t * p_aout; diff --git a/src/input/access.c b/src/input/access.c index a1474bf..1591560 100644 --- a/src/input/access.c +++ b/src/input/access.c @@ -46,12 +46,13 @@ static char *get_path(const char *location) return path; } +#undef access_New /***************************************************************************** * access_New: *****************************************************************************/ -access_t *__access_New( vlc_object_t *p_obj, input_thread_t *p_parent_input, - const char *psz_access, const char *psz_demux, - const char *psz_location ) +access_t *access_New( vlc_object_t *p_obj, input_thread_t *p_parent_input, + const char *psz_access, const char *psz_demux, + const char *psz_location ) { access_t *p_access = vlc_custom_create( p_obj, sizeof (*p_access), "access" ); diff --git a/src/input/access.h b/src/input/access.h index 6679a8e..e999832 100644 --- a/src/input/access.h +++ b/src/input/access.h @@ -28,10 +28,10 @@ #include <vlc_common.h> #include <vlc_access.h> -#define access_New( a, b, c, d, e ) __access_New(VLC_OBJECT(a), b, c, d, e ) -access_t * __access_New( vlc_object_t *p_obj, input_thread_t *p_input, - const char *psz_access, const char *psz_demux, - const char *psz_path ); +access_t *access_New( vlc_object_t *p_obj, input_thread_t *p_input, + const char *psz_access, const char *psz_demux, + const char *psz_path ); +#define access_New( a, b, c, d, e ) access_New(VLC_OBJECT(a), b, c, d, e ) void access_Delete( access_t * ); #endif diff --git a/src/input/demux.c b/src/input/demux.c index 5277c8f..117b5ef 100644 --- a/src/input/demux.c +++ b/src/input/demux.c @@ -52,15 +52,15 @@ static char *get_path(const char *location) return path; } - +#undef demux_New /***************************************************************************** * demux_New: * if s is NULL then load a access_demux *****************************************************************************/ -demux_t *__demux_New( vlc_object_t *p_obj, input_thread_t *p_parent_input, - const char *psz_access, const char *psz_demux, - const char *psz_location, - stream_t *s, es_out_t *out, bool b_quick ) +demux_t *demux_New( vlc_object_t *p_obj, input_thread_t *p_parent_input, + const char *psz_access, const char *psz_demux, + const char *psz_location, + stream_t *s, es_out_t *out, bool b_quick ) { demux_t *p_demux = vlc_custom_create( p_obj, sizeof( *p_demux ), "demux" ); const char *psz_module; diff --git a/src/input/demux.h b/src/input/demux.h index 4a3aceb..fce3ea6 100644 --- a/src/input/demux.h +++ b/src/input/demux.h @@ -31,8 +31,8 @@ #include "stream.h" /* stream_t *s could be null and then it mean a access+demux in one */ -#define demux_New( a, b, c, d, e, f, g, h ) __demux_New(VLC_OBJECT(a),b,c,d,e,f,g,h) -demux_t *__demux_New( vlc_object_t *p_obj, input_thread_t *p_parent_input, const char *psz_access, const char *psz_demux, const char *psz_path, stream_t *s, es_out_t *out, bool ); +demux_t *demux_New( vlc_object_t *p_obj, input_thread_t *p_parent_input, const char *psz_access, const char *psz_demux, const char *psz_path, stream_t *s, es_out_t *out, bool ); +#define demux_New( a, b, c, d, e, f, g, h ) demux_New(VLC_OBJECT(a),b,c,d,e,f,g,h) void demux_Delete( demux_t * ); _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
