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

mixer/{oss,alsa}: renamed the mixer source files

Browse Source
This commit is contained in:
Max Kellermann 2009-10-20 21:23:05 +02:00
parent bd28caed3c
commit 097e200a97
7 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -585,7 +585,7 @@ MIXER_SRC = \
if HAVE_ALSA if HAVE_ALSA
OUTPUT_SRC += src/output/alsa_plugin.c OUTPUT_SRC += src/output/alsa_plugin.c
MIXER_SRC += src/mixer/alsa_mixer.c MIXER_SRC += src/mixer/alsa_mixer_plugin.c
endif endif
if HAVE_AO if HAVE_AO
@ -610,7 +610,7 @@ endif
if HAVE_OSS if HAVE_OSS
OUTPUT_SRC += src/output/oss_plugin.c OUTPUT_SRC += src/output/oss_plugin.c
MIXER_SRC += src/mixer/oss_mixer.c MIXER_SRC += src/mixer/oss_mixer_plugin.c
endif endif
if HAVE_OPENAL if HAVE_OPENAL

8
src/mixer/alsa_mixer.c → src/mixer/alsa_mixer_plugin.c
View File

@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "../output_api.h" #include "mixer_api.h"
#include "../mixer_api.h" #include "output_api.h"
#include <glib.h> #include <glib.h>
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
@ -47,7 +47,7 @@ alsa_mixer_init(const struct config_param *param)
{ {
struct alsa_mixer *am = g_new(struct alsa_mixer, 1); struct alsa_mixer *am = g_new(struct alsa_mixer, 1);
mixer_init(&am->base, &alsa_mixer); mixer_init(&am->base, &alsa_mixer_plugin);
am->device = config_get_block_string(param, "mixer_device", am->device = config_get_block_string(param, "mixer_device",
VOLUME_MIXER_ALSA_DEFAULT); VOLUME_MIXER_ALSA_DEFAULT);
@ -211,7 +211,7 @@ alsa_mixer_set_volume(struct mixer *mixer, unsigned volume)
return true; return true;
} }
const struct mixer_plugin alsa_mixer = { const struct mixer_plugin alsa_mixer_plugin = {
.init = alsa_mixer_init, .init = alsa_mixer_init,
.finish = alsa_mixer_finish, .finish = alsa_mixer_finish,
.open = alsa_mixer_open, .open = alsa_mixer_open,

8
src/mixer/oss_mixer.c → src/mixer/oss_mixer_plugin.c
View File

@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "../output_api.h" #include "mixer_api.h"
#include "../mixer_api.h" #include "output_api.h"
#include <glib.h> #include <glib.h>
@ -69,7 +69,7 @@ oss_mixer_init(const struct config_param *param)
{ {
struct oss_mixer *om = g_new(struct oss_mixer, 1); struct oss_mixer *om = g_new(struct oss_mixer, 1);
mixer_init(&om->base, &oss_mixer); mixer_init(&om->base, &oss_mixer_plugin);
om->device = config_get_block_string(param, "mixer_device", om->device = config_get_block_string(param, "mixer_device",
VOLUME_MIXER_OSS_DEFAULT); VOLUME_MIXER_OSS_DEFAULT);
@ -184,7 +184,7 @@ oss_mixer_set_volume(struct mixer *mixer, unsigned volume)
return true; return true;
} }
const struct mixer_plugin oss_mixer = { const struct mixer_plugin oss_mixer_plugin = {
.init = oss_mixer_init, .init = oss_mixer_init,
.finish = oss_mixer_finish, .finish = oss_mixer_finish,
.open = oss_mixer_open, .open = oss_mixer_open,

4
src/mixer_list.h
View File

@ -26,8 +26,8 @@
#define MPD_MIXER_LIST_H #define MPD_MIXER_LIST_H
extern const struct mixer_plugin software_mixer_plugin; extern const struct mixer_plugin software_mixer_plugin;
extern const struct mixer_plugin alsa_mixer; extern const struct mixer_plugin alsa_mixer_plugin;
extern const struct mixer_plugin oss_mixer; extern const struct mixer_plugin oss_mixer_plugin;
extern const struct mixer_plugin pulse_mixer_plugin; extern const struct mixer_plugin pulse_mixer_plugin;
#endif #endif

3
src/output/alsa_plugin.c
View File

@ -544,5 +544,6 @@ const struct audio_output_plugin alsaPlugin = {
.play = alsa_play, .play = alsa_play,
.cancel = alsa_cancel, .cancel = alsa_cancel,
.close = alsa_close, .close = alsa_close,
.mixer_plugin = &alsa_mixer,
.mixer_plugin = &alsa_mixer_plugin,
}; };

3
src/output/oss_plugin.c
View File

@ -601,5 +601,6 @@ const struct audio_output_plugin oss_output_plugin = {
.close = oss_output_close, .close = oss_output_close,
.play = oss_output_play, .play = oss_output_play,
.cancel = oss_output_cancel, .cancel = oss_output_cancel,
.mixer_plugin = &oss_mixer,
.mixer_plugin = &oss_mixer_plugin,
}; };

2
test/read_mixer.c
View File

@ -57,7 +57,7 @@ int main(int argc, G_GNUC_UNUSED char **argv)
g_thread_init(NULL); g_thread_init(NULL);
mixer = mixer_new(&alsa_mixer, NULL); mixer = mixer_new(&alsa_mixer_plugin, NULL);
if (mixer == NULL) { if (mixer == NULL) {
g_printerr("mixer_new() failed\n"); g_printerr("mixer_new() failed\n");
return 2; return 2;