From dd0b1f12758ac877de6834b34f8c7f9291d4311d Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 30 Nov 2008 21:45:38 +0100 Subject: [PATCH] Rename filter source files. Some filters already had the _filter postfix, others had not. Rename the latter just to be consistent. --- Makefile.in | 6 +++--- aacdec.c => aacdec_filter.c | 2 +- compress.c => compress_filter.c | 2 +- configure.ac | 24 ++++++++++++------------ error.h | 10 +++++----- filter.h | 2 +- mp3dec.c => mp3dec_filter.c | 2 +- oggdec.c => oggdec_filter.c | 2 +- server.c | 4 ++-- wav.c => wav_filter.c | 2 +- 10 files changed, 28 insertions(+), 28 deletions(-) rename aacdec.c => aacdec_filter.c (98%) rename compress.c => compress_filter.c (97%) rename mp3dec.c => mp3dec_filter.c (98%) rename oggdec.c => oggdec_filter.c (98%) rename wav.c => wav_filter.c (97%) diff --git a/Makefile.in b/Makefile.in index 5dd08d6d..8ac8b65b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -161,15 +161,15 @@ ortp_recv.o: ortp_recv.c ortp_send.o: ortp_send.c $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ortp_cppflags@ $< -oggdec.o: oggdec.c +oggdec_filter.o: oggdec_filter.c $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @oggvorbis_cppflags@ $< ogg_afh.o: ogg_afh.c $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @oggvorbis_cppflags@ $< -mp3dec.o: mp3dec.c +mp3dec_filter.o: mp3dec_filter.c $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @mad_cppflags@ $< -aacdec.o: aacdec.c +aacdec_filter.o: aacdec_filter.c $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $< aac_common.o: aac_common.c diff --git a/aacdec.c b/aacdec_filter.c similarity index 98% rename from aacdec.c rename to aacdec_filter.c index 38f69e88..956f338d 100644 --- a/aacdec.c +++ b/aacdec_filter.c @@ -8,7 +8,7 @@ * Ahead Software AG */ -/** \file aacdec.c paraslash's aac (m4a) decoder */ +/** \file aacdec_filter.c paraslash's aac (m4a) decoder. */ #include "para.h" diff --git a/compress.c b/compress_filter.c similarity index 97% rename from compress.c rename to compress_filter.c index d6f7520d..6034ce79 100644 --- a/compress.c +++ b/compress_filter.c @@ -4,7 +4,7 @@ * Licensed under the GPL v2. For licencing details see COPYING. */ -/** \file compress.c Paraslash's dynamic audio range compressor. */ +/** \file compress_filter.c Paraslash's dynamic audio range compressor. */ /* * Uses ideas of AudioCompress, (C) 2002-2004 M. Hari Nezumi diff --git a/configure.ac b/configure.ac index cb6ecd65..7cba9450 100644 --- a/configure.ac +++ b/configure.ac @@ -81,7 +81,7 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \ all_errlist_objs="server mp3_afh afh_common vss command net string signal time daemon stat crypt http_send close_on_fork ipc acl afh fade amp_filter dccp_send fd user_list chunk_queue afs osl aft mood score attribute blob ringbuffer -playlist sha1 rbtree sched audiod grab_client filter_chain wav compress +playlist sha1 rbtree sched audiod grab_client filter_chain wav_filter compress_filter http_recv dccp_recv recv_common write_common file_write audiod_command client_common recv stdout filter stdin audioc write client fsck exec send_common" @@ -96,7 +96,7 @@ receivers=" http dccp" senders=" http dccp" filter_cmdline_objs="filter.cmdline compress_filter.cmdline amp_filter.cmdline" -filter_errlist_objs="filter_chain wav compress filter string stdin stdout sched fd amp_filter" +filter_errlist_objs="filter_chain wav_filter compress_filter filter string stdin stdout sched fd amp_filter" filter_ldflags="" filters=" compress wav amp" @@ -108,7 +108,7 @@ audiod_cmdline_objs="audiod.cmdline grab_client.cmdline compress_filter.cmdline http_recv.cmdline dccp_recv.cmdline file_write.cmdline client.cmdline audiod_command_list amp_filter.cmdline" audiod_errlist_objs="audiod signal string daemon stat net - time grab_client filter_chain wav compress amp_filter http_recv dccp_recv + time grab_client filter_chain wav_filter compress_filter amp_filter http_recv dccp_recv recv_common fd sched write_common file_write audiod_command crypt client_common" audiod_ldflags="" @@ -316,7 +316,7 @@ AC_CHECK_LIB([ogg], [ogg_stream_init], [], [ have_ogg="no" ]) AC_CHECK_LIB([vorbis], [vorbis_info_init], [], [ have_ogg="no" ]) AC_CHECK_HEADERS([ogg/ogg.h vorbis/codec.h], [], [ have_ogg="no" ]) if test "$have_ogg" = "yes"; then - all_errlist_objs="$all_errlist_objs oggdec ogg_afh" + all_errlist_objs="$all_errlist_objs oggdec_filter ogg_afh" AC_DEFINE(HAVE_OGGVORBIS, 1, define to 1 to turn on ogg vorbis support) filters="$filters oggdec" if test "$OSTYPE" = "Darwin"; then @@ -331,8 +331,8 @@ if test "$have_ogg" = "yes"; then audiod_cmdline_objs="$audiod_cmdline_objs oggdec_filter.cmdline" server_errlist_objs="$server_errlist_objs ogg_afh" - filter_errlist_objs="$filter_errlist_objs oggdec" - audiod_errlist_objs="$audiod_errlist_objs oggdec" + filter_errlist_objs="$filter_errlist_objs oggdec_filter" + audiod_errlist_objs="$audiod_errlist_objs oggdec_filter" afh_errlist_objs="$afh_errlist_objs ogg_afh" audiod_audio_formats="ogg" @@ -366,10 +366,10 @@ AC_CHECK_HEADER(neaacdec.h, [], have_faad=no) AC_CHECK_LIB([faad], [NeAACDecOpen], [], have_faad=no) if test "$have_faad" = "yes"; then AC_DEFINE(HAVE_FAAD, 1, define to 1 if you want to build the aacdec filter) - all_errlist_objs="$all_errlist_objs aac_common aacdec aac_afh" - filter_errlist_objs="$filter_errlist_objs aacdec aac_common" + all_errlist_objs="$all_errlist_objs aac_common aacdec_filter aac_afh" + filter_errlist_objs="$filter_errlist_objs aacdec_filter aac_common" afh_errlist_objs="$afh_errlist_objs aac_common aac_afh" - audiod_errlist_objs="$audiod_errlist_objs aacdec aac_common" + audiod_errlist_objs="$audiod_errlist_objs aacdec_filter aac_common" server_errlist_objs="$server_errlist_objs aac_afh aac_common" server_ldflags="$server_ldflags $faad_libs -lfaad" filter_ldflags="$filter_ldflags $faad_libs -lfaad" @@ -412,9 +412,9 @@ AC_CHECK_LIB([mad], [mad_stream_init], [], [ ]) if test "$have_mad" = "yes"; then AC_DEFINE(HAVE_MAD, 1, define to 1 if you want to build the mp3dec filter) - all_errlist_objs="$all_errlist_objs mp3dec" - filter_errlist_objs="$filter_errlist_objs mp3dec" - audiod_errlist_objs="$audiod_errlist_objs mp3dec" + all_errlist_objs="$all_errlist_objs mp3dec_filter" + filter_errlist_objs="$filter_errlist_objs mp3dec_filter" + audiod_errlist_objs="$audiod_errlist_objs mp3dec_filter" filter_ldflags="$filter_ldflags $mad_libs -lmad" audiod_ldflags="$audiod_ldflags $mad_libs -lmad" audiod_audio_formats="$audiod_audio_formats mp3" diff --git a/error.h b/error.h index cacc83e9..92aaff5d 100644 --- a/error.h +++ b/error.h @@ -13,7 +13,7 @@ DEFINE_ERRLIST_OBJECT_ENUM; /* these do not need error handling (yet) */ #define SERVER_ERRORS -#define WAV_ERRORS +#define WAV_FILTER_ERRORS #define TIME_ERRORS #define CLOSE_ON_FORK_ERRORS #define DAEMON_ERRORS @@ -32,7 +32,7 @@ DEFINE_ERRLIST_OBJECT_ENUM; extern const char **para_errlist[]; -#define COMPRESS_ERRORS \ +#define COMPRESS_FILTER_ERRORS \ PARA_ERROR(COMPRESS_SYNTAX, "syntax error in compress filter config"), \ @@ -251,7 +251,7 @@ extern const char **para_errlist[]; PARA_ERROR(UNKNOWN_STAT_ITEM, "status item not recognized"), \ -#define OGGDEC_ERRORS \ +#define OGGDEC_FILTER_ERRORS \ PARA_ERROR(OGGDEC_READ, "read from media returned an error"), \ PARA_ERROR(OGGDEC_NOTVORBIS, "bitstream is not vorbis data"), \ PARA_ERROR(OGGDEC_VERSION, "vorbis version mismatch"), \ @@ -271,7 +271,7 @@ extern const char **para_errlist[]; PARA_ERROR(GC_VERSION_GIVEN, ""), /* not really an error */ \ -#define MP3DEC_ERRORS \ +#define MP3DEC_FILTER_ERRORS \ PARA_ERROR(MAD_FRAME_DECODE, "mad frame decode error"), \ PARA_ERROR(MP3DEC_OVERRUN, "mp3 output buffer overrun"), \ @@ -398,7 +398,7 @@ extern const char **para_errlist[]; PARA_ERROR(WRITE_COMMON_SYNTAX, "syntax error in write option"), \ -#define AACDEC_ERRORS \ +#define AACDEC_FILTER_ERRORS \ PARA_ERROR(AACDEC_INIT, "failed to init aac decoder"), \ PARA_ERROR(AAC_DECODE, "aac decode error"), \ PARA_ERROR(AAC_OVERRUN, "aac output buffer overrun"), \ diff --git a/filter.h b/filter.h index 2a75b186..3425ae85 100644 --- a/filter.h +++ b/filter.h @@ -143,7 +143,7 @@ struct filter_callback { * Note: As several instances of the same filter may be running at the same * time, all these filter functions must be reentrant; no static non-constant * variables may be used. - * \sa mp3dec.c, oggdec.c, wav.c, compress.c, filter_node + * \sa mp3dec_filter.c, oggdec_filter.c, wav_filter.c, compress_filter.c, filter_node */ struct filter { /** The name of the filter. */ diff --git a/mp3dec.c b/mp3dec_filter.c similarity index 98% rename from mp3dec.c rename to mp3dec_filter.c index 599d8a90..50e530e1 100644 --- a/mp3dec.c +++ b/mp3dec_filter.c @@ -4,7 +4,7 @@ * Licensed under the GPL v2. For licencing details see COPYING. */ -/** \file mp3dec.c Paraslash's mp3 decoder. */ +/** \file mp3dec_filter.c Paraslash's mp3 decoder. */ #include "para.h" #include "list.h" diff --git a/oggdec.c b/oggdec_filter.c similarity index 98% rename from oggdec.c rename to oggdec_filter.c index b4befd01..689fc7aa 100644 --- a/oggdec.c +++ b/oggdec_filter.c @@ -4,7 +4,7 @@ * Licensed under the GPL v2. For licencing details see COPYING. */ -/** \file oggdec.c Paraslash's ogg vorbis decoder. */ +/** \file oggdec_filter.c Paraslash's ogg vorbis decoder. */ #include "para.h" diff --git a/server.c b/server.c index 91568764..459f4462 100644 --- a/server.c +++ b/server.c @@ -23,8 +23,8 @@ * The gory details, listed by topic: * * - Audio format handlers: \ref send_common.c \ref mp3_afh.c, \ref ogg_afh.c, \ref aac_afh.c, - * - Decoders: \ref mp3dec.c, \ref oggdec.c, \ref aacdec.c, - * - Volume normalizer: \ref compress.c, + * - Decoders: \ref mp3dec_filter.c, \ref oggdec_filter.c, \ref aacdec_filter.c, + * - Volume normalizer: \ref compress_filter.c, * - Output: \ref alsa_write.c, \ref osx_write.c, * - http: \ref http_recv.c, \ref http_send.c, * - ortp: \ref ortp_recv.c, \ref ortp_send.c, diff --git a/wav.c b/wav_filter.c similarity index 97% rename from wav.c rename to wav_filter.c index ad3458d1..242cb4bb 100644 --- a/wav.c +++ b/wav_filter.c @@ -4,7 +4,7 @@ * Licensed under the GPL v2. For licencing details see COPYING. */ -/** \file wav.c a filter that inserts a wave header */ +/** \file wav_filter.c A filter that inserts a wave header. */ #include "para.h" -- 2.39.2