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

pulse: renamed source files

Browse Source
This commit is contained in:
Max Kellermann 2009-10-20 21:05:11 +02:00
parent bc629c8a3e
commit bc4266bef8
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -622,8 +622,8 @@ OUTPUT_SRC += src/output/osx_plugin.c
endif endif
if HAVE_PULSE if HAVE_PULSE
OUTPUT_SRC += src/output/pulse_plugin.c OUTPUT_SRC += src/output/pulse_output_plugin.c
MIXER_SRC += src/mixer/pulse_mixer.c MIXER_SRC += src/mixer/pulse_mixer_plugin.c
endif endif
if HAVE_SHOUT if HAVE_SHOUT

4
src/mixer/pulse_mixer.c → src/mixer/pulse_mixer_plugin.c
View File

@ -206,7 +206,7 @@ static struct mixer *
pulse_mixer_init(const struct config_param *param) pulse_mixer_init(const struct config_param *param)
{ {
struct pulse_mixer *pm = g_new(struct pulse_mixer,1); struct pulse_mixer *pm = g_new(struct pulse_mixer,1);
mixer_init(&pm->base, &pulse_mixer); mixer_init(&pm->base, &pulse_mixer_plugin);
pm->online = false; pm->online = false;
@ -372,7 +372,7 @@ pulse_mixer_set_volume(struct mixer *mixer, unsigned volume)
return true; return true;
} }
const struct mixer_plugin pulse_mixer = { const struct mixer_plugin pulse_mixer_plugin = {
.init = pulse_mixer_init, .init = pulse_mixer_init,
.finish = pulse_mixer_finish, .finish = pulse_mixer_finish,
.open = pulse_mixer_open, .open = pulse_mixer_open,

2
src/mixer_list.h
View File

@ -28,6 +28,6 @@
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;
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_plugin;
#endif #endif

8
src/output/pulse_plugin.c → src/output/pulse_output_plugin.c
View File

@ -17,7 +17,7 @@
* 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 "output_api.h"
#include "mixer_list.h" #include "mixer_list.h"
#include <glib.h> #include <glib.h>
@ -168,8 +168,9 @@ pulse_play(void *data, const void *chunk, size_t size, GError **error_r)
return size; return size;
} }
const struct audio_output_plugin pulse_plugin = { const struct audio_output_plugin pulse_output_plugin = {
.name = "pulse", .name = "pulse",
.test_default_device = pulse_test_default_device, .test_default_device = pulse_test_default_device,
.init = pulse_init, .init = pulse_init,
.finish = pulse_finish, .finish = pulse_finish,
@ -177,5 +178,6 @@ const struct audio_output_plugin pulse_plugin = {
.play = pulse_play, .play = pulse_play,
.cancel = pulse_cancel, .cancel = pulse_cancel,
.close = pulse_close, .close = pulse_close,
.mixer_plugin = &pulse_mixer,
.mixer_plugin = &pulse_mixer_plugin,
}; };

4
src/output_list.c
View File

@ -31,7 +31,7 @@ extern const struct audio_output_plugin oss_output_plugin;
extern const struct audio_output_plugin openal_output_plugin; extern const struct audio_output_plugin openal_output_plugin;
extern const struct audio_output_plugin osxPlugin; extern const struct audio_output_plugin osxPlugin;
extern const struct audio_output_plugin solaris_output_plugin; extern const struct audio_output_plugin solaris_output_plugin;
extern const struct audio_output_plugin pulse_plugin; extern const struct audio_output_plugin pulse_output_plugin;
extern const struct audio_output_plugin mvp_output_plugin; extern const struct audio_output_plugin mvp_output_plugin;
extern const struct audio_output_plugin jackPlugin; extern const struct audio_output_plugin jackPlugin;
extern const struct audio_output_plugin httpd_output_plugin; extern const struct audio_output_plugin httpd_output_plugin;
@ -67,7 +67,7 @@ const struct audio_output_plugin *audio_output_plugins[] = {
&solaris_output_plugin, &solaris_output_plugin,
#endif #endif
#ifdef HAVE_PULSE #ifdef HAVE_PULSE
&pulse_plugin, &pulse_output_plugin,
#endif #endif
#ifdef HAVE_MVP #ifdef HAVE_MVP
&mvp_output_plugin, &mvp_output_plugin,