diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | src/mixer_api.h | 42 | ||||
| -rw-r--r-- | src/mixer_plugin.h | 73 |
3 files changed, 75 insertions, 41 deletions
diff --git a/Makefile.am b/Makefile.am index 76b1c5557..bd261e372 100644 --- a/Makefile.am +++ b/Makefile.am @@ -82,6 +82,7 @@ mpd_headers = \ src/mixer_api.h \ src/mixer_control.h \ src/event_pipe.h \ + src/mixer_plugin.h \ src/daemon.h \ src/normalize.h \ src/compress.h \ diff --git a/src/mixer_api.h b/src/mixer_api.h index 959d502c3..22858821c 100644 --- a/src/mixer_api.h +++ b/src/mixer_api.h @@ -20,7 +20,7 @@ #ifndef MPD_MIXER_H #define MPD_MIXER_H -#include <stdbool.h> +#include "mixer_plugin.h" /* * list of currently implemented mixers @@ -30,46 +30,6 @@ extern const struct mixer_plugin alsa_mixer; extern const struct mixer_plugin oss_mixer; extern const struct mixer_plugin pulse_mixer; -struct config_param; - -struct mixer_plugin { - /** - * Alocates and configures a mixer device. - */ - struct mixer *(*init)(const struct config_param *param); - - /** - * Finish and free mixer data - */ - void (*finish)(struct mixer *data); - - /** - * Open mixer device - */ - bool (*open)(struct mixer *data); - - /** - * Close mixer device - */ - void (*close)(struct mixer *data); - - /** - * Reads the current volume. - * - * @return the current volume (0..100 including) or -1 on - * error - */ - int (*get_volume)(struct mixer *mixer); - - /** - * Sets the volume. - * - * @param volume the new volume (0..100 including) - * @return true on success - */ - bool (*set_volume)(struct mixer *mixer, unsigned volume); -}; - struct mixer { const struct mixer_plugin *plugin; }; diff --git a/src/mixer_plugin.h b/src/mixer_plugin.h new file mode 100644 index 000000000..8e9bb5804 --- /dev/null +++ b/src/mixer_plugin.h @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2003-2009 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. + */ + +/** \file + * + * This header declares the mixer_plugin class. It should not be + * included directly; use mixer_api.h instead in mixer + * implementations. + */ + +#ifndef MPD_MIXER_PLUGIN_H +#define MPD_MIXER_PLUGIN_H + +#include <stdbool.h> + +struct config_param; +struct mixer; + +struct mixer_plugin { + /** + * Alocates and configures a mixer device. + */ + struct mixer *(*init)(const struct config_param *param); + + /** + * Finish and free mixer data + */ + void (*finish)(struct mixer *data); + + /** + * Open mixer device + */ + bool (*open)(struct mixer *data); + + /** + * Close mixer device + */ + void (*close)(struct mixer *data); + + /** + * Reads the current volume. + * + * @return the current volume (0..100 including) or -1 on + * error + */ + int (*get_volume)(struct mixer *mixer); + + /** + * Sets the volume. + * + * @param volume the new volume (0..100 including) + * @return true on success + */ + bool (*set_volume)(struct mixer *mixer, unsigned volume); +}; + +#endif |