Ticket #80: 0001-RoarAudio-plugin.patch
File 0001-RoarAudio-plugin.patch, 11.7 KB (added by themaister, 13 years ago) |
---|
-
Makefile.am
From f2fe4e971113a378974d75b0a397d9265eb2dd44 Mon Sep 17 00:00:00 2001 From: Themaister <maister@archlinux.us> Date: Tue, 8 Feb 2011 00:00:54 +0100 Subject: [PATCH] RoarAudio plugin. --- Makefile.am | 7 ++ configure.ac | 17 +++++ src/mixer/roar_mixer_plugin.c | 123 +++++++++++++++++++++++++++++++ src/mixer_list.h | 1 + src/output/roar_output_plugin.h | 14 ++++ src/output/roar_plugin.c | 152 +++++++++++++++++++++++++++++++++++++++ src/output_list.c | 4 + 7 files changed, 318 insertions(+), 0 deletions(-) create mode 100644 src/mixer/roar_mixer_plugin.c create mode 100644 src/output/roar_output_plugin.h create mode 100644 src/output/roar_plugin.c diff --git a/Makefile.am b/Makefile.am index d4fec31..7b41d1c 100644
a b mpd_headers = \ 142 142 src/output/httpd_client.h \ 143 143 src/output/httpd_internal.h \ 144 144 src/output/pulse_output_plugin.h \ 145 src/output/roar_output_plugin.h \ 145 146 src/output/winmm_output_plugin.h \ 146 147 src/page.h \ 147 148 src/pcm_buffer.h \ … … OUTPUT_LIBS = \ 673 674 $(LIBWRAP_LDFLAGS) \ 674 675 $(AO_LIBS) \ 675 676 $(ALSA_LIBS) \ 677 $(ROAR_LIBS) \ 676 678 $(FFADO_LIBS) \ 677 679 $(JACK_LIBS) \ 678 680 $(OPENAL_LIBS) \ … … OUTPUT_SRC += src/output/alsa_plugin.c 706 708 MIXER_SRC += src/mixer/alsa_mixer_plugin.c 707 709 endif 708 710 711 if HAVE_ROAR 712 OUTPUT_SRC += src/output/roar_plugin.c 713 MIXER_SRC += src/mixer/roar_mixer_plugin.c 714 endif 715 709 716 if ENABLE_FFADO_OUTPUT 710 717 OUTPUT_SRC += src/output/ffado_output_plugin.c 711 718 endif -
configure.ac
diff --git a/configure.ac b/configure.ac index c65113b..eac6f4d 100644
a b AC_ARG_ENABLE(alsa, 121 121 AS_HELP_STRING([--enable-alsa], [enable ALSA support]),, 122 122 [enable_alsa=auto]) 123 123 124 AC_ARG_ENABLE(roar, 125 AS_HELP_STRING([--enable-roar], 126 [enable support for RoarAudio]),, 127 [enable_roar=auto]) 128 124 129 AC_ARG_ENABLE(ao, 125 130 AS_HELP_STRING([--enable-ao], 126 131 [enable support for libao]),, … … fi 1221 1226 1222 1227 AM_CONDITIONAL(HAVE_ALSA, test x$enable_alsa = xyes) 1223 1228 1229 dnl ----------------------------------- ROAR ---------------------------------- 1230 MPD_AUTO_PKG(roar, ROAR, [libroar >= 0.4.0], 1231 [ROAR output plugin], [libroar not found]) 1232 1233 if test x$enable_roar = xyes; then 1234 AC_DEFINE(HAVE_ROAR, 1, [Define to enable ROAR support]) 1235 fi 1236 1237 AM_CONDITIONAL(HAVE_ROAR, test x$enable_roar = xyes) 1238 1224 1239 dnl ----------------------------------- FFADO --------------------------------- 1225 1240 1226 1241 MPD_AUTO_PKG(ffado, FFADO, [libffado], … … AM_CONDITIONAL(ENABLE_WINMM_OUTPUT, test x$enable_winmm_output = xyes) 1430 1445 dnl --------------------- Post Audio Output Plugins Tests --------------------- 1431 1446 if 1432 1447 test x$enable_alsa = xno && 1448 test x$enable_roar = xno && 1433 1449 test x$enable_ao = xno && 1434 1450 test x$enable_ffado = xno && 1435 1451 test x$enable_fifo = xno && … … results(id3,[ID3]) 1567 1583 1568 1584 printf '\nPlayback support:\n\t' 1569 1585 results(alsa,ALSA) 1586 results(roar,ROAR) 1570 1587 results(ffado,FFADO) 1571 1588 results(fifo,FIFO) 1572 1589 results(recorder_output,[File Recorder]) -
new file src/mixer/roar_mixer_plugin.c
diff --git a/src/mixer/roar_mixer_plugin.c b/src/mixer/roar_mixer_plugin.c new file mode 100644 index 0000000..7e23fd7
- + 1 /* 2 * Copyright (C) 2003-2010 The Music Player Daemon Project 3 * http://www.musicpd.org 4 * 5 * This program is free software; you can redistribute it and/or modify 6 * it under the terms of the GNU General Public License as published by 7 * the Free Software Foundation; either version 2 of the License, or 8 * (at your option) any later version. 9 * 10 * This program is distributed in the hope that it will be useful, 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * GNU General Public License for more details. 14 * 15 * You should have received a copy of the GNU General Public License along 16 * with this program; if not, write to the Free Software Foundation, Inc., 17 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 18 */ 19 20 #include "config.h" 21 #include "mixer_api.h" 22 #include "output_api.h" 23 #include "output/roar_output_plugin.h" 24 25 #include <glib.h> 26 27 #include <assert.h> 28 #include <sys/stat.h> 29 #include <sys/ioctl.h> 30 #include <fcntl.h> 31 #include <errno.h> 32 #include <stdlib.h> 33 #include <unistd.h> 34 35 typedef struct roar_mpd_mixer 36 { 37 /** the base mixer class */ 38 struct mixer base; 39 roar_t *self; 40 } roar_mixer_t; 41 42 /** 43 * The quark used for GError.domain. 44 */ 45 static inline GQuark 46 roar_mixer_quark(void) 47 { 48 return g_quark_from_static_string("roar_mixer"); 49 } 50 51 static struct mixer * 52 roar_mixer_init(void *ao, G_GNUC_UNUSED const struct config_param *param, 53 G_GNUC_UNUSED GError **error_r) 54 { 55 roar_mixer_t *self = g_new(roar_mixer_t, 1); 56 self->self = ao; 57 58 mixer_init(&self->base, &roar_mixer_plugin); 59 60 return &self->base; 61 } 62 63 static void 64 roar_mixer_finish(struct mixer *data) 65 { 66 roar_mixer_t *self = (roar_mixer_t *) data; 67 68 g_free(self); 69 } 70 71 static void 72 roar_mixer_close(G_GNUC_UNUSED struct mixer *data) 73 { 74 } 75 76 static bool 77 roar_mixer_open(G_GNUC_UNUSED struct mixer *data, G_GNUC_UNUSED GError **error_r) 78 { 79 return true; 80 } 81 82 static int 83 roar_mixer_get_volume(struct mixer *mixer, G_GNUC_UNUSED GError **error_r) 84 { 85 roar_mixer_t *self = (roar_mixer_t *)mixer; 86 if (self->self->vss) 87 { 88 float l, r; 89 int error; 90 int rc = roar_vs_volume_get(self->self->vss, &l, &r, &error); 91 return (l + r) * 50; 92 } 93 else 94 return 0; 95 } 96 97 static bool 98 roar_mixer_set_volume(struct mixer *mixer, unsigned volume, G_GNUC_UNUSED GError **error_r) 99 { 100 roar_mixer_t *self = (roar_mixer_t *)mixer; 101 if (self->self->vss) 102 { 103 assert(volume <= 100); 104 105 int error; 106 float level = volume / 100.0; 107 108 int rc = roar_vs_volume_mono(self->self->vss, level, &error); 109 return true; 110 } 111 else 112 return false; 113 } 114 115 const struct mixer_plugin roar_mixer_plugin = { 116 .init = roar_mixer_init, 117 .finish = roar_mixer_finish, 118 .open = roar_mixer_open, 119 .close = roar_mixer_close, 120 .get_volume = roar_mixer_get_volume, 121 .set_volume = roar_mixer_set_volume, 122 .global = true, 123 }; -
src/mixer_list.h
diff --git a/src/mixer_list.h b/src/mixer_list.h index f284c2d..95ded5c 100644
a b 28 28 extern const struct mixer_plugin software_mixer_plugin; 29 29 extern const struct mixer_plugin alsa_mixer_plugin; 30 30 extern const struct mixer_plugin oss_mixer_plugin; 31 extern const struct mixer_plugin roar_mixer_plugin; 31 32 extern const struct mixer_plugin pulse_mixer_plugin; 32 33 extern const struct mixer_plugin raop_mixer_plugin; 33 34 extern const struct mixer_plugin winmm_mixer_plugin; -
new file src/output/roar_output_plugin.h
diff --git a/src/output/roar_output_plugin.h b/src/output/roar_output_plugin.h new file mode 100644 index 0000000..9f4b480
- + 1 #ifndef __ROAR_OUTPUT_H 2 #define __ROAR_OUTPUT_H 3 4 #include <roaraudio.h> 5 6 typedef struct roar 7 { 8 roar_vs_t * vss; 9 int err; 10 char *host; 11 char *name; 12 } roar_t; 13 14 #endif -
new file src/output/roar_plugin.c
diff --git a/src/output/roar_plugin.c b/src/output/roar_plugin.c new file mode 100644 index 0000000..223aca5
- + 1 //roar_plugin.c: 2 /* 3 * Copyright (C) 2003-2010 The Music Player Daemon Project 4 * copyright (c) 2010 Philipp 'ph3-der-loewe' Schafft 5 * copyright (c) 2010 Hans-Kristian 'maister' Arntzen 6 * 7 * This program is free software; you can redistribute it and/or modify 8 * it under the terms of the GNU General Public License as published by 9 * the Free Software Foundation; either version 2 of the License, or 10 * (at your option) any later version. 11 * 12 * This program is distributed in the hope that it will be useful, 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * GNU General Public License for more details. 16 * 17 * You should have received a copy of the GNU General Public License along 18 * with this program; if not, write to the Free Software Foundation, Inc., 19 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 20 */ 21 22 #include "config.h" 23 #include "output_api.h" 24 #include "mixer_list.h" 25 #include "roar_output_plugin.h" 26 27 #include <glib.h> 28 #include <sys/types.h> 29 #include <sys/socket.h> 30 #include <arpa/inet.h> 31 #include <netdb.h> 32 #include <stdint.h> 33 #include <fcntl.h> 34 #include <unistd.h> 35 #include <stdlib.h> 36 #include <string.h> 37 #include <stdint.h> 38 39 40 #undef G_LOG_DOMAIN 41 #define G_LOG_DOMAIN "roaraudio" 42 43 static inline GQuark 44 roar_output_quark(void) 45 { 46 return g_quark_from_static_string("roar_output"); 47 } 48 49 static void 50 roar_configure(struct roar * self, const struct config_param *param) 51 { 52 self->host = config_dup_block_string(param, "server", NULL); 53 self->name = config_dup_block_string(param, "name", "MPD"); 54 } 55 56 static void * 57 roar_init(G_GNUC_UNUSED const struct audio_format *audio_format, 58 const struct config_param *param, 59 G_GNUC_UNUSED GError **error) 60 { 61 roar_t * self = roar_mm_calloc(1, sizeof(*self)); 62 63 if (self == NULL) 64 return NULL; 65 66 self->err = ROAR_ERROR_NONE; 67 roar_configure(self, param); 68 return self; 69 } 70 71 static void 72 roar_close(void *data) 73 { 74 roar_t * self = data; 75 76 if (self->vss != NULL) 77 { 78 roar_vs_close(self->vss, ROAR_VS_FALSE, &(self->err)); 79 self->vss = NULL; 80 } 81 } 82 83 static void 84 roar_finish(void *data) 85 { 86 roar_t * self = data; 87 88 roar_close(data); 89 90 if (self->host != NULL) 91 g_free(self->host); 92 if (self->name != NULL) 93 g_free(self->name); 94 95 roar_mm_free(data); 96 } 97 98 static bool 99 roar_open(void *data, struct audio_format *audio_format, GError **error) 100 { 101 roar_t * self = data; 102 103 self->vss = roar_vs_new_simple(self->host, self->name, audio_format->sample_rate, audio_format->channels, ROAR_CODEC_DEFAULT, 16, ROAR_DIR_PLAY, &(self->err)); 104 105 if (self->vss == NULL || self->err != ROAR_ERROR_NONE) 106 { 107 g_set_error(error, roar_output_quark(), 0, "Failed to connect to server"); 108 return false; 109 } 110 111 audio_format->format = SAMPLE_FORMAT_S16; 112 audio_format->reverse_endian = 0; 113 114 115 return true; 116 } 117 118 // Here we should reopen stream properly. 119 static void 120 roar_cancel(G_GNUC_UNUSED void *data) 121 { 122 } 123 124 static size_t 125 roar_play(void *data, const void *chunk, size_t size, GError **error) 126 { 127 struct roar * self = data; 128 ssize_t rc; 129 130 rc = roar_vs_write(self->vss, chunk, size, &(self->err)); 131 if ( rc <= 0 ) 132 { 133 g_set_error(error, roar_output_quark(), 0, "Failed to play data"); 134 return 0; 135 } 136 137 return rc; 138 } 139 140 const struct audio_output_plugin roar_output_plugin = { 141 .name = "roar", 142 .init = roar_init, 143 .finish = roar_finish, 144 .open = roar_open, 145 .play = roar_play, 146 .cancel = roar_cancel, 147 .close = roar_close, 148 149 .mixer_plugin = &roar_mixer_plugin 150 }; 151 152 -
src/output_list.c
diff --git a/src/output_list.c b/src/output_list.c index 24b089e..7289e09 100644
a b extern const struct audio_output_plugin null_output_plugin; 26 26 extern const struct audio_output_plugin fifo_output_plugin; 27 27 extern const struct audio_output_plugin pipe_output_plugin; 28 28 extern const struct audio_output_plugin alsaPlugin; 29 extern const struct audio_output_plugin roar_output_plugin; 29 30 extern const struct audio_output_plugin ao_output_plugin; 30 31 extern const struct audio_output_plugin oss_output_plugin; 31 32 extern const struct audio_output_plugin openal_output_plugin; … … const struct audio_output_plugin *audio_output_plugins[] = { 54 55 #ifdef HAVE_ALSA 55 56 &alsaPlugin, 56 57 #endif 58 #ifdef HAVE_ROAR 59 &roar_output_plugin, 60 #endif 57 61 #ifdef HAVE_AO 58 62 &ao_output_plugin, 59 63 #endif