Index: /trunk/src/VBox/Devices/Audio/alsa_mangling.h =================================================================== --- /trunk/src/VBox/Devices/Audio/alsa_mangling.h (revision 73160) +++ /trunk/src/VBox/Devices/Audio/alsa_mangling.h (revision 73161) @@ -23,34 +23,30 @@ #define ALSA_MANGLER(symbol) VBox_##symbol +#define snd_lib_error_set_handler ALSA_MANGLER(snd_lib_error_set_handler) +#define snd_strerror ALSA_MANGLER(snd_strerror) + #define snd_device_name_hint ALSA_MANGLER(snd_device_name_hint) #define snd_device_name_get_hint ALSA_MANGLER(snd_device_name_get_hint) #define snd_device_name_free_hint ALSA_MANGLER(snd_device_name_free_hint) -#define snd_pcm_hw_params_any ALSA_MANGLER(snd_pcm_hw_params_any) +#define snd_pcm_avail_update ALSA_MANGLER(snd_pcm_avail_update) #define snd_pcm_close ALSA_MANGLER(snd_pcm_close) #define snd_pcm_delay ALSA_MANGLER(snd_pcm_delay) #define snd_pcm_drain ALSA_MANGLER(snd_pcm_drain) -#define snd_pcm_avail_update ALSA_MANGLER(snd_pcm_avail_update) +#define snd_pcm_drop ALSA_MANGLER(snd_pcm_drop) #define snd_pcm_nonblock ALSA_MANGLER(snd_pcm_nonblock) -#define snd_pcm_hw_params_set_channels_near ALSA_MANGLER(snd_pcm_hw_params_set_channels_near) -#define snd_pcm_hw_params_set_period_time_near ALSA_MANGLER(snd_pcm_hw_params_set_period_time_near) +#define snd_pcm_open ALSA_MANGLER(snd_pcm_open) #define snd_pcm_prepare ALSA_MANGLER(snd_pcm_prepare) -#define snd_pcm_sw_params_sizeof ALSA_MANGLER(snd_pcm_sw_params_sizeof) -#define snd_pcm_hw_params_set_period_size_near ALSA_MANGLER(snd_pcm_hw_params_set_period_size_near) -#define snd_pcm_hw_params_get_period_size ALSA_MANGLER(snd_pcm_hw_params_get_period_size) +#define snd_pcm_readi ALSA_MANGLER(snd_pcm_readi) +#define snd_pcm_resume ALSA_MANGLER(snd_pcm_resume) +#define snd_pcm_start ALSA_MANGLER(snd_pcm_start) +#define snd_pcm_state ALSA_MANGLER(snd_pcm_state) +#define snd_pcm_writei ALSA_MANGLER(snd_pcm_writei) + #define snd_pcm_hw_params ALSA_MANGLER(snd_pcm_hw_params) +#define snd_pcm_hw_params_any ALSA_MANGLER(snd_pcm_hw_params_any) #define snd_pcm_hw_params_sizeof ALSA_MANGLER(snd_pcm_hw_params_sizeof) -#define snd_pcm_state ALSA_MANGLER(snd_pcm_state) -#define snd_pcm_open ALSA_MANGLER(snd_pcm_open) -#define snd_lib_error_set_handler ALSA_MANGLER(snd_lib_error_set_handler) -#define snd_pcm_sw_params ALSA_MANGLER(snd_pcm_sw_params) +#define snd_pcm_hw_params_get_buffer_size ALSA_MANGLER(snd_pcm_hw_params_get_buffer_size) #define snd_pcm_hw_params_get_period_size_min ALSA_MANGLER(snd_pcm_hw_params_get_period_size_min) -#define snd_pcm_writei ALSA_MANGLER(snd_pcm_writei) -#define snd_pcm_readi ALSA_MANGLER(snd_pcm_readi) -#define snd_strerror ALSA_MANGLER(snd_strerror) -#define snd_pcm_start ALSA_MANGLER(snd_pcm_start) -#define snd_pcm_drop ALSA_MANGLER(snd_pcm_drop) -#define snd_pcm_resume ALSA_MANGLER(snd_pcm_resume) -#define snd_pcm_hw_params_get_buffer_size ALSA_MANGLER(snd_pcm_hw_params_get_buffer_size) #define snd_pcm_hw_params_set_rate_near ALSA_MANGLER(snd_pcm_hw_params_set_rate_near) #define snd_pcm_hw_params_set_access ALSA_MANGLER(snd_pcm_hw_params_set_access) @@ -58,8 +54,15 @@ #define snd_pcm_hw_params_set_buffer_size_near ALSA_MANGLER(snd_pcm_hw_params_set_buffer_size_near) #define snd_pcm_hw_params_get_buffer_size_min ALSA_MANGLER(snd_pcm_hw_params_get_buffer_size_min) +#define snd_pcm_hw_params_set_channels_near ALSA_MANGLER(snd_pcm_hw_params_set_channels_near) #define snd_pcm_hw_params_set_format ALSA_MANGLER(snd_pcm_hw_params_set_format) +#define snd_pcm_hw_params_get_period_size ALSA_MANGLER(snd_pcm_hw_params_get_period_size) +#define snd_pcm_hw_params_set_period_size_near ALSA_MANGLER(snd_pcm_hw_params_set_period_size_near) +#define snd_pcm_hw_params_set_period_time_near ALSA_MANGLER(snd_pcm_hw_params_set_period_time_near) + +#define snd_pcm_sw_params ALSA_MANGLER(snd_pcm_sw_params) #define snd_pcm_sw_params_current ALSA_MANGLER(snd_pcm_sw_params_current) #define snd_pcm_sw_params_set_start_threshold ALSA_MANGLER(snd_pcm_sw_params_set_start_threshold) #define snd_pcm_sw_params_set_avail_min ALSA_MANGLER(snd_pcm_sw_params_set_avail_min) +#define snd_pcm_sw_params_sizeof ALSA_MANGLER(snd_pcm_sw_params_sizeof) #endif /* !AUDIO_ALSA_MANGLING_H */ Index: /trunk/src/VBox/Devices/Audio/alsa_stubs.c =================================================================== --- /trunk/src/VBox/Devices/Audio/alsa_stubs.c (revision 73160) +++ /trunk/src/VBox/Devices/Audio/alsa_stubs.c (revision 73161) @@ -36,4 +36,8 @@ } +PROXY_STUB(snd_lib_error_set_handler, int, (snd_lib_error_handler_t handler), + (handler)) +PROXY_STUB(snd_strerror, const char *, (int errnum), (errnum)) + PROXY_STUB(snd_device_name_hint, int, (int card, const char *iface, void ***hints), @@ -46,59 +50,54 @@ (hint, id)) +/* + * PCM + */ + +PROXY_STUB(snd_pcm_avail_update, snd_pcm_sframes_t, (snd_pcm_t *pcm), + (pcm)) +PROXY_STUB(snd_pcm_close, int, (snd_pcm_t *pcm), (pcm)) +PROXY_STUB(snd_pcm_delay, int, (snd_pcm_t *pcm, snd_pcm_sframes_t *frames), + (pcm, frames)) +PROXY_STUB(snd_pcm_nonblock, int, (snd_pcm_t *pcm, int *onoff), + (pcm, onoff)) +PROXY_STUB(snd_pcm_drain, int, (snd_pcm_t *pcm), + (pcm)) +PROXY_STUB(snd_pcm_drop, int, (snd_pcm_t *pcm), (pcm)) +PROXY_STUB(snd_pcm_open, int, + (snd_pcm_t **pcm, const char *name, snd_pcm_stream_t stream, int mode), + (pcm, name, stream, mode)) +PROXY_STUB(snd_pcm_prepare, int, (snd_pcm_t *pcm), (pcm)) +PROXY_STUB(snd_pcm_readi, snd_pcm_sframes_t, + (snd_pcm_t *pcm, void *buffer, snd_pcm_uframes_t size), + (pcm, buffer, size)) +PROXY_STUB(snd_pcm_resume, int, (snd_pcm_t *pcm), (pcm)) +PROXY_STUB(snd_pcm_state, snd_pcm_state_t, (snd_pcm_t *pcm), (pcm)) +PROXY_STUB(snd_pcm_writei, snd_pcm_sframes_t, + (snd_pcm_t *pcm, const void *buffer, snd_pcm_uframes_t size), + (pcm, buffer, size)) +PROXY_STUB(snd_pcm_start, int, (snd_pcm_t *pcm), (pcm)) + +/* + * HW + */ + +PROXY_STUB(snd_pcm_hw_params, int, + (snd_pcm_t *pcm, snd_pcm_hw_params_t *params), + (pcm, params)) PROXY_STUB(snd_pcm_hw_params_any, int, (snd_pcm_t *pcm, snd_pcm_hw_params_t *params), (pcm, params)) -PROXY_STUB(snd_pcm_close, int, (snd_pcm_t *pcm), (pcm)) -PROXY_STUB(snd_pcm_avail_update, snd_pcm_sframes_t, (snd_pcm_t *pcm), - (pcm)) -PROXY_STUB(snd_pcm_nonblock, int, (snd_pcm_t *pcm, int *onoff), - (pcm, onoff)) -PROXY_STUB(snd_pcm_delay, int, (snd_pcm_t *pcm, snd_pcm_sframes_t *frames), - (pcm, frames)) -PROXY_STUB(snd_pcm_drain, int, (snd_pcm_t *pcm), - (pcm)) -PROXY_STUB(snd_pcm_hw_params_set_channels_near, int, - (snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val), - (pcm, params, val)) -PROXY_STUB(snd_pcm_hw_params_set_period_time_near, int, - (snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir), - (pcm, params, val, dir)) -PROXY_STUB(snd_pcm_prepare, int, (snd_pcm_t *pcm), (pcm)) -PROXY_STUB(snd_pcm_sw_params_sizeof, size_t, (void), ()) -PROXY_STUB(snd_pcm_hw_params_set_period_size_near, int, - (snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val, int *dir), - (pcm, params, val, dir)) +PROXY_STUB(snd_pcm_hw_params_get_buffer_size, int, + (const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val), + (params, val)) +PROXY_STUB(snd_pcm_hw_params_get_buffer_size_min, int, + (const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val), + (params, val)) PROXY_STUB(snd_pcm_hw_params_get_period_size, int, (const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *frames, int *dir), (params, frames, dir)) -PROXY_STUB(snd_pcm_hw_params, int, - (snd_pcm_t *pcm, snd_pcm_hw_params_t *params), - (pcm, params)) -PROXY_STUB(snd_pcm_hw_params_sizeof, size_t, (void), ()) -PROXY_STUB(snd_pcm_state, snd_pcm_state_t, (snd_pcm_t *pcm), (pcm)) -PROXY_STUB(snd_pcm_open, int, - (snd_pcm_t **pcm, const char *name, snd_pcm_stream_t stream, int mode), - (pcm, name, stream, mode)) -PROXY_STUB(snd_lib_error_set_handler, int, (snd_lib_error_handler_t handler), - (handler)) -PROXY_STUB(snd_pcm_sw_params, int, - (snd_pcm_t *pcm, snd_pcm_sw_params_t *params), - (pcm, params)) PROXY_STUB(snd_pcm_hw_params_get_period_size_min, int, (const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *frames, int *dir), (params, frames, dir)) -PROXY_STUB(snd_pcm_writei, snd_pcm_sframes_t, - (snd_pcm_t *pcm, const void *buffer, snd_pcm_uframes_t size), - (pcm, buffer, size)) -PROXY_STUB(snd_pcm_readi, snd_pcm_sframes_t, - (snd_pcm_t *pcm, void *buffer, snd_pcm_uframes_t size), - (pcm, buffer, size)) -PROXY_STUB(snd_strerror, const char *, (int errnum), (errnum)) -PROXY_STUB(snd_pcm_start, int, (snd_pcm_t *pcm), (pcm)) -PROXY_STUB(snd_pcm_drop, int, (snd_pcm_t *pcm), (pcm)) -PROXY_STUB(snd_pcm_resume, int, (snd_pcm_t *pcm), (pcm)) -PROXY_STUB(snd_pcm_hw_params_get_buffer_size, int, - (const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val), - (params, val)) PROXY_STUB(snd_pcm_hw_params_set_rate_near, int, (snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir), @@ -113,19 +112,35 @@ (snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val), (pcm, params, val)) -PROXY_STUB(snd_pcm_hw_params_get_buffer_size_min, int, - (const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val), - (params, val)) +PROXY_STUB(snd_pcm_hw_params_set_channels_near, int, + (snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val), + (pcm, params, val)) +PROXY_STUB(snd_pcm_hw_params_set_period_size_near, int, + (snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val, int *dir), + (pcm, params, val, dir)) +PROXY_STUB(snd_pcm_hw_params_set_period_time_near, int, + (snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir), + (pcm, params, val, dir)) +PROXY_STUB(snd_pcm_hw_params_sizeof, size_t, (void), ()) PROXY_STUB(snd_pcm_hw_params_set_format, int, (snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_t val), (pcm, params, val)) + +/* + * SW + */ + +PROXY_STUB(snd_pcm_sw_params, int, + (snd_pcm_t *pcm, snd_pcm_sw_params_t *params), + (pcm, params)) PROXY_STUB(snd_pcm_sw_params_current, int, (snd_pcm_t *pcm, snd_pcm_sw_params_t *params), (pcm, params)) +PROXY_STUB(snd_pcm_sw_params_set_avail_min, int, + (snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_uframes_t val), + (pcm, params, val)) PROXY_STUB(snd_pcm_sw_params_set_start_threshold, int, (snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_uframes_t val), (pcm, params, val)) -PROXY_STUB(snd_pcm_sw_params_set_avail_min, int, - (snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_uframes_t val), - (pcm, params, val)) +PROXY_STUB(snd_pcm_sw_params_sizeof, size_t, (void), ()) typedef struct @@ -138,43 +153,47 @@ static SHARED_FUNC SharedFuncs[] = { + ELEMENT(snd_lib_error_set_handler), + ELEMENT(snd_strerror), + ELEMENT(snd_device_name_hint), ELEMENT(snd_device_name_get_hint), ELEMENT(snd_device_name_free_hint), - ELEMENT(snd_pcm_hw_params_any), + ELEMENT(snd_pcm_avail_update), ELEMENT(snd_pcm_close), ELEMENT(snd_pcm_delay), ELEMENT(snd_pcm_drain), - ELEMENT(snd_pcm_avail_update), + ELEMENT(snd_pcm_drop), ELEMENT(snd_pcm_nonblock), + ELEMENT(snd_pcm_open), + ELEMENT(snd_pcm_prepare), + ELEMENT(snd_pcm_resume), + ELEMENT(snd_pcm_state), + + ELEMENT(snd_pcm_readi), + ELEMENT(snd_pcm_start), + ELEMENT(snd_pcm_writei), + + ELEMENT(snd_pcm_hw_params), + ELEMENT(snd_pcm_hw_params_any), + ELEMENT(snd_pcm_hw_params_sizeof), + ELEMENT(snd_pcm_hw_params_get_buffer_size), + ELEMENT(snd_pcm_hw_params_get_buffer_size_min), + ELEMENT(snd_pcm_hw_params_get_period_size_min), + ELEMENT(snd_pcm_hw_params_set_access), + ELEMENT(snd_pcm_hw_params_set_buffer_size_near), + ELEMENT(snd_pcm_hw_params_set_buffer_time_near), ELEMENT(snd_pcm_hw_params_set_channels_near), + ELEMENT(snd_pcm_hw_params_set_format), + ELEMENT(snd_pcm_hw_params_get_period_size), + ELEMENT(snd_pcm_hw_params_set_period_size_near), ELEMENT(snd_pcm_hw_params_set_period_time_near), - ELEMENT(snd_pcm_prepare), - ELEMENT(snd_pcm_sw_params_sizeof), - ELEMENT(snd_pcm_hw_params_set_period_size_near), - ELEMENT(snd_pcm_hw_params_get_period_size), - ELEMENT(snd_pcm_hw_params), - ELEMENT(snd_pcm_hw_params_sizeof), - ELEMENT(snd_pcm_state), - ELEMENT(snd_pcm_open), - ELEMENT(snd_lib_error_set_handler), + ELEMENT(snd_pcm_hw_params_set_rate_near), + ELEMENT(snd_pcm_sw_params), - ELEMENT(snd_pcm_hw_params_get_period_size_min), - ELEMENT(snd_pcm_writei), - ELEMENT(snd_pcm_readi), - ELEMENT(snd_strerror), - ELEMENT(snd_pcm_start), - ELEMENT(snd_pcm_drop), - ELEMENT(snd_pcm_resume), - ELEMENT(snd_pcm_hw_params_get_buffer_size), - ELEMENT(snd_pcm_hw_params_set_rate_near), - ELEMENT(snd_pcm_hw_params_set_access), - ELEMENT(snd_pcm_hw_params_set_buffer_time_near), - ELEMENT(snd_pcm_hw_params_set_buffer_size_near), - ELEMENT(snd_pcm_hw_params_get_buffer_size_min), - ELEMENT(snd_pcm_hw_params_set_format), ELEMENT(snd_pcm_sw_params_current), ELEMENT(snd_pcm_sw_params_set_start_threshold), - ELEMENT(snd_pcm_sw_params_set_avail_min) + ELEMENT(snd_pcm_sw_params_set_avail_min), + ELEMENT(snd_pcm_sw_params_sizeof), }; #undef ELEMENT