oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output: moved code from audioOutput.c to output_control.c

Browse Source 
Similar to decoder_control.c, output_control.c will provide functions
for controlling the output thread (which will be implemented later).
This commit is contained in:
Max Kellermann
2008-09-09 10:02:34 +02:00
parent 755d55075d
commit e2c916e6ca
7 changed files with 281 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile.am
View File

@@ -35,6 +35,7 @@ mpd_headers = \
audioOutput.h \ audioOutput.h \
output_api.h \ output_api.h \
output_list.h \ output_list.h \
output_control.h \
buffer2array.h \ buffer2array.h \
charConv.h \ charConv.h \
command.h \ command.h \
@@ -109,6 +110,8 @@ mpd_SOURCES = \
audio.c \ audio.c \
audioOutput.c \ audioOutput.c \
output_list.c \ output_list.c \
output_control.c \
output_init.c \
buffer2array.c \ buffer2array.c \
charConv.c \ charConv.c \
command.c \ command.c \

2
src/audio.c
View File

@@ -18,8 +18,8 @@
#include "audio.h" #include "audio.h"
#include "audio_format.h" #include "audio_format.h"
#include "audioOutput.h"
#include "output_api.h" #include "output_api.h"
#include "output_control.h"
#include "log.h" #include "log.h"
#include "path.h" #include "path.h"
#include "client.h" #include "client.h"

196
src/audioOutput.c
View File

@@ -20,202 +20,6 @@
#include "output_api.h" #include "output_api.h"
#include "output_list.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) void printAllOutputPluginTypes(FILE * fp)
{ {
unsigned i; unsigned i;

19
src/audioOutput.h
View File

@@ -19,27 +19,8 @@
#ifndef AUDIO_OUTPUT_H #ifndef AUDIO_OUTPUT_H
#define AUDIO_OUTPUT_H #define AUDIO_OUTPUT_H
#include "../config.h"
#include "conf.h"
#include "os_compat.h" #include "os_compat.h"
struct audio_output;
struct audio_output_plugin;
struct audio_format;
struct tag;
int initAudioOutput(struct audio_output *, ConfigParam * param);
int openAudioOutput(struct audio_output *audioOutput,
const struct audio_format *audioFormat);
int playAudioOutput(struct audio_output *audioOutput,
const char *playChunk, size_t size);
void dropBufferedAudioOutput(struct audio_output *audioOutput);
void closeAudioOutput(struct audio_output *audioOutput);
void finishAudioOutput(struct audio_output *audioOutput);
void sendMetadataToAudioOutput(struct audio_output *audioOutput,
const struct tag *tag);
void printAllOutputPluginTypes(FILE * fp); void printAllOutputPluginTypes(FILE * fp);
#endif #endif

123
src/output_control.c Normal file
View File

@@ -0,0 +1,123 @@
/* the Music Player Daemon (MPD)
* Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "output_control.h"
#include "output_api.h"
#include "pcm_utils.h"
#include "utils.h"
#include "audio.h"
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);
}

41
src/output_control.h Normal file
View File

@@ -0,0 +1,41 @@
/* the Music Player Daemon (MPD)
* Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef OUTPUT_CONTROL_H
#define OUTPUT_CONTROL_H
#include "conf.h"
#include "os_compat.h"
struct audio_output;
struct audio_output_plugin;
struct audio_format;
struct tag;
int initAudioOutput(struct audio_output *, ConfigParam * param);
int openAudioOutput(struct audio_output *audioOutput,
const struct audio_format *audioFormat);
int playAudioOutput(struct audio_output *audioOutput,
const char *playChunk, size_t size);
void dropBufferedAudioOutput(struct audio_output *audioOutput);
void closeAudioOutput(struct audio_output *audioOutput);
void finishAudioOutput(struct audio_output *audioOutput);
void sendMetadataToAudioOutput(struct audio_output *audioOutput,
const struct tag *tag);
#endif

113
src/output_init.c Normal file
View File

@@ -0,0 +1,113 @@
/* the Music Player Daemon (MPD)
* Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "output_control.h"
#include "output_api.h"
#include "output_list.h"
#include "log.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;
}