From bb406379164df28e66c0c320780095721ddc938a Mon Sep 17 00:00:00 2001 From: Andre Date: Fri, 10 Mar 2006 21:11:36 +0100 Subject: [PATCH] Rename random_dbtool.c to random_selector.c --- configure.ac | 4 ++-- error.h | 6 +++--- mysql.c | 2 +- playlist_selector.c | 3 ++- random_dbtool.c => random_selector.c | 4 ++-- 5 files changed, 10 insertions(+), 9 deletions(-) rename random_dbtool.c => random_selector.c (96%) diff --git a/configure.ac b/configure.ac index 587e22f8..e05765ec 100644 --- a/configure.ac +++ b/configure.ac @@ -72,8 +72,8 @@ 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_dbtool time daemon stat - crypt http_send db close_on_fork playlist_selector ipc" +server_errlist_objs="server mp3 afs command net string signal random_selector + time daemon stat crypt http_send db close_on_fork playlist_selector ipc" server_ldflags="" ########################################################################### ssl diff --git a/error.h b/error.h index a753bc45..c7c9aeba 100644 --- a/error.h +++ b/error.h @@ -23,7 +23,7 @@ enum para_subsystem {SS_RECV, SS_NET, SS_ORTP_RECV, SS_AUDIOD, SS_EXEC, SS_CLOSE_ON_FORK, SS_SIGNAL, SS_STRING, SS_DAEMON, SS_STAT, SS_TIME, SS_GRAB_CLIENT, SS_HTTP_RECV, SS_RECV_COMMON, SS_FILTER_CHAIN, SS_WAV, SS_COMPRESS, SS_OGGDEC, SS_FILTER, - SS_COMMAND, SS_RANDOM_DBTOOL, SS_PLAYLIST_SELECTOR, SS_CRYPT, + SS_COMMAND, SS_RANDOM_SELECTOR, SS_PLAYLIST_SELECTOR, SS_CRYPT, SS_HTTP_SEND, SS_ORTP_SEND, SS_DB, SS_OGG, SS_MP3, SS_MP3DEC, SS_SERVER, SS_AFS, SS_MYSQL, SS_IPC, SS_RINGBUFFER}; #define NUM_SS (SS_RINGBUFFER + 1) @@ -186,7 +186,7 @@ extern const char **para_errlist[]; PARA_ERROR(WRITE_OK, "can not check whether fd is writable"), \ -#define RANDOM_DBTOOL_ERRORS \ +#define RANDOM_SELECTOR_ERRORS \ PARA_ERROR(FILE_COUNT, "audio file count exceeded"), \ PARA_ERROR(NOTHING_FOUND, "no audio files found"), \ @@ -343,7 +343,7 @@ SS_ENUM(OGG); SS_ENUM(SERVER); SS_ENUM(AFS); SS_ENUM(COMMAND); -SS_ENUM(RANDOM_DBTOOL); +SS_ENUM(RANDOM_SELECTOR); SS_ENUM(PLAYLIST_SELECTOR); SS_ENUM(CRYPT); SS_ENUM(HTTP_SEND); diff --git a/mysql.c b/mysql.c index 61d9cfdf..9292ab29 100644 --- a/mysql.c +++ b/mysql.c @@ -2514,7 +2514,7 @@ static void shutdown_connection(void) * Check the command line options and initialize all function pointers of \a db. * Connect to the mysql server and initialize the dbinfo string. * - * \sa struct audio_file_selector, misc_meta_data::dbinfo, random_dbtool.c + * \sa struct audio_file_selector, misc_meta_data::dbinfo, random_selector.c */ int mysql_selector_init(struct audio_file_selector *db) { diff --git a/playlist_selector.c b/playlist_selector.c index 47fb2699..f5241d69 100644 --- a/playlist_selector.c +++ b/playlist_selector.c @@ -275,7 +275,8 @@ void pls_update_audio_file(char *audio_file) * * Init all function pointers of \a db * - * \sa struct audio_file_selector, misc_meta_data::dbinfo, mysql.c random_dbtool.c + * \sa struct audio_file_selector, misc_meta_data::dbinfo, mysql.c + * random_selector.c. */ int playlist_selector_init(struct audio_file_selector *db) { diff --git a/random_dbtool.c b/random_selector.c similarity index 96% rename from random_dbtool.c rename to random_selector.c index c860c039..43cddb4a 100644 --- a/random_dbtool.c +++ b/random_selector.c @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ -/** \file random_dbtool.c Simple database tool implementation. Feel free to modify. */ +/** \file random_selector.c An audio file selector which chooses files by random */ #include /* gettimeofday */ #include "server.cmdline.h" @@ -48,7 +48,7 @@ static int remember_file(const char *dir, const char *name) return 1; } -/* array of commands that are supported by this database tool */ +/* array of commands that are supported by this selector */ static struct server_command cmds[] = { { .name = "random_info", -- 2.39.2