Rename SERVER_AUDIO_FORMATS to AUDIO_FORMAT_HANDLERS.

The audio format handlers are used by para_server, para_afh and
para_play, so the old name was misleading.

diff --git a/afh_common.c b/afh_common.c
index 83ea38082bb7626bc7f38ed5247369acd54abdbd..5c866c1fdef07baf87c3cd6148619b8e8c13cb83 100644 (file)
--- a/afh_common.c
+++ b/afh_common.c
@@ -109,8 +109,7 @@ void afh_init(void)
 {
        int i;
 
-       PARA_INFO_LOG("supported audio formats: %s\n",
-               SERVER_AUDIO_FORMATS);
+       PARA_INFO_LOG("supported audio formats: %s\n", AUDIO_FORMAT_HANDLERS);
        FOR_EACH_AUDIO_FORMAT(i) {
                PARA_NOTICE_LOG("initializing %s handler\n",
                        audio_format_name(i));

diff --git a/command.c b/command.c
index 39470fa92e771b0f34da6d724bbaf12c39474203..aaaaaecf02084c188482214bebd3df433c54e72b 100644 (file)
--- a/command.c
+++ b/command.c
@@ -411,7 +411,7 @@ static int com_si(struct command_context *cc)
                mmd->num_commands,
                mmd->num_connects,
                conf.loglevel_arg,
-               SERVER_AUDIO_FORMATS,
+               AUDIO_FORMAT_HANDLERS,
                sender_info
        );
        mutex_unlock(mmd_mutex);

diff --git a/configure.ac b/configure.ac
index 60bb6644286c3ba5b22a0b568ce63695d6d7479b..4512c6fd38f7209aad203c14cfe31dc66d4e1d56 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -289,7 +289,7 @@ else
                acl udp_send"
 
        server_ldflags=""
-       server_audio_formats="mp3 wma"
+       audio_format_handlers="mp3 wma"
        AC_SUBST(osl_cppflags)
        server_ldflags="$server_ldflags $osl_libs -losl"
 fi
@@ -637,7 +637,7 @@ if test "$have_vorbis" = "yes"; then
        recv_errlist_objs="$recv_errlist_objs ogg_afh"
 
        audiod_audio_formats="$audiod_audio_formats ogg"
-       server_audio_formats="$server_audio_formats ogg"
+       audio_format_handlers="$audio_format_handlers ogg"
 else
        AC_MSG_WARN([no ogg/vorbis $msg])
 fi
@@ -661,7 +661,7 @@ if test "$have_speex" = "yes"; then
        recv_errlist_objs="$recv_errlist_objs spx_afh spx_common"
 
        audiod_audio_formats="$audiod_audio_formats spx"
-       server_audio_formats="$server_audio_formats spx"
+       audio_format_handlers="$audio_format_handlers spx"
 else
        AC_MSG_WARN([no ogg/speex $msg])
 fi
@@ -705,7 +705,7 @@ if test "$have_faad" = "yes"; then
        recv_ldflags="$afh_ldflags $faad_libs -lfaad"
 
        audiod_audio_formats="$audiod_audio_formats aac"
-       server_audio_formats="$server_audio_formats aac"
+       audio_format_handlers="$audio_format_handlers aac"
        filters="$filters aacdec"
        AC_SUBST(faad_cppflags)
 else
@@ -836,7 +836,7 @@ if test "$have_flac" = "yes"; then
        afh_ldflags="$afh_ldflags $flac_libs -lFLAC"
        recv_ldflags="$afh_ldflags $flac_libs -lFLAC"
        filters="$filters flacdec"
-       server_audio_formats="$server_audio_formats flac"
+       audio_format_handlers="$audio_format_handlers flac"
        audiod_audio_formats="$audiod_audio_formats flac"
        AC_SUBST(flac_cppflags)
 else
@@ -1186,7 +1186,7 @@ done
 AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY, [$result],
        [char * array of all status items])
 
-AC_DEFINE_UNQUOTED(SERVER_AUDIO_FORMATS, "$server_audio_formats",
+AC_DEFINE_UNQUOTED(AUDIO_FORMAT_HANDLERS, "$audio_format_handlers",
        [formats supported by para_server and para_afh])
 
 AC_SUBST(executables, add_para($executables))
@@ -1284,7 +1284,7 @@ paraslash configuration:
 ~~~~~~~~~~~~~~~~~~~~~~~~
 unix socket credentials: $have_ucred
 readline (interactive CLIs): $have_readline
-audio formats supported by para_server/para_afh: $server_audio_formats
+audio formats handlers: $audio_format_handlers
 id3 version2 support: $have_libid3tag
 filters: $filters
 writers: $writers