diff options
Diffstat (limited to '')
| -rw-r--r-- | src/decode.c | 8 | ||||
| -rw-r--r-- | src/decoder_list.c | 38 | ||||
| -rw-r--r-- | src/decoder_list.h | 18 | ||||
| -rw-r--r-- | src/inputPlugins/flac_plugin.c | 2 | ||||
| -rw-r--r-- | src/ls.c | 2 | ||||
| -rw-r--r-- | src/main.c | 8 |
6 files changed, 40 insertions, 36 deletions
diff --git a/src/decode.c b/src/decode.c index 42b8adb02..4f12d7a97 100644 --- a/src/decode.c +++ b/src/decode.c @@ -243,7 +243,7 @@ static void decodeStart(void) unsigned int next = 0; /* first we try mime types: */ - while (ret && (plugin = getInputPluginFromMimeType(inStream.mime, next++))) { + while (ret && (plugin = decoder_plugin_from_mime_type(inStream.mime, next++))) { if (!plugin->stream_decode_func) continue; if (!(plugin->stream_types & INPUT_PLUGIN_STREAM_URL)) @@ -259,7 +259,7 @@ static void decodeStart(void) if (plugin == NULL) { const char *s = getSuffix(path_max_utf8); next = 0; - while (ret && (plugin = getInputPluginFromSuffix(s, next++))) { + while (ret && (plugin = decoder_plugin_from_suffix(s, next++))) { if (!plugin->stream_decode_func) continue; if (!(plugin->stream_types & @@ -280,7 +280,7 @@ static void decodeStart(void) if (plugin == NULL) { /* we already know our mp3Plugin supports streams, no * need to check for stream{Types,DecodeFunc} */ - if ((plugin = getInputPluginFromName("mp3"))) { + if ((plugin = decoder_plugin_from_name("mp3"))) { decoder.plugin = plugin; ret = plugin->stream_decode_func(&decoder, &inStream); @@ -289,7 +289,7 @@ static void decodeStart(void) } else { unsigned int next = 0; const char *s = getSuffix(path_max_utf8); - while (ret && (plugin = getInputPluginFromSuffix(s, next++))) { + while (ret && (plugin = decoder_plugin_from_suffix(s, next++))) { if (!plugin->stream_types & INPUT_PLUGIN_STREAM_FILE) continue; diff --git a/src/decoder_list.c b/src/decoder_list.c index 7da8147fe..dd2c79733 100644 --- a/src/decoder_list.c +++ b/src/decoder_list.c @@ -32,7 +32,7 @@ extern struct decoder_plugin modPlugin; static List *inputPlugin_list; -void loadInputPlugin(struct decoder_plugin * inputPlugin) +void decoder_plugin_load(struct decoder_plugin * inputPlugin) { if (!inputPlugin) return; @@ -45,7 +45,7 @@ void loadInputPlugin(struct decoder_plugin * inputPlugin) insertInList(inputPlugin_list, inputPlugin->name, (void *)inputPlugin); } -void unloadInputPlugin(struct decoder_plugin * inputPlugin) +void decoder_plugin_unload(struct decoder_plugin * inputPlugin) { if (inputPlugin->finish_func) inputPlugin->finish_func(); @@ -63,7 +63,8 @@ static int stringFoundInStringArray(const char *const*array, const char *suffix) return 0; } -struct decoder_plugin *getInputPluginFromSuffix(const char *suffix, unsigned int next) +struct decoder_plugin *decoder_plugin_from_suffix(const char *suffix, + unsigned int next) { static ListNode *pos; ListNode *node; @@ -92,7 +93,8 @@ struct decoder_plugin *getInputPluginFromSuffix(const char *suffix, unsigned int return NULL; } -struct decoder_plugin *getInputPluginFromMimeType(const char *mimeType, unsigned int next) +struct decoder_plugin *decoder_plugin_from_mime_type(const char *mimeType, + unsigned int next) { static ListNode *pos; ListNode *node; @@ -115,7 +117,7 @@ struct decoder_plugin *getInputPluginFromMimeType(const char *mimeType, unsigned return NULL; } -struct decoder_plugin *getInputPluginFromName(const char *name) +struct decoder_plugin *decoder_plugin_from_name(const char *name) { void *plugin = NULL; @@ -124,7 +126,7 @@ struct decoder_plugin *getInputPluginFromName(const char *name) return (struct decoder_plugin *) plugin; } -void printAllInputPluginSuffixes(FILE * fp) +void decoder_plugin_print_all_suffixes(FILE * fp) { ListNode *node = inputPlugin_list->firstNode; struct decoder_plugin *plugin; @@ -143,24 +145,24 @@ void printAllInputPluginSuffixes(FILE * fp) fflush(fp); } -void initInputPlugins(void) +void decoder_plugin_init_all(void) { inputPlugin_list = makeList(NULL, 1); /* load plugins here */ - loadInputPlugin(&mp3Plugin); - loadInputPlugin(&oggvorbisPlugin); - loadInputPlugin(&oggflacPlugin); - loadInputPlugin(&flacPlugin); - loadInputPlugin(&audiofilePlugin); - loadInputPlugin(&mp4Plugin); - loadInputPlugin(&aacPlugin); - loadInputPlugin(&mpcPlugin); - loadInputPlugin(&wavpackPlugin); - loadInputPlugin(&modPlugin); + decoder_plugin_load(&mp3Plugin); + decoder_plugin_load(&oggvorbisPlugin); + decoder_plugin_load(&oggflacPlugin); + decoder_plugin_load(&flacPlugin); + decoder_plugin_load(&audiofilePlugin); + decoder_plugin_load(&mp4Plugin); + decoder_plugin_load(&aacPlugin); + decoder_plugin_load(&mpcPlugin); + decoder_plugin_load(&wavpackPlugin); + decoder_plugin_load(&modPlugin); } -void finishInputPlugins(void) +void decoder_plugin_deinit_all(void) { freeList(inputPlugin_list); } diff --git a/src/decoder_list.h b/src/decoder_list.h index 4f3bf3595..dc7c7c590 100644 --- a/src/decoder_list.h +++ b/src/decoder_list.h @@ -24,23 +24,25 @@ struct decoder_plugin; /* individual functions to load/unload plugins */ -void loadInputPlugin(struct decoder_plugin * inputPlugin); -void unloadInputPlugin(struct decoder_plugin * inputPlugin); +void decoder_plugin_load(struct decoder_plugin * inputPlugin); +void decoder_plugin_unload(struct decoder_plugin * inputPlugin); /* interface for using plugins */ -struct decoder_plugin *getInputPluginFromSuffix(const char *suffix, unsigned int next); +struct decoder_plugin *decoder_plugin_from_suffix(const char *suffix, + unsigned int next); -struct decoder_plugin *getInputPluginFromMimeType(const char *mimeType, unsigned int next); +struct decoder_plugin *decoder_plugin_from_mime_type(const char *mimeType, + unsigned int next); -struct decoder_plugin *getInputPluginFromName(const char *name); +struct decoder_plugin *decoder_plugin_from_name(const char *name); -void printAllInputPluginSuffixes(FILE * fp); +void decoder_plugin_print_all_suffixes(FILE * fp); /* this is where we "load" all the "plugins" ;-) */ -void initInputPlugins(void); +void decoder_plugin_init_all(void); /* this is where we "unload" all the "plugins" */ -void finishInputPlugins(void); +void decoder_plugin_deinit_all(void); #endif diff --git a/src/inputPlugins/flac_plugin.c b/src/inputPlugins/flac_plugin.c index c0d24c699..c0456791f 100644 --- a/src/inputPlugins/flac_plugin.c +++ b/src/inputPlugins/flac_plugin.c @@ -533,7 +533,7 @@ static int flac_plugin_init(void) INPUT_PLUGIN_STREAM_FILE; oggflacPlugin.suffixes = oggflac_suffixes; oggflacPlugin.mime_types = oggflac_mime_types; - loadInputPlugin(&oggflacPlugin); + decoder_plugin_load(&oggflacPlugin); return 1; } @@ -263,7 +263,7 @@ struct decoder_plugin *hasMusicSuffix(const char *utf8file, unsigned int next) const char *s = getSuffix(utf8file); if (s) { - ret = getInputPluginFromSuffix(s, next); + ret = decoder_plugin_from_suffix(s, next); } else { DEBUG("hasMusicSuffix: The file: %s has no valid suffix\n", utf8file); diff --git a/src/main.c b/src/main.c index baa0ba3a3..7f66fd6bd 100644 --- a/src/main.c +++ b/src/main.c @@ -128,8 +128,8 @@ static void version(void) LOG("\n"); LOG("Supported formats:\n"); - initInputPlugins(); - printAllInputPluginSuffixes(stdout); + decoder_plugin_init_all(); + decoder_plugin_print_all_suffixes(stdout); LOG("\n"); LOG("Supported outputs:\n"); @@ -407,7 +407,7 @@ int main(int argc, char *argv[]) initPaths(); initPermissions(); initPlaylist(); - initInputPlugins(); + decoder_plugin_init_all(); openDB(&options, argv[0]); @@ -461,7 +461,7 @@ int main(int argc, char *argv[]) finishPaths(); finishPermissions(); finishCommands(); - finishInputPlugins(); + decoder_plugin_deinit_all(); cleanUpPidFile(); finishConf(); |