From: Andre Noll <maan@systemlinux.org>
Date: Sun, 1 Aug 2010 11:26:42 +0000 (+0200)
Subject: Merge branch 't/speex'
X-Git-Tag: v0.4.4~5
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=dae03f0046d6695172aa32722600e1b9deea1e9c;p=paraslash.git

Merge branch 't/speex'
---

dae03f0046d6695172aa32722600e1b9deea1e9c
diff --cc configure.ac
index 8fbf49a6,5322e7d1..a7bd3e1a
--- a/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))