Permalink
Browse files

Update to version 1.0.19

  • Loading branch information...
1 parent 1b6d05f commit b0d0efe6c5a1e3cd8fdbd708705403df46f89f7f @smcneil smcneil committed Feb 19, 2009
Showing with 2,611 additions and 739 deletions.
  1. +10 −57 Android.mk
  2. +4 −1 Makefile.am
  3. +5 −7 Makefile.in
  4. +2 −2 README
  5. +0 −5 alsalisp/Makefile.in
  6. +0 −5 aserver/Makefile.in
  7. +1 −1 aserver/aserver.c
  8. +61 −93 configure
  9. +18 −11 configure.in
  10. +1 −0 doc/Makefile.am
  11. +6 −7 doc/Makefile.in
  12. +2 −2 doc/doxygen.cfg
  13. +119 −0 doc/doxygen.cfg.in
  14. +0 −5 doc/pictures/Makefile.in
  15. +1 −1 hgcompile → gitcompile
  16. +0 −5 include/Makefile.in
  17. +78 −21 include/asoundef.h
  18. +3 −0 include/config.h.in
  19. +0 −9 include/global.h
  20. +69 −0 include/iatomic.h
  21. +6 −2 include/mixer.h
  22. +2 −0 include/mixer_abst.h
  23. +14 −1 include/pcm.h
  24. +6 −0 include/seq.h
  25. +0 −5 include/sound/Makefile.in
  26. +5 −4 include/sound/asound.h
  27. +2 −2 include/version.h
  28. +1 −1 libtool
  29. +311 −0 m4/attributes.m4
  30. +0 −5 modules/Makefile.in
  31. +0 −5 modules/mixer/Makefile.in
  32. +8 −9 modules/mixer/simple/Makefile.am
  33. +11 −15 modules/mixer/simple/Makefile.in
  34. +46 −2 modules/mixer/simple/python.c
  35. +1 −1 src/Makefile.am
  36. +1 −6 src/Makefile.in
  37. +0 −5 src/alisp/Makefile.in
  38. +1 −1 src/alisp/alisp.c
  39. +3 −3 src/alisp/alisp_snd.c
  40. +1 −1 src/async.c
  41. +0 −5 src/compat/Makefile.in
  42. +4 −4 src/conf.c
  43. +2 −1 src/conf/Makefile.am
  44. +2 −6 src/conf/Makefile.in
  45. +21 −3 src/conf/alsa.conf
  46. +8 −0 src/conf/cards/Aureon51.conf
  47. +8 −0 src/conf/cards/Aureon71.conf
  48. +10 −3 src/conf/cards/CMI8788.conf
  49. +45 −0 src/conf/cards/HDA-Intel.conf
  50. +8 −0 src/conf/cards/ICE1724.conf
  51. +3 −2 src/conf/cards/Makefile.am
  52. +3 −7 src/conf/cards/Makefile.in
  53. +73 −0 src/conf/cards/NFORCE.conf
  54. +4 −4 src/conf/cards/PC-Speaker.conf
  55. +39 −0 src/conf/cards/PS3.conf
  56. +52 −2 src/conf/cards/aliases.conf
  57. +3 −2 src/conf/pcm/Makefile.am
  58. +3 −7 src/conf/pcm/Makefile.in
  59. +83 −0 src/conf/pcm/hdmi.conf
  60. +2 −2 src/confmisc.c
  61. +0 −5 src/control/Makefile.in
  62. +5 −5 src/control/control.c
  63. +3 −2 src/control/control_ext.c
  64. +11 −4 src/control/control_hw.c
  65. +1 −1 src/control/control_local.h
  66. +1 −1 src/control/control_shm.c
  67. +0 −1 src/control/ctl_symbols_list.c
  68. +3 −3 src/control/hcontrol.c
  69. +20 −19 src/control/namehint.c
  70. +8 −0 src/dlmisc.c
  71. +0 −5 src/hwdep/Makefile.in
  72. +1 −1 src/hwdep/hwdep_hw.c
  73. +1 −1 src/hwdep/hwdep_local.h
  74. +3 −3 src/input.c
  75. +0 −5 src/mixer/Makefile.in
  76. +59 −1 src/mixer/simple.c
  77. +55 −10 src/mixer/simple_none.c
  78. +3 −3 src/output.c
  79. +0 −5 src/pcm/Makefile.in
  80. +217 −35 src/pcm/pcm.c
  81. +3 −3 src/pcm/pcm_adpcm.c
  82. +1 −1 src/pcm/pcm_alaw.c
  83. +1 −1 src/pcm/pcm_copy.c
  84. +3 −3 src/pcm/pcm_direct.c
  85. +16 −4 src/pcm/pcm_dmix.c
  86. +2 −2 src/pcm/pcm_dmix_i386.h
  87. +1 −1 src/pcm/pcm_dmix_x86_64.h
  88. +22 −8 src/pcm/pcm_dshare.c
  89. +21 −2 src/pcm/pcm_dsnoop.c
  90. +3 −3 src/pcm/pcm_extplug.c
  91. +192 −24 src/pcm/pcm_file.c
  92. +12 −0 src/pcm/pcm_generic.c
  93. +6 −0 src/pcm/pcm_generic.h
  94. +4 −2 src/pcm/pcm_hooks.c
  95. +202 −7 src/pcm/pcm_hw.c
  96. +2 −2 src/pcm/pcm_iec958.c
  97. +17 −5 src/pcm/pcm_ioplug.c
  98. +1 −1 src/pcm/pcm_ladspa.c
  99. +1 −1 src/pcm/pcm_lfloat.c
  100. +1 −1 src/pcm/pcm_linear.c
  101. +15 −4 src/pcm/pcm_local.h
  102. +6 −4 src/pcm/pcm_meter.c
  103. +2 −11 src/pcm/pcm_misc.c
  104. +1 −2 src/pcm/pcm_mmap.c
  105. +18 −17 src/pcm/pcm_mmap_emul.c
  106. +1 −1 src/pcm/pcm_mulaw.c
  107. +2 −2 src/pcm/pcm_multi.c
  108. +4 −2 src/pcm/pcm_null.c
  109. +12 −12 src/pcm/pcm_params.c
  110. +82 −16 src/pcm/pcm_plug.c
  111. +20 −10 src/pcm/pcm_plugin.c
  112. +1 −1 src/pcm/pcm_plugin.h
  113. +4 −4 src/pcm/pcm_rate.c
  114. +1 −1 src/pcm/pcm_rate_linear.c
  115. +4 −4 src/pcm/pcm_route.c
  116. +26 −2 src/pcm/pcm_share.c
  117. +14 −2 src/pcm/pcm_shm.c
  118. +88 −19 src/pcm/pcm_softvol.c
  119. +0 −9 src/pcm/pcm_symbols_list.c
  120. +11 −11 src/pcm/plugin_ops.h
  121. +0 −5 src/pcm/scopes/Makefile.in
  122. +0 −5 src/rawmidi/Makefile.in
  123. +1 −1 src/rawmidi/rawmidi.c
  124. +1 −1 src/rawmidi/rawmidi_hw.c
  125. +1 −1 src/rawmidi/rawmidi_local.h
  126. +1 −1 src/rawmidi/rawmidi_virt.c
  127. +0 −5 src/seq/Makefile.in
  128. +107 −7 src/seq/seq.c
  129. +1 −1 src/seq/seq_hw.c
  130. +1 −1 src/seq/seq_local.h
  131. +5 −5 src/seq/seq_midi_event.c
  132. +1 −2 src/seq/seqmid.c
  133. +0 −5 src/timer/Makefile.in
  134. +1 −1 src/timer/timer_hw.c
  135. +1 −1 src/timer/timer_local.h
  136. +1 −1 src/timer/timer_query_hw.c
  137. +2 −1 test/Makefile.am
  138. +16 −11 test/Makefile.in
  139. +46 −0 test/client_event_filter.c
  140. +38 −15 test/pcm.c
  141. +0 −5 utils/Makefile.in
  142. +1 −1 version
