X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=d06983c343bc8c0ebbff7f7258634d0cab007b51;hp=0ecc297fa8423116d7b80e925f11e9cba496c4af;hb=c9381f1e1f60439f0edd8d67100cc13ad8f4c0bf;hpb=d11d02dc33b31084650ea181896181d02b3a50d3 diff --git a/configure.ac b/configure.ac index 0ecc297f..d06983c3 100644 --- a/configure.ac +++ b/configure.ac @@ -79,7 +79,6 @@ http_recv dccp_recv recv_common write_common file_write audiod_command client_common recv stdout filter stdin audioc write client fsck exec" all_executables="server audiod recv filter audioc write client fsck" - recv_cmdline_objs="recv.cmdline http_recv.cmdline dccp_recv.cmdline" recv_errlist_objs="http_recv recv_common recv time string net dccp_recv dccp fd sched stdout" @@ -493,6 +492,8 @@ AC_CONFIG_FILES([Makefile]) AC_DEFUN([add_dot_o],[$(for i in $@; do printf "$i.o "; done)]) AC_DEFUN([objlist_to_errlist],[$(for i in $@; do printf "DEFINE_ERRLIST($(echo $i| tr 'a-z' 'A-Z'));"; done) [const char **para_errlist[[]]] = {$(for i in $@; do printf "PARA_ERRLIST($(echo $i | tr 'a-z' 'A-Z')), "; done) }]) +############################################################# error2.h + AC_DEFUN([define_safe_error_enums], [ exe="" @@ -532,6 +533,7 @@ AC_DEFUN([define_safe_error_enums], ] ) + AC_MSG_NOTICE(creating error2.h) for obj in $all_errlist_objs; do SS="$SS SS_$(echo $obj | tr 'a-z' 'A-Z')," @@ -544,6 +546,38 @@ AC_DEFINE_UNQUOTED(DEFINE_ERRLIST_OBJECT_ENUM, [list of all objects that use paraslash's error facility] ) +################################################################## status items + +status_items="basename status num_played mtime bitrate frequency file_size +status_flags format score audio_file_info taginfo1 taginfo2 afs_mode +attributes_txt decoder_flags audiod_status play_time attributes_bitmap +offset seconds_total stream_start current_time audiod_uptime image_id +lyrics_id duration directory lyrics_name image_name path hash channels +last_played" + +# $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] +) + recv_objs="$recv_cmdline_objs $recv_errlist_objs" filter_objs="$filter_cmdline_objs $filter_errlist_objs"