From: Jaroslav Kysela Date: Wed, 5 Nov 2003 10:38:37 +0000 (+0000) Subject: Switch from old to new PCM API retaining binary compatibility X-Git-Tag: v1.0.3~75 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=d4af763f8ae5054ba76915b97fc8b1efec2f7d1d;p=alsa-lib.git Switch from old to new PCM API retaining binary compatibility Changed version to 1.0.0pre1 --- diff --git a/Makefile.am b/Makefile.am index 33be0a8c..1df28f6e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ SUBDIRS=doc include src aserver alsalisp test utils -EXTRA_DIST=ChangeLog INSTALL TODO configure cvscompile libtool depcomp version MEMORY-LEAK +EXTRA_DIST=ChangeLog INSTALL TODO NOTES configure cvscompile libtool depcomp version MEMORY-LEAK INCLUDES=-I$(top_srcdir)/include diff --git a/NOTES b/NOTES new file mode 100644 index 00000000..2630638b --- /dev/null +++ b/NOTES @@ -0,0 +1,16 @@ +Old versus new PCM API (values returned using indirect pointers) +================================================================ + +From the binary compatibility view, there is no change. For compilation, +1.0 ALSA applications do not need any change. The older applications must +use this include sequence: + +#define ALSA_PCM_OLD_HW_PARAMS_API +#define ALSA_PCM_OLD_SW_PARAMS_API +#include + +If you use already the new API, you may remove old defines selecting +this API, because they are no longer used: + +#define ALSA_PCM_NEW_HW_PARAMS_API +#define ALSA_PCM_NEW_SW_PARAMS_API diff --git a/configure.in b/configure.in index b6b62c1b..055bbcb1 100644 --- a/configure.in +++ b/configure.in @@ -8,7 +8,7 @@ dnl add API = c+1:0:a+1 dnl remove API = c+1:0:0 dnl ************************************************* AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(alsa-lib, 0.9.8) +AM_INIT_AUTOMAKE(alsa-lib, 1.0.0pre1) eval LIBTOOL_VERSION_INFO="2:0:0" dnl ************************************************* AM_CONDITIONAL(INSTALL_M4, test -n "${ACLOCAL}") diff --git a/include/pcm.h b/include/pcm.h index 7463825c..a3b3ac4f 100644 --- a/include/pcm.h +++ b/include/pcm.h @@ -525,132 +525,137 @@ void snd_pcm_hw_params_free(snd_pcm_hw_params_t *obj); void snd_pcm_hw_params_copy(snd_pcm_hw_params_t *dst, const snd_pcm_hw_params_t *src); #ifndef ALSA_LIBRARY_BUILD -#ifdef ALSA_PCM_NEW_HW_PARAMS_API -int snd_pcm_hw_params_get_access(const snd_pcm_hw_params_t *params, snd_pcm_access_t *access) __attribute__ ((weak, alias ("__snd_pcm_hw_params_get_access"))); +#ifndef ALSA_PCM_OLD_HW_PARAMS_API + +int snd_pcm_hw_params_get_access(const snd_pcm_hw_params_t *params, snd_pcm_access_t *access); int snd_pcm_hw_params_test_access(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t access); int snd_pcm_hw_params_set_access(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t access); -int snd_pcm_hw_params_set_access_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t *access) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_access_last"))); -int snd_pcm_hw_params_set_access_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t *access) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_access_last"))); +int snd_pcm_hw_params_set_access_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t *access); +int snd_pcm_hw_params_set_access_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t *access); int snd_pcm_hw_params_set_access_mask(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_mask_t *mask); int snd_pcm_hw_params_get_access_mask(snd_pcm_hw_params_t *params, snd_pcm_access_mask_t *mask); -int snd_pcm_hw_params_get_format(const snd_pcm_hw_params_t *params, snd_pcm_format_t *val) __attribute__ ((weak, alias ("__snd_pcm_hw_params_get_format"))); +int snd_pcm_hw_params_get_format(const snd_pcm_hw_params_t *params, snd_pcm_format_t *val); int snd_pcm_hw_params_test_format(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_t val); int snd_pcm_hw_params_set_format(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_t val); -int snd_pcm_hw_params_set_format_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_t *format) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_format_first"))); -int snd_pcm_hw_params_set_format_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_t *format) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_format_last"))); +int snd_pcm_hw_params_set_format_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_t *format); +int snd_pcm_hw_params_set_format_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_t *format); int snd_pcm_hw_params_set_format_mask(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_mask_t *mask); void snd_pcm_hw_params_get_format_mask(snd_pcm_hw_params_t *params, snd_pcm_format_mask_t *mask); -int snd_pcm_hw_params_get_subformat(const snd_pcm_hw_params_t *params, snd_pcm_subformat_t *subformat) __attribute__ ((weak, alias ("__snd_pcm_hw_params_get_subformat"))); +int snd_pcm_hw_params_get_subformat(const snd_pcm_hw_params_t *params, snd_pcm_subformat_t *subformat); int snd_pcm_hw_params_test_subformat(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_subformat_t subformat); int snd_pcm_hw_params_set_subformat(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_subformat_t subformat); -int snd_pcm_hw_params_set_subformat_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_subformat_t *subformat) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_subformat_first"))); -int snd_pcm_hw_params_set_subformat_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_subformat_t *subformat) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_subformat_last"))); +int snd_pcm_hw_params_set_subformat_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_subformat_t *subformat); +int snd_pcm_hw_params_set_subformat_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_subformat_t *subformat); int snd_pcm_hw_params_set_subformat_mask(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_subformat_mask_t *mask); void snd_pcm_hw_params_get_subformat_mask(snd_pcm_hw_params_t *params, snd_pcm_subformat_mask_t *mask); -int snd_pcm_hw_params_get_channels(const snd_pcm_hw_params_t *params, unsigned int *val) __attribute__ ((weak, alias ("__snd_pcm_hw_params_get_channels"))); -int snd_pcm_hw_params_get_channels_min(const snd_pcm_hw_params_t *params, unsigned int *val) __attribute__ ((weak, alias ("__snd_pcm_hw_params_get_channels_min"))); -int snd_pcm_hw_params_get_channels_max(const snd_pcm_hw_params_t *params, unsigned int *val) __attribute__ ((weak, alias ("__snd_pcm_hw_params_get_channels_max"))); +int snd_pcm_hw_params_get_channels(const snd_pcm_hw_params_t *params, unsigned int *val); +int snd_pcm_hw_params_get_channels_min(const snd_pcm_hw_params_t *params, unsigned int *val); +int snd_pcm_hw_params_get_channels_max(const snd_pcm_hw_params_t *params, unsigned int *val); int snd_pcm_hw_params_test_channels(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val); int snd_pcm_hw_params_set_channels(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val); int snd_pcm_hw_params_set_channels_min(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val); int snd_pcm_hw_params_set_channels_max(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val); int snd_pcm_hw_params_set_channels_minmax(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *min, unsigned int *max); -int snd_pcm_hw_params_set_channels_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_channels_near"))); -int snd_pcm_hw_params_set_channels_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_channels_first"))); -int snd_pcm_hw_params_set_channels_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_channels_last"))); +int snd_pcm_hw_params_set_channels_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val); +int snd_pcm_hw_params_set_channels_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val); +int snd_pcm_hw_params_set_channels_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val); -int snd_pcm_hw_params_get_rate(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_get_rate"))); -int snd_pcm_hw_params_get_rate_min(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_get_rate_min"))); -int snd_pcm_hw_params_get_rate_max(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_get_rate_max"))); +int snd_pcm_hw_params_get_rate(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir); +int snd_pcm_hw_params_get_rate_min(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir); +int snd_pcm_hw_params_get_rate_max(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir); int snd_pcm_hw_params_test_rate(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val, int dir); int snd_pcm_hw_params_set_rate(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val, int dir); int snd_pcm_hw_params_set_rate_min(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); int snd_pcm_hw_params_set_rate_max(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); int snd_pcm_hw_params_set_rate_minmax(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *min, int *mindir, unsigned int *max, int *maxdir); -int snd_pcm_hw_params_set_rate_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_rate_near"))); -int snd_pcm_hw_params_set_rate_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_rate_first"))); -int snd_pcm_hw_params_set_rate_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_rate_last"))); +int snd_pcm_hw_params_set_rate_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); +int snd_pcm_hw_params_set_rate_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); +int snd_pcm_hw_params_set_rate_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); -int snd_pcm_hw_params_get_period_time(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_get_period_time"))); -int snd_pcm_hw_params_get_period_time_min(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_get_period_time_min"))); -int snd_pcm_hw_params_get_period_time_max(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_get_period_time_max"))); +int snd_pcm_hw_params_get_period_time(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir); +int snd_pcm_hw_params_get_period_time_min(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir); +int snd_pcm_hw_params_get_period_time_max(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir); int snd_pcm_hw_params_test_period_time(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val, int dir); int snd_pcm_hw_params_set_period_time(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val, int dir); int snd_pcm_hw_params_set_period_time_min(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); int snd_pcm_hw_params_set_period_time_max(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); int snd_pcm_hw_params_set_period_time_minmax(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *min, int *mindir, unsigned int *max, int *maxdir); -int snd_pcm_hw_params_set_period_time_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_period_time_near"))); -int snd_pcm_hw_params_set_period_time_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_period_time_first"))); -int snd_pcm_hw_params_set_period_time_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_period_time_last"))); +int snd_pcm_hw_params_set_period_time_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); +int snd_pcm_hw_params_set_period_time_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); +int snd_pcm_hw_params_set_period_time_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); -int snd_pcm_hw_params_get_period_size(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *frames, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_get_period_size"))); -int snd_pcm_hw_params_get_period_size_min(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *frames, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_get_period_size_min"))); -int snd_pcm_hw_params_get_period_size_max(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *frames, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_get_period_size_max"))); +int snd_pcm_hw_params_get_period_size(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *frames, int *dir); +int snd_pcm_hw_params_get_period_size_min(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *frames, int *dir); +int snd_pcm_hw_params_get_period_size_max(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *frames, int *dir); int snd_pcm_hw_params_test_period_size(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t val, int dir); int snd_pcm_hw_params_set_period_size(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t val, int dir); int snd_pcm_hw_params_set_period_size_min(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val, int *dir); int snd_pcm_hw_params_set_period_size_max(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val, int *dir); int snd_pcm_hw_params_set_period_size_minmax(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *min, int *mindir, snd_pcm_uframes_t *max, int *maxdir); -int snd_pcm_hw_params_set_period_size_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_period_size_near"))); -int snd_pcm_hw_params_set_period_size_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_period_size_first"))); -int snd_pcm_hw_params_set_period_size_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_period_size_last"))); +int snd_pcm_hw_params_set_period_size_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val, int *dir); +int snd_pcm_hw_params_set_period_size_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val, int *dir); +int snd_pcm_hw_params_set_period_size_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val, int *dir); int snd_pcm_hw_params_set_period_size_integer(snd_pcm_t *pcm, snd_pcm_hw_params_t *params); -int snd_pcm_hw_params_get_periods(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_get_periods"))); -int snd_pcm_hw_params_get_periods_min(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_get_periods_min"))); -int snd_pcm_hw_params_get_periods_max(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_get_periods_max"))); +int snd_pcm_hw_params_get_periods(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir); +int snd_pcm_hw_params_get_periods_min(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir); +int snd_pcm_hw_params_get_periods_max(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir); int snd_pcm_hw_params_test_periods(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val, int dir); int snd_pcm_hw_params_set_periods(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val, int dir); int snd_pcm_hw_params_set_periods_min(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); int snd_pcm_hw_params_set_periods_max(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); int snd_pcm_hw_params_set_periods_minmax(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *min, int *mindir, unsigned int *max, int *maxdir); -int snd_pcm_hw_params_set_periods_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_periods_near"))); -int snd_pcm_hw_params_set_periods_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_periods_first"))); -int snd_pcm_hw_params_set_periods_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_periods_last"))); +int snd_pcm_hw_params_set_periods_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); +int snd_pcm_hw_params_set_periods_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); +int snd_pcm_hw_params_set_periods_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); int snd_pcm_hw_params_set_periods_integer(snd_pcm_t *pcm, snd_pcm_hw_params_t *params); -int snd_pcm_hw_params_get_buffer_time(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_get_buffer_time"))); -int snd_pcm_hw_params_get_buffer_time_min(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_get_buffer_time_min"))); -int snd_pcm_hw_params_get_buffer_time_max(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_get_buffer_time_max"))); +int snd_pcm_hw_params_get_buffer_time(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir); +int snd_pcm_hw_params_get_buffer_time_min(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir); +int snd_pcm_hw_params_get_buffer_time_max(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir); int snd_pcm_hw_params_test_buffer_time(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val, int dir); int snd_pcm_hw_params_set_buffer_time(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val, int dir); int snd_pcm_hw_params_set_buffer_time_min(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); int snd_pcm_hw_params_set_buffer_time_max(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); int snd_pcm_hw_params_set_buffer_time_minmax(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *min, int *mindir, unsigned int *max, int *maxdir); -int snd_pcm_hw_params_set_buffer_time_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_buffer_time_near"))); -int snd_pcm_hw_params_set_buffer_time_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_buffer_time_first"))); -int snd_pcm_hw_params_set_buffer_time_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_buffer_time_last"))); +int snd_pcm_hw_params_set_buffer_time_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); +int snd_pcm_hw_params_set_buffer_time_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); +int snd_pcm_hw_params_set_buffer_time_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); -int snd_pcm_hw_params_get_buffer_size(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val) __attribute__ ((weak, alias ("__snd_pcm_hw_params_get_buffer_size"))); -int snd_pcm_hw_params_get_buffer_size_min(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val) __attribute__ ((weak, alias ("__snd_pcm_hw_params_get_buffer_size_min"))); -int snd_pcm_hw_params_get_buffer_size_max(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val) __attribute__ ((weak, alias ("__snd_pcm_hw_params_get_buffer_size_max"))); +int snd_pcm_hw_params_get_buffer_size(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val); +int snd_pcm_hw_params_get_buffer_size_min(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val); +int snd_pcm_hw_params_get_buffer_size_max(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val); int snd_pcm_hw_params_test_buffer_size(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t val); int snd_pcm_hw_params_set_buffer_size(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t val); int snd_pcm_hw_params_set_buffer_size_min(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val); int snd_pcm_hw_params_set_buffer_size_max(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val); int snd_pcm_hw_params_set_buffer_size_minmax(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *min, snd_pcm_uframes_t *max); -int snd_pcm_hw_params_set_buffer_size_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_buffer_size_near"))); -int snd_pcm_hw_params_set_buffer_size_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_buffer_size_first"))); -int snd_pcm_hw_params_set_buffer_size_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_buffer_size_last"))); +int snd_pcm_hw_params_set_buffer_size_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val); +int snd_pcm_hw_params_set_buffer_size_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val); +int snd_pcm_hw_params_set_buffer_size_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val); -int snd_pcm_hw_params_get_tick_time(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_get_tick_time"))); -int snd_pcm_hw_params_get_tick_time_min(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_get_tick_time_min"))); -int snd_pcm_hw_params_get_tick_time_max(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_get_tick_time_max"))); +int snd_pcm_hw_params_get_tick_time(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir); +int snd_pcm_hw_params_get_tick_time_min(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir); +int snd_pcm_hw_params_get_tick_time_max(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir); int snd_pcm_hw_params_test_tick_time(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val, int dir); int snd_pcm_hw_params_set_tick_time(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val, int dir); int snd_pcm_hw_params_set_tick_time_min(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); int snd_pcm_hw_params_set_tick_time_max(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); int snd_pcm_hw_params_set_tick_time_minmax(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *min, int *mindir, unsigned int *max, int *maxdir); -int snd_pcm_hw_params_set_tick_time_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_tick_time_near"))); -int snd_pcm_hw_params_set_tick_time_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_tick_time_first"))); -int snd_pcm_hw_params_set_tick_time_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) __attribute__ ((weak, alias ("__snd_pcm_hw_params_set_tick_time_last"))); +int snd_pcm_hw_params_set_tick_time_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); +int snd_pcm_hw_params_set_tick_time_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); +int snd_pcm_hw_params_set_tick_time_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); #else +asm(".symver snd_pcm_hw_params_get_access,snd_pcm_hw_params_get_access@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_access_first,snd_pcm_hw_params_set_access_first@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_access_last,snd_pcm_hw_params_set_access_last@ALSA_0.9"); + int snd_pcm_hw_params_get_access(const snd_pcm_hw_params_t *params); int snd_pcm_hw_params_test_access(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t val); int snd_pcm_hw_params_set_access(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t val); @@ -659,6 +664,10 @@ snd_pcm_access_t snd_pcm_hw_params_set_access_last(snd_pcm_t *pcm, snd_pcm_hw_pa int snd_pcm_hw_params_set_access_mask(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_mask_t *mask); void snd_pcm_hw_params_get_access_mask(snd_pcm_hw_params_t *params, snd_pcm_access_mask_t *mask); +asm(".symver snd_pcm_hw_params_get_format,snd_pcm_hw_params_get_format@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_format_first,snd_pcm_hw_params_set_format_first@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_format_last,snd_pcm_hw_params_set_format_last@ALSA_0.9"); + int snd_pcm_hw_params_get_format(const snd_pcm_hw_params_t *params); int snd_pcm_hw_params_test_format(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_t val); int snd_pcm_hw_params_set_format(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_t val); @@ -667,6 +676,10 @@ snd_pcm_format_t snd_pcm_hw_params_set_format_last(snd_pcm_t *pcm, snd_pcm_hw_pa int snd_pcm_hw_params_set_format_mask(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_mask_t *mask); void snd_pcm_hw_params_get_format_mask(snd_pcm_hw_params_t *params, snd_pcm_format_mask_t *mask); +asm(".symver snd_pcm_hw_params_get_subformat,snd_pcm_hw_params_get_subformat@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_subformat_first,snd_pcm_hw_params_set_subformat_first@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_subformat_last,snd_pcm_hw_params_set_subformat_last@ALSA_0.9"); + int snd_pcm_hw_params_test_subformat(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_subformat_t val); int snd_pcm_hw_params_get_subformat(const snd_pcm_hw_params_t *params); int snd_pcm_hw_params_set_subformat(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_subformat_t val); @@ -675,6 +688,13 @@ snd_pcm_subformat_t snd_pcm_hw_params_set_subformat_last(snd_pcm_t *pcm, snd_pcm int snd_pcm_hw_params_set_subformat_mask(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_subformat_mask_t *mask); void snd_pcm_hw_params_get_subformat_mask(snd_pcm_hw_params_t *params, snd_pcm_subformat_mask_t *mask); +asm(".symver snd_pcm_hw_params_get_channels,snd_pcm_hw_params_get_channels@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_get_channels_min,snd_pcm_hw_params_get_channels_min@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_get_channels_max,snd_pcm_hw_params_get_channels_max@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_channels_near,snd_pcm_hw_params_set_channels_near@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_channels_first,snd_pcm_hw_params_set_channels_first@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_channels_last,snd_pcm_hw_params_set_channels_last@ALSA_0.9"); + int snd_pcm_hw_params_get_channels(const snd_pcm_hw_params_t *params); unsigned int snd_pcm_hw_params_get_channels_min(const snd_pcm_hw_params_t *params); unsigned int snd_pcm_hw_params_get_channels_max(const snd_pcm_hw_params_t *params); @@ -687,6 +707,13 @@ unsigned int snd_pcm_hw_params_set_channels_near(snd_pcm_t *pcm, snd_pcm_hw_para unsigned int snd_pcm_hw_params_set_channels_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params); unsigned int snd_pcm_hw_params_set_channels_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params); +asm(".symver snd_pcm_hw_params_get_rate,snd_pcm_hw_params_get_rate@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_get_rate_min,snd_pcm_hw_params_get_rate_min@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_get_rate_max,snd_pcm_hw_params_get_rate_max@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_rate_near,snd_pcm_hw_params_set_rate_near@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_rate_first,snd_pcm_hw_params_set_rate_first@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_rate_last,snd_pcm_hw_params_set_rate_last@ALSA_0.9"); + int snd_pcm_hw_params_get_rate(const snd_pcm_hw_params_t *params, int *dir); unsigned int snd_pcm_hw_params_get_rate_min(const snd_pcm_hw_params_t *params, int *dir); unsigned int snd_pcm_hw_params_get_rate_max(const snd_pcm_hw_params_t *params, int *dir); @@ -699,6 +726,13 @@ unsigned int snd_pcm_hw_params_set_rate_near(snd_pcm_t *pcm, snd_pcm_hw_params_t unsigned int snd_pcm_hw_params_set_rate_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, int *dir); unsigned int snd_pcm_hw_params_set_rate_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, int *dir); +asm(".symver snd_pcm_hw_params_get_period_time,snd_pcm_hw_params_get_period_time@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_get_period_time_min,snd_pcm_hw_params_get_period_time_min@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_get_period_time_max,snd_pcm_hw_params_get_period_time_max@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_period_time_near,snd_pcm_hw_params_set_period_time_near@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_period_time_first,snd_pcm_hw_params_set_period_time_first@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_period_time_last,snd_pcm_hw_params_set_period_time_last@ALSA_0.9"); + int snd_pcm_hw_params_get_period_time(const snd_pcm_hw_params_t *params, int *dir); unsigned int snd_pcm_hw_params_get_period_time_min(const snd_pcm_hw_params_t *params, int *dir); unsigned int snd_pcm_hw_params_get_period_time_max(const snd_pcm_hw_params_t *params, int *dir); @@ -711,6 +745,13 @@ unsigned int snd_pcm_hw_params_set_period_time_near(snd_pcm_t *pcm, snd_pcm_hw_p unsigned int snd_pcm_hw_params_set_period_time_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, int *dir); unsigned int snd_pcm_hw_params_set_period_time_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, int *dir); +asm(".symver snd_pcm_hw_params_get_period_size,snd_pcm_hw_params_get_period_size@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_get_period_size_min,snd_pcm_hw_params_get_period_size_min@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_get_period_size_max,snd_pcm_hw_params_get_period_size_max@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_period_size_near,snd_pcm_hw_params_set_period_size_near@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_period_size_first,snd_pcm_hw_params_set_period_size_first@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_period_size_last,snd_pcm_hw_params_set_period_size_last@ALSA_0.9"); + snd_pcm_sframes_t snd_pcm_hw_params_get_period_size(const snd_pcm_hw_params_t *params, int *dir); snd_pcm_uframes_t snd_pcm_hw_params_get_period_size_min(const snd_pcm_hw_params_t *params, int *dir); snd_pcm_uframes_t snd_pcm_hw_params_get_period_size_max(const snd_pcm_hw_params_t *params, int *dir); @@ -724,6 +765,13 @@ snd_pcm_uframes_t snd_pcm_hw_params_set_period_size_first(snd_pcm_t *pcm, snd_pc snd_pcm_uframes_t snd_pcm_hw_params_set_period_size_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, int *dir); int snd_pcm_hw_params_set_period_size_integer(snd_pcm_t *pcm, snd_pcm_hw_params_t *params); +asm(".symver snd_pcm_hw_params_get_periods,snd_pcm_hw_params_get_periods@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_get_periods_min,snd_pcm_hw_params_get_periods_min@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_get_periods_max,snd_pcm_hw_params_get_periods_max@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_periods_near,snd_pcm_hw_params_set_periods_near@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_periods_first,snd_pcm_hw_params_set_periods_first@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_periods_last,snd_pcm_hw_params_set_periods_last@ALSA_0.9"); + int snd_pcm_hw_params_get_periods(const snd_pcm_hw_params_t *params, int *dir); unsigned int snd_pcm_hw_params_get_periods_min(const snd_pcm_hw_params_t *params, int *dir); unsigned int snd_pcm_hw_params_get_periods_max(const snd_pcm_hw_params_t *params, int *dir); @@ -737,6 +785,13 @@ unsigned int snd_pcm_hw_params_set_periods_first(snd_pcm_t *pcm, snd_pcm_hw_para unsigned int snd_pcm_hw_params_set_periods_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, int *dir); int snd_pcm_hw_params_set_periods_integer(snd_pcm_t *pcm, snd_pcm_hw_params_t *params); +asm(".symver snd_pcm_hw_params_get_buffer_time,snd_pcm_hw_params_get_buffer_time@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_get_buffer_time_min,snd_pcm_hw_params_get_buffer_time_min@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_get_buffer_time_max,snd_pcm_hw_params_get_buffer_time_max@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_buffer_time_near,snd_pcm_hw_params_set_buffer_time_near@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_buffer_time_first,snd_pcm_hw_params_set_buffer_time_first@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_buffer_time_last,snd_pcm_hw_params_set_buffer_time_last@ALSA_0.9"); + int snd_pcm_hw_params_get_buffer_time(const snd_pcm_hw_params_t *params, int *dir); unsigned int snd_pcm_hw_params_get_buffer_time_min(const snd_pcm_hw_params_t *params, int *dir); unsigned int snd_pcm_hw_params_get_buffer_time_max(const snd_pcm_hw_params_t *params, int *dir); @@ -749,6 +804,13 @@ unsigned int snd_pcm_hw_params_set_buffer_time_near(snd_pcm_t *pcm, snd_pcm_hw_p unsigned int snd_pcm_hw_params_set_buffer_time_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, int *dir); unsigned int snd_pcm_hw_params_set_buffer_time_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, int *dir); +asm(".symver snd_pcm_hw_params_get_buffer_size,snd_pcm_hw_params_get_buffer_size@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_get_buffer_size_min,snd_pcm_hw_params_get_buffer_size_min@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_get_buffer_size_max,snd_pcm_hw_params_get_buffer_size_max@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_buffer_size_near,snd_pcm_hw_params_set_buffer_size_near@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_buffer_size_first,snd_pcm_hw_params_set_buffer_size_first@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_buffer_size_last,snd_pcm_hw_params_set_buffer_size_last@ALSA_0.9"); + snd_pcm_sframes_t snd_pcm_hw_params_get_buffer_size(const snd_pcm_hw_params_t *params); snd_pcm_uframes_t snd_pcm_hw_params_get_buffer_size_min(const snd_pcm_hw_params_t *params); snd_pcm_uframes_t snd_pcm_hw_params_get_buffer_size_max(const snd_pcm_hw_params_t *params); @@ -761,6 +823,13 @@ snd_pcm_uframes_t snd_pcm_hw_params_set_buffer_size_near(snd_pcm_t *pcm, snd_pcm snd_pcm_uframes_t snd_pcm_hw_params_set_buffer_size_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params); snd_pcm_uframes_t snd_pcm_hw_params_set_buffer_size_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params); +asm(".symver snd_pcm_hw_params_get_tick_time,snd_pcm_hw_params_get_tick_time@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_get_tick_time_min,snd_pcm_hw_params_get_tick_time_min@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_get_tick_time_max,snd_pcm_hw_params_get_tick_time_max@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_tick_time_near,snd_pcm_hw_params_set_tick_time_near@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_tick_time_first,snd_pcm_hw_params_set_tick_time_first@ALSA_0.9"); +asm(".symver snd_pcm_hw_params_set_tick_time_last,snd_pcm_hw_params_set_tick_time_last@ALSA_0.9"); + int snd_pcm_hw_params_get_tick_time(const snd_pcm_hw_params_t *params, int *dir); unsigned int snd_pcm_hw_params_get_tick_time_min(const snd_pcm_hw_params_t *params, int *dir); unsigned int snd_pcm_hw_params_get_tick_time_max(const snd_pcm_hw_params_t *params, int *dir); @@ -773,7 +842,7 @@ unsigned int snd_pcm_hw_params_set_tick_time_near(snd_pcm_t *pcm, snd_pcm_hw_par unsigned int snd_pcm_hw_params_set_tick_time_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, int *dir); unsigned int snd_pcm_hw_params_set_tick_time_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, int *dir); -#endif /* ALSA_PCM_NEW_HW_PARAMS_API */ +#endif /* ALSA_PCM_OLD_HW_PARAMS_API */ #endif /* ALSA_LIBRARY_BUILD */ int snd_pcm_hw_params_get_min_align(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val); @@ -799,27 +868,36 @@ void snd_pcm_sw_params_copy(snd_pcm_sw_params_t *dst, const snd_pcm_sw_params_t int snd_pcm_sw_params_get_boundary(const snd_pcm_sw_params_t *params, snd_pcm_uframes_t *val); #ifndef ALSA_LIBRARY_BUILD -#ifdef ALSA_PCM_NEW_SW_PARAMS_API +#ifndef ALSA_PCM_OLD_SW_PARAMS_API int snd_pcm_sw_params_set_tstamp_mode(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_tstamp_t val); -int snd_pcm_sw_params_get_tstamp_mode(const snd_pcm_sw_params_t *params, snd_pcm_tstamp_t *val) __attribute__ ((weak, alias ("__snd_pcm_sw_params_get_tstamp_mode"))); +int snd_pcm_sw_params_get_tstamp_mode(const snd_pcm_sw_params_t *params, snd_pcm_tstamp_t *val); int snd_pcm_sw_params_set_sleep_min(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, unsigned int val); -int snd_pcm_sw_params_get_sleep_min(const snd_pcm_sw_params_t *params, unsigned int *val) __attribute__ ((weak, alias ("__snd_pcm_sw_params_get_sleep_min"))); +int snd_pcm_sw_params_get_sleep_min(const snd_pcm_sw_params_t *params, unsigned int *val); int snd_pcm_sw_params_set_avail_min(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_uframes_t val); -int snd_pcm_sw_params_get_avail_min(const snd_pcm_sw_params_t *params, snd_pcm_uframes_t *val) __attribute__ ((weak, alias ("__snd_pcm_sw_params_get_avail_min"))); +int snd_pcm_sw_params_get_avail_min(const snd_pcm_sw_params_t *params, snd_pcm_uframes_t *val); int snd_pcm_sw_params_set_xfer_align(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_uframes_t val); -int snd_pcm_sw_params_get_xfer_align(const snd_pcm_sw_params_t *params, snd_pcm_uframes_t *val) __attribute__ ((weak, alias ("__snd_pcm_sw_params_get_xfer_align")));; +int snd_pcm_sw_params_get_xfer_align(const snd_pcm_sw_params_t *params, snd_pcm_uframes_t *val); int snd_pcm_sw_params_set_start_threshold(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_uframes_t val); -int snd_pcm_sw_params_get_start_threshold(const snd_pcm_sw_params_t *paramsm, snd_pcm_uframes_t *val) __attribute__ ((weak, alias ("__snd_pcm_sw_params_get_start_threshold")));; +int snd_pcm_sw_params_get_start_threshold(const snd_pcm_sw_params_t *paramsm, snd_pcm_uframes_t *val); int snd_pcm_sw_params_set_stop_threshold(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_uframes_t val); -int snd_pcm_sw_params_get_stop_threshold(const snd_pcm_sw_params_t *params, snd_pcm_uframes_t *val) __attribute__ ((weak, alias ("__snd_pcm_sw_params_get_stop_threshold")));; +int snd_pcm_sw_params_get_stop_threshold(const snd_pcm_sw_params_t *params, snd_pcm_uframes_t *val); int snd_pcm_sw_params_set_silence_threshold(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_uframes_t val); -int snd_pcm_sw_params_get_silence_threshold(const snd_pcm_sw_params_t *params, snd_pcm_uframes_t *val) __attribute__ ((weak, alias ("__snd_pcm_sw_params_get_silence_threshold")));; +int snd_pcm_sw_params_get_silence_threshold(const snd_pcm_sw_params_t *params, snd_pcm_uframes_t *val); int snd_pcm_sw_params_set_silence_size(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_uframes_t val); -int snd_pcm_sw_params_get_silence_size(const snd_pcm_sw_params_t *params, snd_pcm_uframes_t *val) __attribute__ ((weak, alias ("__snd_pcm_sw_params_get_silence_size")));; +int snd_pcm_sw_params_get_silence_size(const snd_pcm_sw_params_t *params, snd_pcm_uframes_t *val); #else +asm(".symver snd_pcm_sw_params_get_tstamp_mode,snd_pcm_sw_params_get_tstamp_mode@ALSA_0.9"); +asm(".symver snd_pcm_sw_params_get_sleep_min,snd_pcm_sw_params_get_sleep_min@ALSA_0.9"); +asm(".symver snd_pcm_sw_params_get_avail_min,snd_pcm_sw_params_get_avail_min@ALSA_0.9"); +asm(".symver snd_pcm_sw_params_get_xfer_align,snd_pcm_sw_params_get_xfer_align@ALSA_0.9"); +asm(".symver snd_pcm_sw_params_get_start_threshold,snd_pcm_sw_params_get_start_threshold@ALSA_0.9"); +asm(".symver snd_pcm_sw_params_get_stop_threshold,snd_pcm_sw_params_set_stop_threshold@ALSA_0.9"); +asm(".symver snd_pcm_sw_params_get_silence_threshold,snd_pcm_sw_params_get_silence_threshold@ALSA_0.9"); +asm(".symver snd_pcm_sw_params_get_silence_size,snd_pcm_sw_params_get_silence_size@ALSA_0.9"); + int snd_pcm_sw_params_set_tstamp_mode(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_tstamp_t val); snd_pcm_tstamp_t snd_pcm_sw_params_get_tstamp_mode(const snd_pcm_sw_params_t *params); int snd_pcm_sw_params_set_sleep_min(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, unsigned int val); @@ -837,7 +915,7 @@ snd_pcm_uframes_t snd_pcm_sw_params_get_silence_threshold(const snd_pcm_sw_param int snd_pcm_sw_params_set_silence_size(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_uframes_t val); snd_pcm_uframes_t snd_pcm_sw_params_get_silence_size(const snd_pcm_sw_params_t *params); -#endif /* ALSA_PCM_NEW_SW_PARAMS_API */ +#endif /* ALSA_PCM_OLD_SW_PARAMS_API */ #endif /* ALSA_LIBRARY_BUILD */ /** \} */ diff --git a/src/ordinary_pcm/ordinary_pcm.c b/src/ordinary_pcm/ordinary_pcm.c index baf2d592..a485ceec 100644 --- a/src/ordinary_pcm/ordinary_pcm.c +++ b/src/ordinary_pcm/ordinary_pcm.c @@ -55,8 +55,6 @@ Write something here #include #include #include -#define ALSA_PCM_NEW_HW_PARAMS_API -#define ALSA_PCM_NEW_SW_PARAMS_API #include "asoundlib.h" #include "pcm_ordinary.h" diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c index d7cd6b33..6c814e85 100644 --- a/src/pcm/pcm.c +++ b/src/pcm/pcm.c @@ -3005,9 +3005,6 @@ void snd_pcm_hw_params_copy(snd_pcm_hw_params_t *dst, const snd_pcm_hw_params_t * \param params Configuration space * \param access Returned value * \return access type otherwise a negative error code if not exactly one is present - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_get_access)(const snd_pcm_hw_params_t *params, snd_pcm_access_t *access) @@ -3052,9 +3049,6 @@ int snd_pcm_hw_params_set_access(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, sn * \param params Configuration space * \param access Returned first access type * \return 0 otherwise a negative error code - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_access_first)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t *access) @@ -3071,9 +3065,6 @@ int snd_pcm_hw_params_set_access_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *para * \param params Configuration space * \param val Returned last access type * \return 0 otherwise a negative error code - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_access_last)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t *access) @@ -3115,9 +3106,6 @@ int snd_pcm_hw_params_get_access_mask(snd_pcm_hw_params_t *params, snd_pcm_acces * \param params Configuration space * \param format returned format * \return format otherwise a negative error code if not exactly one is present - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_get_format)(const snd_pcm_hw_params_t *params, snd_pcm_format_t *format) @@ -3158,9 +3146,6 @@ int snd_pcm_hw_params_set_format(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, sn * \param params Configuration space * \param format Returned first format * \return 0 otherwise a negative error code - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_format_first)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_t *format) @@ -3177,9 +3162,6 @@ int snd_pcm_hw_params_set_format_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *para * \param params Configuration space * \param format Returned last format * \return 0 otherwise a negative error code - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_format_last)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_t *format) @@ -3218,9 +3200,6 @@ void snd_pcm_hw_params_get_format_mask(snd_pcm_hw_params_t *params, snd_pcm_form * \param params Configuration space * \param subformat Returned subformat value * \return subformat otherwise a negative error code if not exactly one is present - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_get_subformat)(const snd_pcm_hw_params_t *params, snd_pcm_subformat_t *subformat) @@ -3261,9 +3240,6 @@ int snd_pcm_hw_params_set_subformat(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, * \param params Configuration space * \param subformat Returned subformat * \return 0 otherwise a negative error code - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_subformat_first)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_subformat_t *subformat) @@ -3280,9 +3256,6 @@ int snd_pcm_hw_params_set_subformat_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *p * \param params Configuration space * \param subformat Returned subformat * \return 0 otherwise a negative error code - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_subformat_last)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_subformat_t *subformat) @@ -3321,9 +3294,6 @@ void snd_pcm_hw_params_get_subformat_mask(snd_pcm_hw_params_t *params, snd_pcm_s * \param params Configuration space * \param val Returned channels count * \return 0 otherwise a negative error code if not exactly one is present - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_get_channels)(const snd_pcm_hw_params_t *params, unsigned int *val) @@ -3339,9 +3309,6 @@ int snd_pcm_hw_params_get_channels(const snd_pcm_hw_params_t *params, unsigned i * \param params Configuration space * \param val minimum channels count * \return 0 otherwise a negative error code - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_get_channels_min)(const snd_pcm_hw_params_t *params, unsigned int *val) @@ -3357,9 +3324,6 @@ int snd_pcm_hw_params_get_channels_min(const snd_pcm_hw_params_t *params, unsign * \param params Configuration space * \param val maximum channels count * \return 0 otherwise a negative error code - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_get_channels_max)(const snd_pcm_hw_params_t *params, unsigned int *val) @@ -3437,9 +3401,6 @@ int snd_pcm_hw_params_set_channels_minmax(snd_pcm_t *pcm, snd_pcm_hw_params_t *p * \param params Configuration space * \param val target channels count, returned chosen channels count * \return chosen channels count - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_channels_near)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val) @@ -3456,9 +3417,6 @@ int snd_pcm_hw_params_set_channels_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *par * \param params Configuration space * \param val minimum channels count * \return 0 otherwise a negative error code - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_channels_first)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val) @@ -3475,9 +3433,6 @@ int snd_pcm_hw_params_set_channels_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *pa * \param params Configuration space * \param val maximum channels count * \return 0 otherwise a negative error code - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_channels_last)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val) @@ -3497,9 +3452,6 @@ int snd_pcm_hw_params_set_channels_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *par * \return 0 otherwise a negative error code if not exactly one is present * * Actual exact value is <,=,> the approximate one following dir (-1, 0, 1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_get_rate)(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -3518,9 +3470,6 @@ int snd_pcm_hw_params_get_rate(const snd_pcm_hw_params_t *params, unsigned int * * \return 0 otherwise a negative error code * * Exact value is <,=,> the returned one following dir (-1,0,1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_get_rate_min)(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -3539,9 +3488,6 @@ int snd_pcm_hw_params_get_rate_min(const snd_pcm_hw_params_t *params, unsigned i * \return 0 otherwise a negative error code * * Exact value is <,=,> the returned one following dir (-1,0,1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_get_rate_max)(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -3637,9 +3583,6 @@ int snd_pcm_hw_params_set_rate_minmax(snd_pcm_t *pcm, snd_pcm_hw_params_t *param * \return approximate chosen rate * * target/chosen exact value is <,=,> val following dir (-1,0,1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_rate_near)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -3659,9 +3602,6 @@ int snd_pcm_hw_params_set_rate_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, * \return 0 otherwise a negative error code * * Actual exact value is <,=,> the approximate one following dir (-1, 0, 1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_rate_first)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -3681,9 +3621,6 @@ int snd_pcm_hw_params_set_rate_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params * \return 0 otherwise a negative error code * * Actual exact value is <,=,> the approximate one following dir (-1, 0, 1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_rate_last)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -3703,9 +3640,6 @@ int snd_pcm_hw_params_set_rate_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, * \return 0 otherwise a negative error code if not exactly one is present * * Actual exact value is <,=,> the approximate one following dir (-1, 0, 1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_get_period_time)(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -3724,9 +3658,6 @@ int snd_pcm_hw_params_get_period_time(const snd_pcm_hw_params_t *params, unsigne * \return 0 otherwise a negative error code * * Exact value is <,=,> the returned one following dir (-1,0,1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_get_period_time_min)(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -3745,9 +3676,6 @@ int snd_pcm_hw_params_get_period_time_min(const snd_pcm_hw_params_t *params, uns * \return 0 otherwise a negative error code * * Exact value is <,=,> the returned one following dir (-1,0,1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_get_period_time_max)(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -3844,9 +3772,6 @@ int snd_pcm_hw_params_set_period_time_minmax(snd_pcm_t *pcm, snd_pcm_hw_params_t * \return approximate chosen period duration in us * * target/chosen exact value is <,=,> val following dir (-1,0,1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_period_time_near)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -3866,9 +3791,6 @@ int snd_pcm_hw_params_set_period_time_near(snd_pcm_t *pcm, snd_pcm_hw_params_t * * \return 0 otherwise a negative error code * * Actual exact value is <,=,> the approximate one following dir (-1, 0, 1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_period_time_first)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -3887,9 +3809,6 @@ int snd_pcm_hw_params_set_period_time_first(snd_pcm_t *pcm, snd_pcm_hw_params_t * \return approximate period duration in us * * Actual exact value is <,=,> the approximate one following dir (-1, 0, 1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_period_time_last)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -3909,9 +3828,6 @@ int snd_pcm_hw_params_set_period_time_last(snd_pcm_t *pcm, snd_pcm_hw_params_t * * \return 0 otherwise a negative error code if not exactly one is present * * Actual exact value is <,=,> the approximate one following dir (-1, 0, 1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_get_period_size)(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val, int *dir) @@ -3934,9 +3850,6 @@ int snd_pcm_hw_params_get_period_size(const snd_pcm_hw_params_t *params, snd_pcm * \return 0 otherwise a negative error code * * Exact value is <,=,> the returned one following dir (-1,0,1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_get_period_size_min)(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val, int *dir) @@ -3959,9 +3872,6 @@ int snd_pcm_hw_params_get_period_size_min(const snd_pcm_hw_params_t *params, snd * \return 0 otherwise a negative error code * * Exact value is <,=,> the returned one following dir (-1,0,1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_get_period_size_max)(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val, int *dir) @@ -4074,9 +3984,6 @@ int snd_pcm_hw_params_set_period_size_minmax(snd_pcm_t *pcm, snd_pcm_hw_params_t * \return 0 otherwise a negative error code * * target/chosen exact value is <,=,> val following dir (-1,0,1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_period_size_near)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val, int *dir) @@ -4100,9 +4007,6 @@ int snd_pcm_hw_params_set_period_size_near(snd_pcm_t *pcm, snd_pcm_hw_params_t * * \return 0 otherwise a negative error code * * Actual exact value is <,=,> the approximate one following dir (-1, 0, 1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_period_size_first)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val, int *dir) @@ -4126,9 +4030,6 @@ int snd_pcm_hw_params_set_period_size_first(snd_pcm_t *pcm, snd_pcm_hw_params_t * \return 0 otherwise a negative error code * * Actual exact value is <,=,> the approximate one following dir (-1, 0, 1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_period_size_last)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val, int *dir) @@ -4163,9 +4064,6 @@ int snd_pcm_hw_params_set_period_size_integer(snd_pcm_t *pcm, snd_pcm_hw_params_ * \return 0 otherwise a negative error code if not exactly one is present * * Actual exact value is <,=,> the approximate one following dir (-1, 0, 1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_get_periods)(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -4184,9 +4082,6 @@ int snd_pcm_hw_params_get_periods(const snd_pcm_hw_params_t *params, unsigned in * \return 0 otherwise a negative error code * * Exact value is <,=,> the returned one following dir (-1,0,1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_get_periods_min)(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -4205,9 +4100,6 @@ int snd_pcm_hw_params_get_periods_min(const snd_pcm_hw_params_t *params, unsigne * \return 0 otherwise a negative error code * * Exact value is <,=,> the returned one following dir (-1,0,1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_get_periods_max)(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -4303,9 +4195,6 @@ int snd_pcm_hw_params_set_periods_minmax(snd_pcm_t *pcm, snd_pcm_hw_params_t *pa * \return approximate chosen periods per buffer * * target/chosen exact value is <,=,> val following dir (-1,0,1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_periods_near)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -4325,9 +4214,6 @@ int snd_pcm_hw_params_set_periods_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *para * \return 0 otherwise a negative error code * * Actual exact value is <,=,> the approximate one following dir (-1, 0, 1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_periods_first)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -4347,9 +4233,6 @@ int snd_pcm_hw_params_set_periods_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *par * \return 0 otherwise a negative error code * * Actual exact value is <,=,> the approximate one following dir (-1, 0, 1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_periods_last)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -4381,9 +4264,6 @@ int snd_pcm_hw_params_set_periods_integer(snd_pcm_t *pcm, snd_pcm_hw_params_t *p * \return 0 otherwise a negative error code if not exactly one is present * * Actual exact value is <,=,> the approximate one following dir (-1, 0, 1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_get_buffer_time)(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -4402,9 +4282,6 @@ int snd_pcm_hw_params_get_buffer_time(const snd_pcm_hw_params_t *params, unsigne * \return 0 otherwise a negative error code * * Exact value is <,=,> the returned one following dir (-1,0,1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_get_buffer_time_min)(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -4423,9 +4300,6 @@ int snd_pcm_hw_params_get_buffer_time_min(const snd_pcm_hw_params_t *params, uns * \return 0 otherwise a negative error code * * Exact value is <,=,> the returned one following dir (-1,0,1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_get_buffer_time_max)(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -4521,9 +4395,6 @@ int snd_pcm_hw_params_set_buffer_time_minmax(snd_pcm_t *pcm, snd_pcm_hw_params_t * \return approximate chosen buffer duration in us * * target/chosen exact value is <,=,> val following dir (-1,0,1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_buffer_time_near)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -4543,9 +4414,6 @@ int snd_pcm_hw_params_set_buffer_time_near(snd_pcm_t *pcm, snd_pcm_hw_params_t * * \return 0 otherwise a negative error code * * Actual exact value is <,=,> the approximate one following dir (-1, 0, 1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_buffer_time_first)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -4565,9 +4433,6 @@ int snd_pcm_hw_params_set_buffer_time_first(snd_pcm_t *pcm, snd_pcm_hw_params_t * \return 0 otherwise a negative error code * * Actual exact value is <,=,> the approximate one following dir (-1, 0, 1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_buffer_time_last)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -4584,9 +4449,6 @@ int snd_pcm_hw_params_set_buffer_time_last(snd_pcm_t *pcm, snd_pcm_hw_params_t * * \param params Configuration space * \param val Returned buffer size in frames * \return 0 otherwise a negative error code if not exactly one is present - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_get_buffer_size)(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val) @@ -4609,9 +4471,6 @@ int snd_pcm_hw_params_get_buffer_size(const snd_pcm_hw_params_t *params, snd_pcm * \return 0 otherwise a negative error code * * Exact value is <,=,> the returned one following dir (-1,0,1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_get_buffer_size_min)(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val) @@ -4634,9 +4493,6 @@ int snd_pcm_hw_params_get_buffer_size_min(const snd_pcm_hw_params_t *params, snd * \return 0 otherwise a negative error code * * Exact value is <,=,> the returned one following dir (-1,0,1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_get_buffer_size_max)(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val) @@ -4748,9 +4604,6 @@ int snd_pcm_hw_params_set_buffer_size_minmax(snd_pcm_t *pcm, snd_pcm_hw_params_t * \return approximate chosen buffer size in frames * * target/chosen exact value is <,=,> val following dir (-1,0,1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_buffer_size_near)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val) @@ -4771,9 +4624,6 @@ int snd_pcm_hw_params_set_buffer_size_near(snd_pcm_t *pcm, snd_pcm_hw_params_t * * \param params Configuration space * \param val Returned minimum buffer size in frames * \return buffer size in frames - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_buffer_size_first)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val) @@ -4794,9 +4644,6 @@ int snd_pcm_hw_params_set_buffer_size_first(snd_pcm_t *pcm, snd_pcm_hw_params_t * \param params Configuration space * \param val Returned maximum buffer size in frames * \return 0 otherwise a negative error code - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_buffer_size_last)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val) @@ -4820,9 +4667,6 @@ int snd_pcm_hw_params_set_buffer_size_last(snd_pcm_t *pcm, snd_pcm_hw_params_t * * \return 0 otherwise a negative error code if not exactly one is present * * Actual exact value is <,=,> the approximate one following dir (-1, 0, 1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_get_tick_time)(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -4841,9 +4685,6 @@ int snd_pcm_hw_params_get_tick_time(const snd_pcm_hw_params_t *params, unsigned * \return 0 otherwise a negative error code * * Exact value is <,=,> the returned one following dir (-1,0,1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_get_tick_time_min)(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -4862,9 +4703,6 @@ int snd_pcm_hw_params_get_tick_time_min(const snd_pcm_hw_params_t *params, unsig * \return 0 otherwise a negative error code * * Exact value is <,=,> the returned one following dir (-1,0,1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_get_tick_time_max)(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -4960,9 +4798,6 @@ int snd_pcm_hw_params_set_tick_time_minmax(snd_pcm_t *pcm, snd_pcm_hw_params_t * * \return approximate chosen tick duration in us * * target/chosen exact value is <,=,> val following dir (-1,0,1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_tick_time_near)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -4982,9 +4817,6 @@ int snd_pcm_hw_params_set_tick_time_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *pa * \return 0 otherwise a negative error code * * Actual exact value is <,=,> the approximate one following dir (-1, 0, 1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_tick_time_first)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -5004,9 +4836,6 @@ int snd_pcm_hw_params_set_tick_time_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *p * \return 0 otherwise a negative error code * * Actual exact value is <,=,> the approximate one following dir (-1, 0, 1) - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_tick_time_last)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir) @@ -5262,9 +5091,6 @@ int snd_pcm_sw_params_set_tstamp_mode(snd_pcm_t *pcm, snd_pcm_sw_params_t *param * \param params Software configuration container * \param val Returned timestamp * \return 0 otherwise a negative error code - * - * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_sw_params_get_tstamp_mode)(const snd_pcm_sw_params_t *params, snd_pcm_tstamp_t *val) @@ -5300,9 +5126,6 @@ int snd_pcm_sw_params_set_sleep_min(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, * \param params Software configuration container * \param val returned minimum number of ticks to sleep or 0 if tick timer is disabled * \return 0 otherwise a negative error code - * - * Note: To use this function add '#define ALSA_PCM_NEW_SW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_sw_params_get_sleep_min)(const snd_pcm_sw_params_t *params, unsigned int *val) @@ -5347,9 +5170,6 @@ int snd_pcm_sw_params_set_avail_min(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, * \param params Software configuration container * \param val returned minimum available frames to consider PCM ready * \return 0 otherwise a negative error code - * - * Note: To use this function add '#define ALSA_PCM_NEW_SW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_sw_params_get_avail_min)(const snd_pcm_sw_params_t *params, snd_pcm_uframes_t *val) @@ -5387,9 +5207,6 @@ int snd_pcm_sw_params_set_xfer_align(snd_pcm_t *pcm, snd_pcm_sw_params_t *params * \param params Software configuration container * \param val returned chunk size (frames are attempted to be transferred in chunks) * \param 0 otherwise a negative error code - * - * Note: To use this function add '#define ALSA_PCM_NEW_SW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_sw_params_get_xfer_align)(const snd_pcm_sw_params_t *params, snd_pcm_uframes_t *val) @@ -5432,9 +5249,6 @@ int snd_pcm_sw_params_set_start_threshold(snd_pcm_t *pcm, snd_pcm_sw_params_t *p * * PCM is automatically started when playback frames available to PCM * are >= threshold or when requested capture frames are >= threshold - * - * Note: To use this function add '#define ALSA_PCM_NEW_SW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_sw_params_get_start_threshold)(const snd_pcm_sw_params_t *params, snd_pcm_uframes_t *val) @@ -5477,9 +5291,6 @@ int snd_pcm_sw_params_set_stop_threshold(snd_pcm_t *pcm, snd_pcm_sw_params_t *pa * * PCM is automatically stopped in #SND_PCM_STATE_XRUN state when available * frames is >= threshold - * - * Note: To use this function add '#define ALSA_PCM_NEW_SW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_sw_params_get_stop_threshold)(const snd_pcm_sw_params_t *params, snd_pcm_uframes_t *val) @@ -5525,9 +5336,6 @@ int snd_pcm_sw_params_set_silence_threshold(snd_pcm_t *pcm, snd_pcm_sw_params_t * A portion of playback buffer is overwritten with silence (see * #snd_pcm_sw_params_get_silence_size) when playback underrun is nearer * than silence threshold - * - * Note: To use this function add '#define ALSA_PCM_NEW_SW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_sw_params_get_silence_threshold)(const snd_pcm_sw_params_t *params, snd_pcm_uframes_t *val) @@ -5578,9 +5386,6 @@ int snd_pcm_sw_params_set_silence_size(snd_pcm_t *pcm, snd_pcm_sw_params_t *para * A portion of playback buffer is overwritten with silence when playback * underrun is nearer than silence threshold (see * #snd_pcm_sw_params_set_silence_threshold) - * - * Note: To use this function add '#define ALSA_PCM_NEW_SW_PARAMS_API' before '#include ' - * to enable this new function prototype. Using of older function with same name is deprecated. */ #ifndef DOXYGEN int INTERNAL(snd_pcm_sw_params_get_silence_size)(const snd_pcm_sw_params_t *params, snd_pcm_uframes_t *val) @@ -6538,17 +6343,9 @@ void snd_pcm_unlink_appl_ptr(snd_pcm_t *pcm, snd_pcm_t *slave) #ifdef USE_VERSIONED_SYMBOLS -#if 1 -/* it's really not so nice: obsolete, but default */ -/* forced by developers on alsa-devel */ -#define OBSOLETE1(name, what, new) \ - symbol_version(__##name, name, new); \ - default_symbol_version(__old_##name, name, what); -#else #define OBSOLETE1(name, what, new) \ default_symbol_version(__##name, name, new); \ symbol_version(__old_##name, name, what); -#endif #else diff --git a/test/Makefile.am b/test/Makefile.am index 3ce04041..e7ac2abb 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,6 +1,6 @@ check_PROGRAMS=control pcm latency seq \ playmidi1 timer rawmidi midiloop \ - omixer code + omixer code oldapi control_LDADD=../src/libasound.la pcm_LDADD=../src/libasound.la @@ -11,6 +11,7 @@ timer_LDADD=../src/libasound.la rawmidi_LDADD=../src/libasound.la midiloop_LDADD=../src/libasound.la omixer_LDADD=../src/libasound.la +oldapi_LDADD=../src/libasound.la code_CFLAGS=-Wall -pipe -g -O2 INCLUDES=-I$(top_srcdir)/include diff --git a/test/latency.c b/test/latency.c index bac862cd..5484b57c 100644 --- a/test/latency.c +++ b/test/latency.c @@ -33,8 +33,6 @@ #include #include #include -#define ALSA_PCM_NEW_HW_PARAMS_API -#define ALSA_PCM_NEW_SW_PARAMS_API #include "../include/asoundlib.h" #include #include diff --git a/test/oldapi.c b/test/oldapi.c new file mode 100644 index 00000000..04fe09ae --- /dev/null +++ b/test/oldapi.c @@ -0,0 +1,42 @@ +/* + * Old PCM API compilation test + * + * Author: Jaroslav Kysela + * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include +#include +#include +#include +#include +#include +#define ALSA_PCM_OLD_HW_PARAMS_API +#define ALSA_PCM_OLD_SW_PARAMS_API +#include "../include/asoundlib.h" +#include + +typedef void (myfcn)(void *); + +int main(int argc, char *argv[]) +{ + myfcn *fcn; + snd_pcm_hw_params_get_access(NULL); + fcn = &snd_pcm_hw_params_get_access; + return 0; +} diff --git a/test/pcm.c b/test/pcm.c index a2ad1dc5..782c1ae9 100644 --- a/test/pcm.c +++ b/test/pcm.c @@ -8,8 +8,6 @@ #include #include #include -#define ALSA_PCM_NEW_HW_PARAMS_API -#define ALSA_PCM_NEW_SW_PARAMS_API #include "../include/asoundlib.h" #include #include