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

mixer_api: moved struct mixer_plugin to mixer_plugin.h

Browse Source
This commit is contained in:
Max Kellermann 2009-03-14 11:33:51 +01:00
parent f15d879e37
commit e7c3f469c3
3 changed files with 75 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -82,6 +82,7 @@ mpd_headers = \
src/mixer_api.h \ src/mixer_api.h \
src/mixer_control.h \ src/mixer_control.h \
src/event_pipe.h \ src/event_pipe.h \
src/mixer_plugin.h \
src/daemon.h \ src/daemon.h \
src/normalize.h \ src/normalize.h \
src/compress.h \ src/compress.h \

42
src/mixer_api.h
View File

@ -20,7 +20,7 @@
#ifndef MPD_MIXER_H #ifndef MPD_MIXER_H
#define MPD_MIXER_H #define MPD_MIXER_H
#include <stdbool.h> #include "mixer_plugin.h"
/* /*
* list of currently implemented mixers * 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 oss_mixer;
extern const struct mixer_plugin pulse_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 { struct mixer {
const struct mixer_plugin *plugin; const struct mixer_plugin *plugin;
}; };

73
src/mixer_plugin.h Normal file
View File

@ -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