[alsa-cvslog] CVS: alsa-oss alsa-oss.c,1.39,1.40 configure.in,1.18,1.19
Update of /cvsroot/alsa/alsa-oss
In directory sc8-pr-cvs1:/tmp/cvs-serv22489
Modified Files:
alsa-oss.c configure.in
Log Message:
- version change to 1.0.0
- fixes against new PCM API
Index: alsa-oss.c
===
RCS file: /cvsroot/alsa/alsa-oss/alsa-oss.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- alsa-oss.c 15 Oct 2003 17:06:28 - 1.39
+++ alsa-oss.c 5 Nov 2003 11:17:08 - 1.40
@@ -199,7 +199,7 @@
snd_pcm_t *pcm = str->pcm;
snd_pcm_hw_params_t *hw;
int err;
- unsigned int periods_min;
+ unsigned int rate, periods_min;
if (!pcm)
continue;
str->frame_bytes = snd_pcm_format_physical_width(dsp->format) *
dsp->channels / 8;
@@ -217,7 +217,8 @@
err = snd_pcm_hw_params_set_periods_integer(pcm, hw);
if (err < 0)
return err;
- err = snd_pcm_hw_params_set_rate_near(pcm, hw, dsp->rate, 0);
+ rate = dsp->rate;
+ err = snd_pcm_hw_params_set_rate_near(pcm, hw, &rate, 0);
assert(err >= 0);
if (str->mmap_buffer) {
@@ -254,15 +255,17 @@
if (err < 0)
return err;
}
- if (dsp->fragshift > 0)
- err = snd_pcm_hw_params_set_period_size_near(pcm, hw,
(1 << dsp->fragshift) / str->frame_bytes, 0);
- else {
+ if (dsp->fragshift > 0) {
+ snd_pcm_uframes_t s = (1 << dsp->fragshift) /
str->frame_bytes;
+ err = snd_pcm_hw_params_set_period_size_near(pcm, hw,
&s, 0);
+ } else {
snd_pcm_uframes_t s = 16;
while (s * 2 < dsp->rate / 4)
s *= 2;
- err = snd_pcm_hw_params_set_period_size_near(pcm, hw,
s, 0);
+ err = snd_pcm_hw_params_set_period_size_near(pcm, hw,
&s, 0);
}
- assert(err >= 0);
+ if (err < 0)
+ return err;
}
err = snd_pcm_hw_params(pcm, hw);
@@ -272,10 +275,16 @@
if (debug)
snd_pcm_dump_setup(pcm, stderr);
#endif
- dsp->rate = snd_pcm_hw_params_get_rate(hw, 0);
+ err = snd_pcm_hw_params_get_rate(hw, &dsp->rate, 0);
+ if (err < 0)
+ return err;
dsp->oss_format = alsa_format_to_oss(dsp->format);
- str->period_size = snd_pcm_hw_params_get_period_size(hw, 0);
- str->periods = snd_pcm_hw_params_get_periods(hw, 0);
+ err = snd_pcm_hw_params_get_period_size(hw, &str->period_size, 0);
+ if (err < 0)
+ return err;
+ err = snd_pcm_hw_params_get_periods(hw, &str->periods, 0);
+ if (err < 0)
+ return err;
str->buffer_size = str->periods * str->period_size;
free(str->mmap_areas);
str->mmap_areas = 0;
Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-oss/configure.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- configure.in21 Oct 2003 17:43:46 - 1.18
+++ configure.in5 Nov 2003 11:17:08 - 1.19
@@ -1,5 +1,5 @@
AC_INIT(alsa-oss.c)
-AM_INIT_AUTOMAKE(alsa-oss, 0.9.8)
+AM_INIT_AUTOMAKE(alsa-oss, 1.0.0)
AC_PREFIX_DEFAULT(/usr)
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools Makefile,1.28,1.29
Update of /cvsroot/alsa/alsa-tools In directory sc8-pr-cvs1:/tmp/cvs-serv20955 Modified Files: Makefile Log Message: - 1.0.0 version - change against PCM API switch Index: Makefile === RCS file: /cvsroot/alsa/alsa-tools/Makefile,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- Makefile21 Oct 2003 17:44:03 - 1.28 +++ Makefile5 Nov 2003 11:09:19 - 1.29 @@ -1,4 +1,4 @@ -VERSION = 0.9.8 +VERSION = 1.0.0 TOP = . SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \ mixartloader rmedigicontrol sb16_csp seq sscape_ctl us428control \ --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools/ac3dec output.c,1.20,1.21
Update of /cvsroot/alsa/alsa-tools/ac3dec In directory sc8-pr-cvs1:/tmp/cvs-serv20955/ac3dec Modified Files: output.c Log Message: - 1.0.0 version - change against PCM API switch Index: output.c === RCS file: /cvsroot/alsa/alsa-tools/ac3dec/output.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- output.c16 May 2003 14:37:25 - 1.20 +++ output.c5 Nov 2003 11:09:19 - 1.21 @@ -24,8 +24,6 @@ #include #include #include -#define ALSA_PCM_NEW_HW_PARAMS_API -#define ALSA_PCM_NEW_SW_PARAMS_API #include typedef signed short sint_16; --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-utils/amidi amidi.c,1.1,1.2
Update of /cvsroot/alsa/alsa-utils/amidi
In directory sc8-pr-cvs1:/tmp/cvs-serv20794/amidi
Modified Files:
amidi.c
Log Message:
- changes against PCM API switch
- 1.0.0 version
- fixed amidi warning
Index: amidi.c
===
RCS file: /cvsroot/alsa/alsa-utils/amidi/amidi.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amidi.c 28 Oct 2003 10:53:43 - 1.1
+++ amidi.c 5 Nov 2003 11:08:25 - 1.2
@@ -355,6 +355,8 @@
running_status = 1;
state = STATE_2PARAM_2;
break;
+ default:
+ break;
}
if (running_status)
fputs("\n ", stdout);
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-utils/aplay aplay.c,1.173,1.174
Update of /cvsroot/alsa/alsa-utils/aplay In directory sc8-pr-cvs1:/tmp/cvs-serv20794/aplay Modified Files: aplay.c Log Message: - changes against PCM API switch - 1.0.0 version - fixed amidi warning Index: aplay.c === RCS file: /cvsroot/alsa/alsa-utils/aplay/aplay.c,v retrieving revision 1.173 retrieving revision 1.174 diff -u -r1.173 -r1.174 --- aplay.c 11 Sep 2003 11:23:58 - 1.173 +++ aplay.c 5 Nov 2003 11:08:25 - 1.174 @@ -36,8 +36,6 @@ #include #include #include -#define ALSA_PCM_NEW_HW_PARAMS_API -#define ALSA_PCM_NEW_SW_PARAMS_API #include #include #include --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-utils configure.in,1.69,1.70
Update of /cvsroot/alsa/alsa-utils In directory sc8-pr-cvs1:/tmp/cvs-serv20794 Modified Files: configure.in Log Message: - changes against PCM API switch - 1.0.0 version - fixed amidi warning Index: configure.in === RCS file: /cvsroot/alsa/alsa-utils/configure.in,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- configure.in29 Oct 2003 13:38:23 - 1.69 +++ configure.in5 Nov 2003 11:08:25 - 1.70 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(alsamixer/alsamixer.c) AC_PREFIX_DEFAULT(/usr) -AM_INIT_AUTOMAKE(alsa-utils, 0.9.8) +AM_INIT_AUTOMAKE(alsa-utils, 1.0.0) dnl Checks for programs. --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib/src/pcm pcm.c,1.262,1.263
Update of /cvsroot/alsa/alsa-lib/src/pcm In directory sc8-pr-cvs1:/tmp/cvs-serv15112/src/pcm Modified Files: pcm.c Log Message: Switch from old to new PCM API retaining binary compatibility Changed version to 1.0.0pre1 Index: pcm.c === RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm.c,v retrieving revision 1.262 retrieving revision 1.263 diff -u -r1.262 -r1.263 --- pcm.c 31 Oct 2003 18:52:55 - 1.262 +++ pcm.c 5 Nov 2003 10:38:39 - 1.263 @@ -3005,9 +3005,6 @@ * \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 @@ * \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 @@ * \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 @@ * \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 @@ * \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 @@ * \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 @@ * \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 @@ * \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 @@ * \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_
[alsa-cvslog] CVS: alsa-lib/test oldapi.c,NONE,1.1 Makefile.am,1.26,1.27 latency.c,1.34,1.35 pcm.c,1.27,1.28
Update of /cvsroot/alsa/alsa-lib/test
In directory sc8-pr-cvs1:/tmp/cvs-serv15112/test
Modified Files:
Makefile.am latency.c pcm.c
Added Files:
oldapi.c
Log Message:
Switch from old to new PCM API retaining binary compatibility
Changed version to 1.0.0pre1
--- NEW FILE: oldapi.c ---
/*
* Old PCM API compilation test
*
* Author: Jaroslav Kysela <[EMAIL PROTECTED]>
*
*
* 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;
}
Index: Makefile.am
===
RCS file: /cvsroot/alsa/alsa-lib/test/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Makefile.am 23 Oct 2003 16:53:11 - 1.26
+++ Makefile.am 5 Nov 2003 10:38:39 - 1.27
@@ -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 @@
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
Index: latency.c
===
RCS file: /cvsroot/alsa/alsa-lib/test/latency.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- latency.c 14 Jul 2003 10:22:39 - 1.34
+++ latency.c 5 Nov 2003 10:38:39 - 1.35
@@ -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
Index: pcm.c
===
RCS file: /cvsroot/alsa/alsa-lib/test/pcm.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- pcm.c 13 Oct 2003 10:42:32 - 1.27
+++ pcm.c 5 Nov 2003 10:38:39 - 1.28
@@ -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
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib/src/ordinary_pcm ordinary_pcm.c,1.2,1.3
Update of /cvsroot/alsa/alsa-lib/src/ordinary_pcm In directory sc8-pr-cvs1:/tmp/cvs-serv15112/src/ordinary_pcm Modified Files: ordinary_pcm.c Log Message: Switch from old to new PCM API retaining binary compatibility Changed version to 1.0.0pre1 Index: ordinary_pcm.c === RCS file: /cvsroot/alsa/alsa-lib/src/ordinary_pcm/ordinary_pcm.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ordinary_pcm.c 23 Jun 2003 17:41:01 - 1.2 +++ ordinary_pcm.c 5 Nov 2003 10:38:38 - 1.3 @@ -55,8 +55,6 @@ #include #include #include -#define ALSA_PCM_NEW_HW_PARAMS_API -#define ALSA_PCM_NEW_SW_PARAMS_API #include "asoundlib.h" #include "pcm_ordinary.h" --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib NOTES,NONE,1.1 Makefile.am,1.28,1.29 configure.in,1.114,1.115
Update of /cvsroot/alsa/alsa-lib
In directory sc8-pr-cvs1:/tmp/cvs-serv15112
Modified Files:
Makefile.am configure.in
Added Files:
NOTES
Log Message:
Switch from old to new PCM API retaining binary compatibility
Changed version to 1.0.0pre1
--- NEW FILE: NOTES ---
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
Index: Makefile.am
===
RCS file: /cvsroot/alsa/alsa-lib/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Makefile.am 26 Aug 2003 12:31:57 - 1.28
+++ Makefile.am 5 Nov 2003 10:38:37 - 1.29
@@ -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
Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-lib/configure.in,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- configure.in21 Oct 2003 17:41:17 - 1.114
+++ configure.in5 Nov 2003 10:38:38 - 1.115
@@ -8,7 +8,7 @@
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}")
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib/include pcm.h,1.179,1.180
Update of /cvsroot/alsa/alsa-lib/include
In directory sc8-pr-cvs1:/tmp/cvs-serv15112/include
Modified Files:
pcm.h
Log Message:
Switch from old to new PCM API retaining binary compatibility
Changed version to 1.0.0pre1
Index: pcm.h
===
RCS file: /cvsroot/alsa/alsa-lib/include/pcm.h,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- pcm.h 18 Mar 2003 20:37:42 - 1.179
+++ pcm.h 5 Nov 2003 10:38:38 - 1.180
@@ -525,132 +525,137 @@
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_cha
