From 311e627463a17a499a88b50af2404e955115675b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 10 Oct 2011 08:57:51 +0200 Subject: audio: rename audio.[ch] to audio_config.[ch] --- Makefile.am | 3 +-- src/audio.c | 59 ------------------------------------------------------ src/audio.h | 33 ------------------------------ src/audio_config.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/audio_config.h | 33 ++++++++++++++++++++++++++++++ src/decoder_api.c | 2 +- src/main.c | 2 +- 7 files changed, 95 insertions(+), 96 deletions(-) delete mode 100644 src/audio.c delete mode 100644 src/audio.h create mode 100644 src/audio_config.c create mode 100644 src/audio_config.h diff --git a/Makefile.am b/Makefile.am index 08f5eb472..f56b1f9aa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,7 +41,6 @@ mpd_headers = \ src/notify.h \ src/ack.h \ src/ape.h \ - src/audio.h \ src/audio_format.h \ src/audio_check.h \ src/audio_parser.h \ @@ -231,7 +230,7 @@ src_mpd_SOURCES = \ $(MIXER_API_SRC) \ src/glib_socket.h \ src/notify.c \ - src/audio.c \ + src/audio_config.c src/audio_config.h \ src/audio_check.c \ src/audio_format.c \ src/audio_parser.c \ diff --git a/src/audio.c b/src/audio.c deleted file mode 100644 index 22879fc79..000000000 --- a/src/audio.c +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2003-2011 The Music Player Daemon Project - * 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., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include "config.h" -#include "audio.h" -#include "audio_format.h" -#include "audio_parser.h" -#include "output_internal.h" -#include "output_plugin.h" -#include "output_all.h" -#include "conf.h" -#include "mpd_error.h" - -#include - -#include -#include - -static struct audio_format configured_audio_format; - -void getOutputAudioFormat(const struct audio_format *inAudioFormat, - struct audio_format *outAudioFormat) -{ - *outAudioFormat = *inAudioFormat; - audio_format_mask_apply(outAudioFormat, &configured_audio_format); -} - -void initAudioConfig(void) -{ - const struct config_param *param = config_get_param(CONF_AUDIO_OUTPUT_FORMAT); - GError *error = NULL; - bool ret; - - if (param == NULL) - return; - - ret = audio_format_parse(&configured_audio_format, param->value, - true, &error); - if (!ret) - MPD_ERROR("error parsing \"%s\" at line %i: %s", - CONF_AUDIO_OUTPUT_FORMAT, param->line, - error->message); -} diff --git a/src/audio.h b/src/audio.h deleted file mode 100644 index 61835d4d7..000000000 --- a/src/audio.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2003-2011 The Music Player Daemon Project - * 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., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef MPD_AUDIO_H -#define MPD_AUDIO_H - -#include - -struct audio_format; - -void getOutputAudioFormat(const struct audio_format *inFormat, - struct audio_format *outFormat); - -/* make sure initPlayerData is called before this function!! */ -void initAudioConfig(void); - -#endif diff --git a/src/audio_config.c b/src/audio_config.c new file mode 100644 index 000000000..72869c384 --- /dev/null +++ b/src/audio_config.c @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2003-2011 The Music Player Daemon Project + * 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., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "config.h" +#include "audio_config.h" +#include "audio_format.h" +#include "audio_parser.h" +#include "output_internal.h" +#include "output_plugin.h" +#include "output_all.h" +#include "conf.h" +#include "mpd_error.h" + +#include + +#include +#include + +static struct audio_format configured_audio_format; + +void getOutputAudioFormat(const struct audio_format *inAudioFormat, + struct audio_format *outAudioFormat) +{ + *outAudioFormat = *inAudioFormat; + audio_format_mask_apply(outAudioFormat, &configured_audio_format); +} + +void initAudioConfig(void) +{ + const struct config_param *param = config_get_param(CONF_AUDIO_OUTPUT_FORMAT); + GError *error = NULL; + bool ret; + + if (param == NULL) + return; + + ret = audio_format_parse(&configured_audio_format, param->value, + true, &error); + if (!ret) + MPD_ERROR("error parsing \"%s\" at line %i: %s", + CONF_AUDIO_OUTPUT_FORMAT, param->line, + error->message); +} diff --git a/src/audio_config.h b/src/audio_config.h new file mode 100644 index 000000000..85143247f --- /dev/null +++ b/src/audio_config.h @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2003-2011 The Music Player Daemon Project + * 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., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPD_AUDIO_CONFIG_H +#define MPD_AUDIO_CONFIG_H + +#include + +struct audio_format; + +void getOutputAudioFormat(const struct audio_format *inFormat, + struct audio_format *outFormat); + +/* make sure initPlayerData is called before this function!! */ +void initAudioConfig(void); + +#endif diff --git a/src/decoder_api.c b/src/decoder_api.c index 311f1f31b..203a7cebb 100644 --- a/src/decoder_api.c +++ b/src/decoder_api.c @@ -21,7 +21,7 @@ #include "decoder_api.h" #include "decoder_internal.h" #include "decoder_control.h" -#include "audio.h" +#include "audio_config.h" #include "song.h" #include "buffer.h" #include "pipe.h" diff --git a/src/main.c b/src/main.c index addf439d2..68f19f153 100644 --- a/src/main.c +++ b/src/main.c @@ -39,7 +39,7 @@ #include "player_control.h" #include "stats.h" #include "sig_handlers.h" -#include "audio.h" +#include "audio_config.h" #include "output_all.h" #include "volume.h" #include "log.h" -- cgit v1.2.3