Merge branch 't/speex'

diff --cc alsa_write.c
Simple merge

diff --cc configure.ac
index 8fbf49a6e222e253c17a686fa07ed013b7e4ce42,5322e7d1be6a12b5230d15599fc6b323e00e3a0d..a7bd3e1ab5e96bb956b8598af2786aadca2f106c
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -675,20 -753,32 +714,23 @@@ lyrics_id duration directory lyrics_nam
  last_played num_chunks chunk_time amplification artist title year album
  comment"
  
 -# $1: prefix, $2: items
 -AC_DEFUN([make_enum_items], [$(
 -      for i in $2; do
 -              printf "$1_$(echo $i | tr 'a-z' 'A-Z'), "
 -      done
 -)])
 -
 -# $1: prefix, $2: items
 -AC_DEFUN([make_enum_array], [$(
 -      for i in $2; do
 -              printf "\"$i\", "
 -      done
 -)])
 -
 -AC_DEFINE_UNQUOTED(STATUS_ITEM_ENUM,
 -      make_enum_items(SI,  $status_items),
 -      [enum of all status items]
 -)
 -AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY,
 -      make_enum_array(SI,  $status_items),
 -      [char * array of all status items]
 -)
 +result=
 +for i in $status_items; do
 +      result="$result SI_$(echo $i | tr 'a-z' 'A-Z'), "
 +done
 +AC_DEFINE_UNQUOTED(STATUS_ITEM_ENUM, [$result],
 +      [enum of all status items])
 +
 +result=
 +for i in $status_items; do
 +      result="$result \"$i\", "
 +done
 +AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY, [$result],
 +      [char * array of all status items])
  
+ AC_DEFINE_UNQUOTED(SERVER_AUDIO_FORMATS, "$server_audio_formats",
+       [formats supported by para_server and para_afh])
+ 
  
  AC_SUBST(executables, add_para($executables))