View
@@ -52,67 +52,20 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/include
# libasound must be compiled with -fno-short-enums, as it makes extensive
# use of enums which are often type casted to unsigned ints.
LOCAL_CFLAGS := \
- -fno-short-enums -fPIC \
+ -fPIC -DPIC -D_POSIX_SOURCE \
-DALSA_CONFIG_DIR=\"/system/usr/share/alsa\" \
-DALSA_PLUGIN_DIR=\"/system/usr/lib/alsa-lib\" \
-DALSA_DEVICE_DIRECTORY=\"/dev/snd/\"
-LOCAL_SRC_FILES := $(addprefix src/, \
- conf.c \
- confmisc.c \
- input.c \
- output.c \
- async.c \
- error.c \
- dlmisc.c \
- socket.c \
- shmarea.c \
- userfile.c \
- names.c \
- hwdep/hwdep.c \
- hwdep/hwdep_hw.c \
- hwdep/hwdep_symbols.c \
- mixer/bag.c \
- mixer/mixer.c \
- mixer/simple.c \
- mixer/simple_abst.c \
- mixer/simple_none.c \
- pcm/atomic.c \
- pcm/mask.c \
- pcm/interval.c \
- pcm/pcm.c \
- pcm/pcm_params.c \
- pcm/pcm_simple.c \
- pcm/pcm_hw.c \
- pcm/pcm_misc.c \
- pcm/pcm_mmap.c \
- pcm/pcm_symbols.c \
- pcm/pcm_generic.c \
- pcm/pcm_plugin.c \
- pcm/pcm_copy.c \
- pcm/pcm_linear.c \
- pcm/pcm_plug.c \
- pcm/pcm_null.c \
- pcm/pcm_empty.c \
- pcm/pcm_hooks.c \
- pcm/pcm_asym.c \
- pcm/pcm_extplug.c \
- pcm/pcm_ioplug.c \
- control/cards.c \
- control/tlv.c \
- control/namehint.c \
- control/hcontrol.c \
- control/control.c \
- control/control_hw.c \
- control/setup.c \
- control/control_symbols.c \
- control/control_ext.c \
- timer/timer.c \
- timer/timer_hw.c \
- timer/timer_query.c \
- timer/timer_query_hw.c \
- timer/timer_symbols.c \
- )
+LOCAL_SRC_FILES := $(sort $(call all-c-files-under, src))
+
+# It is easier to exclude the ones we don't want...
+#
+LOCAL_SRC_FILES := $(filter-out src/pcm/pcm_ladspa.c, $(LOCAL_SRC_FILES))
+LOCAL_SRC_FILES := $(filter-out src/pcm/scopes/level.c, $(LOCAL_SRC_FILES))
+LOCAL_SRC_FILES := $(filter-out src/pcm/pcm_d%.c, $(LOCAL_SRC_FILES))
+LOCAL_SRC_FILES := $(filter-out src/alisp/alisp_snd.c, $(LOCAL_SRC_FILES))
+LOCAL_SRC_FILES := $(filter-out src/compat/hsearch_r.c, $(LOCAL_SRC_FILES))
include $(BUILD_STATIC_LIBRARY)
View
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4
+
SUBDIRS=doc include src
if BUILD_MODULES
SUBDIRS += modules
@@ -11,7 +13,8 @@ SUBDIRS += alsalisp
endif
endif
SUBDIRS += test utils
-EXTRA_DIST=ChangeLog INSTALL TODO NOTES configure hgcompile libtool depcomp version MEMORY-LEAK
+EXTRA_DIST=ChangeLog INSTALL TODO NOTES configure gitcompile libtool \
+ depcomp version MEMORY-LEAK m4/attributes.m4
AUTOMAKE_OPTIONS=foreign
INCLUDES=-I$(top_srcdir)/include
View
@@ -35,7 +35,6 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-target_triplet = @target@
@BUILD_MODULES_TRUE@am__append_1 = modules
@BUILD_PCM_PLUGIN_SHM_TRUE@am__append_2 = aserver
@BUILD_ALISP_TRUE@@BUILD_MIXER_TRUE@am__append_3 = alsalisp
@@ -276,14 +275,13 @@ psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
-target = @target@
target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
+ACLOCAL_AMFLAGS = -I m4
SUBDIRS = doc include src $(am__append_1) $(am__append_2) \
$(am__append_3) test utils
-EXTRA_DIST = ChangeLog INSTALL TODO NOTES configure hgcompile libtool depcomp version MEMORY-LEAK
+EXTRA_DIST = ChangeLog INSTALL TODO NOTES configure gitcompile libtool \
+ depcomp version MEMORY-LEAK m4/attributes.m4
+
AUTOMAKE_OPTIONS = foreign
INCLUDES = -I$(top_srcdir)/include
all: all-recursive
@@ -468,7 +466,7 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/src $(distdir)/utils
+ $(mkdir_p) $(distdir)/doc $(distdir)/m4 $(distdir)/src $(distdir)/utils
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
View
4 README
@@ -1,7 +1,7 @@
This version of the ALSA library was obtained from the following location:
-ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.16.tar.bz2
+ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.19.tar.bz2
-This package was configured with the following options:
+This package was (previously in 1.0.16) configured with the following options:
./configure \
--disable-debug \
View
@@ -36,7 +36,6 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-target_triplet = @target@
noinst_PROGRAMS = alsalisp$(EXEEXT)
subdir = alsalisp
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -268,11 +267,7 @@ psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
-target = @target@
target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
alsalisp_SOURCES = alsalisp.c
alsalisp_LDADD = ../src/libasound.la
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/alisp
View
@@ -36,7 +36,6 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-target_triplet = @target@
bin_PROGRAMS = aserver$(EXEEXT)
subdir = aserver
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in COPYING
@@ -270,11 +269,7 @@ psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
-target = @target@
target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
aserver_SOURCES = aserver.c
# aserver_LDADD = -lasound
aserver_LDADD = ../src/libasound.la
View
@@ -1005,7 +1005,7 @@ static void usage(void)
int main(int argc, char **argv)
{
- static struct option long_options[] = {
+ static const struct option long_options[] = {
{"help", 0, 0, 'h'},
{ 0 , 0 , 0, 0 }
};
Oops, something went wrong.

0 comments on commit b0d0efe

Please sign in to comment.