From 90501714a4379e36e191a7d5330378f898ac258f Mon Sep 17 00:00:00 2001
From: Andre <maan@p133.(none)>
Date: Wed, 17 May 2006 21:47:27 +0200
Subject: [PATCH] rename mp3.c to mp3_afh.c and ogg.c to ogg_afh.c

---
 configure.ac       |  4 ++--
 error.h            | 12 ++++++------
 mp3.c => mp3_afh.c |  0
 ogg.c => ogg_afh.c |  0
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename mp3.c => mp3_afh.c (100%)
 rename ogg.c => ogg_afh.c (100%)

diff --git a/configure.ac b/configure.ac
index 89720902..18d6e9cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,7 @@ audiod_errlist_objs="audiod exec close_on_fork signal string daemon stat net
 audiod_ldflags=""
 
 server_cmdline_objs="server.cmdline"
-server_errlist_objs="server mp3 afs command net string signal random_selector
+server_errlist_objs="server mp3_afh afs command net string signal random_selector
 	time daemon stat crypt http_send db close_on_fork playlist_selector
 	ipc dccp dccp_send fd"
 server_ldflags=""
@@ -209,7 +209,7 @@ if test "$have_ogg" = "yes"; then
 	filter_cmdline_objs="$filter_cmdline_objs oggdec_filter.cmdline"
 	audiod_cmdline_objs="$audiod_cmdline_objs oggdec_filter.cmdline"
 
-	server_errlist_objs="$server_errlist_objs ogg"
+	server_errlist_objs="$server_errlist_objs ogg_afh"
 	filter_errlist_objs="$filter_errlist_objs oggdec"
 	audiod_errlist_objs="$audiod_errlist_objs oggdec"
 else
diff --git a/error.h b/error.h
index dabe82bf..924f9607 100644
--- a/error.h
+++ b/error.h
@@ -46,8 +46,8 @@ enum para_subsystem {
 	SS_HTTP_SEND,
 	SS_ORTP_SEND,
 	SS_DB,
-	SS_OGG,
-	SS_MP3,
+	SS_OGG_AFH,
+	SS_MP3_AFH,
 	SS_AAC_AFH,
 	SS_MP3DEC,
 	SS_AACDEC,
@@ -178,7 +178,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(NULL_OPEN, "can not open /dev/null"), \
 
 
-#define MP3_ERRORS \
+#define MP3_AFH_ERRORS \
 	PARA_ERROR(FREAD, "fread error"), \
 	PARA_ERROR(FSEEK, "fseek error"), \
 	PARA_ERROR(FRAME, "invalid mp3 frame"), \
@@ -203,7 +203,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(STCO, "did not find stco atom"), \
 
 
-#define OGG_ERRORS \
+#define OGG_AFH_ERRORS \
 	PARA_ERROR(OGG_READ, "ogg read error"), \
 	PARA_ERROR(SYNC_PAGEOUT, "ogg sync page-out error (no ogg file?)"), \
 	PARA_ERROR(STREAM_PAGEIN, "ogg stream page-in error (first page)"), \
@@ -458,8 +458,8 @@ SS_ENUM(OGGDEC);
 SS_ENUM(MP3DEC);
 SS_ENUM(AACDEC);
 SS_ENUM(FILTER);
-SS_ENUM(MP3);
-SS_ENUM(OGG);
+SS_ENUM(MP3_AFH);
+SS_ENUM(OGG_AFH);
 SS_ENUM(AAC_AFH);
 SS_ENUM(AAC_COMMON);
 SS_ENUM(SERVER);
diff --git a/mp3.c b/mp3_afh.c
similarity index 100%
rename from mp3.c
rename to mp3_afh.c
diff --git a/ogg.c b/ogg_afh.c
similarity index 100%
rename from ogg.c
rename to ogg_afh.c
-- 
2.39.2