aboutsummaryrefslogtreecommitdiffstats
path: root/src/audioOutput.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-09-09 10:02:34 +0200
committerMax Kellermann <max@duempel.org>2008-09-09 10:02:34 +0200
commite2c916e6ca0e56a3a3a3112a9d5dc3f883e73287 (patch)
tree680950c3bf880148e78e1f04db3469dbc5cd27c5 /src/audioOutput.c
parent755d55075def8f87a56b377dc53b05be24183957 (diff)
downloadmpd-e2c916e6ca0e56a3a3a3112a9d5dc3f883e73287.tar.gz
mpd-e2c916e6ca0e56a3a3a3112a9d5dc3f883e73287.tar.xz
mpd-e2c916e6ca0e56a3a3a3112a9d5dc3f883e73287.zip
output: moved code from audioOutput.c to output_control.c
Similar to decoder_control.c, output_control.c will provide functions for controlling the output thread (which will be implemented later).
Diffstat (limited to 'src/audioOutput.c')
-rw-r--r--src/audioOutput.c196
1 files changed, 0 insertions, 196 deletions
diff --git a/src/audioOutput.c b/src/audioOutput.c
index 6a8162cec..bc619ceb0 100644
--- a/src/audioOutput.c
+++ b/src/audioOutput.c
@@ -20,202 +20,6 @@
#include "output_api.h"
#include "output_list.h"
-#include "log.h"
-#include "pcm_utils.h"
-#include "utils.h"
-#include "os_compat.h"
-#include "audio.h"
-
-#define AUDIO_OUTPUT_TYPE "type"
-#define AUDIO_OUTPUT_NAME "name"
-#define AUDIO_OUTPUT_FORMAT "format"
-
-#define getBlockParam(name, str, force) { \
- bp = getBlockParam(param, name); \
- if(force && bp == NULL) { \
- FATAL("couldn't find parameter \"%s\" in audio output " \
- "definition beginning at %i\n", \
- name, param->line); \
- } \
- if(bp) str = bp->value; \
-}
-
-int initAudioOutput(struct audio_output *ao, ConfigParam * param)
-{
- const char *name = NULL;
- char *format = NULL;
- BlockParam *bp = NULL;
- const struct audio_output_plugin *plugin = NULL;
-
- if (param) {
- const char *type = NULL;
-
- getBlockParam(AUDIO_OUTPUT_NAME, name, 1);
- getBlockParam(AUDIO_OUTPUT_TYPE, type, 1);
- getBlockParam(AUDIO_OUTPUT_FORMAT, format, 0);
-
- plugin = audio_output_plugin_get(type);
- if (plugin == NULL) {
- FATAL("couldn't find audio output plugin for type "
- "\"%s\" at line %i\n", type, param->line);
- }
- } else {
- unsigned i;
-
- WARNING("No \"%s\" defined in config file\n",
- CONF_AUDIO_OUTPUT);
- WARNING("Attempt to detect audio output device\n");
-
- audio_output_plugins_for_each(plugin, i) {
- if (plugin->test_default_device) {
- WARNING("Attempting to detect a %s audio "
- "device\n", plugin->name);
- if (plugin->test_default_device() == 0) {
- WARNING("Successfully detected a %s "
- "audio device\n", plugin->name);
- break;
- }
- }
- }
-
- if (plugin == NULL) {
- WARNING("Unable to detect an audio device\n");
- return 0;
- }
-
- name = "default detected output";
- }
-
- ao->name = name;
- ao->plugin = plugin;
- ao->open = 0;
-
- ao->convertAudioFormat = 0;
- ao->sameInAndOutFormats = 0;
- ao->convBuffer = NULL;
- ao->convBufferLen = 0;
-
- memset(&ao->inAudioFormat, 0, sizeof(ao->inAudioFormat));
- memset(&ao->outAudioFormat, 0, sizeof(ao->outAudioFormat));
- memset(&ao->reqAudioFormat, 0, sizeof(ao->reqAudioFormat));
- memset(&ao->convState, 0, sizeof(ConvState));
-
- if (format) {
- ao->convertAudioFormat = 1;
-
- if (0 != parseAudioConfig(&ao->reqAudioFormat, format)) {
- FATAL("error parsing format at line %i\n", bp->line);
- }
-
- copyAudioFormat(&ao->outAudioFormat, &ao->reqAudioFormat);
- }
-
- if (plugin->init(ao, param) != 0)
- return 0;
-
- return 1;
-}
-
-int openAudioOutput(struct audio_output *audioOutput,
- const struct audio_format *audioFormat)
-{
- int ret = 0;
-
- if (audioOutput->open &&
- 0 == cmpAudioFormat(audioFormat, &audioOutput->inAudioFormat)) {
- return 0;
- }
-
- copyAudioFormat(&audioOutput->inAudioFormat, audioFormat);
-
- if (audioOutput->convertAudioFormat) {
- copyAudioFormat(&audioOutput->outAudioFormat,
- &audioOutput->reqAudioFormat);
- } else {
- copyAudioFormat(&audioOutput->outAudioFormat,
- &audioOutput->inAudioFormat);
- if (audioOutput->open)
- closeAudioOutput(audioOutput);
- }
-
- if (!audioOutput->open)
- ret = audioOutput->plugin->open(audioOutput);
-
- audioOutput->sameInAndOutFormats =
- !cmpAudioFormat(&audioOutput->inAudioFormat,
- &audioOutput->outAudioFormat);
-
- return ret;
-}
-
-static void convertAudioFormat(struct audio_output *audioOutput,
- const char **chunkArgPtr, size_t *sizeArgPtr)
-{
- size_t size = pcm_sizeOfConvBuffer(&(audioOutput->inAudioFormat),
- *sizeArgPtr,
- &(audioOutput->outAudioFormat));
-
- if (size > audioOutput->convBufferLen) {
- if (audioOutput->convBuffer != NULL)
- free(audioOutput->convBuffer);
- audioOutput->convBuffer = xmalloc(size);
- audioOutput->convBufferLen = size;
- }
-
- *sizeArgPtr = pcm_convertAudioFormat(&(audioOutput->inAudioFormat),
- *chunkArgPtr, *sizeArgPtr,
- &(audioOutput->outAudioFormat),
- audioOutput->convBuffer,
- &audioOutput->convState);
-
- *chunkArgPtr = audioOutput->convBuffer;
-}
-
-int playAudioOutput(struct audio_output *audioOutput,
- const char *playChunk, size_t size)
-{
- int ret;
-
- if (!audioOutput->open)
- return -1;
-
- if (!audioOutput->sameInAndOutFormats) {
- convertAudioFormat(audioOutput, &playChunk, &size);
- }
-
- ret = audioOutput->plugin->play(audioOutput, playChunk, size);
-
- return ret;
-}
-
-void dropBufferedAudioOutput(struct audio_output *audioOutput)
-{
- if (audioOutput->open)
- audioOutput->plugin->cancel(audioOutput);
-}
-
-void closeAudioOutput(struct audio_output *audioOutput)
-{
- if (audioOutput->open)
- audioOutput->plugin->close(audioOutput);
-}
-
-void finishAudioOutput(struct audio_output *audioOutput)
-{
- closeAudioOutput(audioOutput);
- if (audioOutput->plugin->finish)
- audioOutput->plugin->finish(audioOutput);
- if (audioOutput->convBuffer)
- free(audioOutput->convBuffer);
-}
-
-void sendMetadataToAudioOutput(struct audio_output *audioOutput,
- const struct tag *tag)
-{
- if (audioOutput->plugin->send_tag)
- audioOutput->plugin->send_tag(audioOutput, tag);
-}
-
void printAllOutputPluginTypes(FILE * fp)
{
unsigned i;