Ticket #80: 0001-RoarAudio-plugin.6.patch
File 0001-RoarAudio-plugin.6.patch, 14.9 KB (added by themaister, 13 years ago) |
---|
-
Makefile.am
From 6e190581e5b816c2d9ac3a8d9f3194c166fa09b6 Mon Sep 17 00:00:00 2001 From: Themaister <maister@archlinux.us> Date: Tue, 8 Feb 2011 00:17:58 +0100 Subject: [PATCH] RoarAudio plugin --- Makefile.am | 7 + configure.ac | 17 +++ src/mixer/roar_mixer_plugin.c | 125 ++++++++++++++++++ src/mixer_list.h | 1 + src/output/roar_output_plugin.h | 37 ++++++ src/output/roar_plugin.c | 264 +++++++++++++++++++++++++++++++++++++++ src/output_list.c | 4 + 7 files changed, 455 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 89b5ce3..0d07555 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]) 1566 1582 1567 1583 printf '\nPlayback support:\n\t' 1568 1584 results(alsa,ALSA) 1585 results(roar,ROAR) 1569 1586 results(ffado,FFADO) 1570 1587 results(fifo,FIFO) 1571 1588 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..b0b122f
- + 1 /* 2 * Copyright (C) 2003-2010 The Music Player Daemon Project 3 * Copyright (C) 2010-2011 Philipp 'ph3-der-loewe' Schafft 4 * Copyright (C) 2010-2011 Hans-Kristian 'maister' Arntzen 5 * 6 * This program is free software; you can redistribute it and/or modify 7 * it under the terms of the GNU General Public License as published by 8 * the Free Software Foundation; either version 2 of the License, or 9 * (at your option) any later version. 10 * 11 * This program is distributed in the hope that it will be useful, 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * GNU General Public License for more details. 15 * 16 * You should have received a copy of the GNU General Public License along 17 * with this program; if not, write to the Free Software Foundation, Inc., 18 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 19 */ 20 21 22 #include "config.h" 23 #include "mixer_api.h" 24 #include "output_api.h" 25 #include "output/roar_output_plugin.h" 26 27 #include <glib.h> 28 29 #include <assert.h> 30 #include <sys/stat.h> 31 #include <sys/ioctl.h> 32 #include <fcntl.h> 33 #include <errno.h> 34 #include <stdlib.h> 35 #include <unistd.h> 36 37 typedef struct roar_mpd_mixer 38 { 39 /** the base mixer class */ 40 struct mixer base; 41 roar_t *self; 42 } roar_mixer_t; 43 44 /** 45 * The quark used for GError.domain. 46 */ 47 static inline GQuark 48 roar_mixer_quark(void) 49 { 50 return g_quark_from_static_string("roar_mixer"); 51 } 52 53 static struct mixer * 54 roar_mixer_init(void *ao, G_GNUC_UNUSED const struct config_param *param, 55 G_GNUC_UNUSED GError **error_r) 56 { 57 roar_mixer_t *self = g_new(roar_mixer_t, 1); 58 self->self = ao; 59 60 mixer_init(&self->base, &roar_mixer_plugin); 61 62 return &self->base; 63 } 64 65 static void 66 roar_mixer_finish(struct mixer *data) 67 { 68 roar_mixer_t *self = (roar_mixer_t *) data; 69 70 g_free(self); 71 } 72 73 static void 74 roar_mixer_close(G_GNUC_UNUSED struct mixer *data) 75 { 76 } 77 78 static bool 79 roar_mixer_open(G_GNUC_UNUSED struct mixer *data, G_GNUC_UNUSED GError **error_r) 80 { 81 return true; 82 } 83 84 static int 85 roar_mixer_get_volume(struct mixer *mixer, G_GNUC_UNUSED GError **error_r) 86 { 87 roar_mixer_t *self = (roar_mixer_t *)mixer; 88 if (self->self->vss) 89 { 90 float l, r; 91 int error; 92 roar_vs_volume_get(self->self->vss, &l, &r, &error); 93 return (l + r) * 50; 94 } 95 else 96 return 0; 97 } 98 99 static bool 100 roar_mixer_set_volume(struct mixer *mixer, unsigned volume, G_GNUC_UNUSED GError **error_r) 101 { 102 roar_mixer_t *self = (roar_mixer_t *)mixer; 103 if (self->self->vss) 104 { 105 assert(volume <= 100); 106 107 int error; 108 float level = volume / 100.0; 109 110 roar_vs_volume_mono(self->self->vss, level, &error); 111 return true; 112 } 113 else 114 return false; 115 } 116 117 const struct mixer_plugin roar_mixer_plugin = { 118 .init = roar_mixer_init, 119 .finish = roar_mixer_finish, 120 .open = roar_mixer_open, 121 .close = roar_mixer_close, 122 .get_volume = roar_mixer_get_volume, 123 .set_volume = roar_mixer_set_volume, 124 .global = true, 125 }; -
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..acd36ea
- + 1 /* 2 * Copyright (C) 2003-2010 The Music Player Daemon Project 3 * Copyright (C) 2010-2011 Philipp 'ph3-der-loewe' Schafft 4 * Copyright (C) 2010-2011 Hans-Kristian 'maister' Arntzen 5 * 6 * This program is free software; you can redistribute it and/or modify 7 * it under the terms of the GNU General Public License as published by 8 * the Free Software Foundation; either version 2 of the License, or 9 * (at your option) any later version. 10 * 11 * This program is distributed in the hope that it will be useful, 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * GNU General Public License for more details. 15 * 16 * You should have received a copy of the GNU General Public License along 17 * with this program; if not, write to the Free Software Foundation, Inc., 18 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 19 */ 20 21 22 #ifndef __ROAR_OUTPUT_H 23 #define __ROAR_OUTPUT_H 24 25 #include <roaraudio.h> 26 27 typedef struct roar 28 { 29 roar_vs_t * vss; 30 int err; 31 char *host; 32 char *name; 33 struct roar_connection con; 34 struct roar_audio_info info; 35 } roar_t; 36 37 #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..e1176cf
- + 1 /* 2 * Copyright (C) 2003-2010 The Music Player Daemon Project 3 * Copyright (C) 2010-2011 Philipp 'ph3-der-loewe' Schafft 4 * Copyright (C) 2010-2011 Hans-Kristian 'maister' Arntzen 5 * 6 * This program is free software; you can redistribute it and/or modify 7 * it under the terms of the GNU General Public License as published by 8 * the Free Software Foundation; either version 2 of the License, or 9 * (at your option) any later version. 10 * 11 * This program is distributed in the hope that it will be useful, 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * GNU General Public License for more details. 15 * 16 * You should have received a copy of the GNU General Public License along 17 * with this program; if not, write to the Free Software Foundation, Inc., 18 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 19 */ 20 21 #include "config.h" 22 #include "output_api.h" 23 #include "mixer_list.h" 24 #include "roar_output_plugin.h" 25 26 #include <glib.h> 27 #include <sys/types.h> 28 #include <sys/socket.h> 29 #include <arpa/inet.h> 30 #include <netdb.h> 31 #include <stdint.h> 32 #include <fcntl.h> 33 #include <unistd.h> 34 #include <stdlib.h> 35 #include <string.h> 36 #include <stdint.h> 37 38 39 #undef G_LOG_DOMAIN 40 #define G_LOG_DOMAIN "roaraudio" 41 42 static inline GQuark 43 roar_output_quark(void) 44 { 45 return g_quark_from_static_string("roar_output"); 46 } 47 48 static void 49 roar_configure(struct roar * self, const struct config_param *param) 50 { 51 self->host = config_dup_block_string(param, "server", NULL); 52 self->name = config_dup_block_string(param, "name", "MPD"); 53 } 54 55 static void * 56 roar_init(G_GNUC_UNUSED const struct audio_format *audio_format, 57 const struct config_param *param, 58 G_GNUC_UNUSED GError **error) 59 { 60 roar_t * self = roar_mm_calloc(1, sizeof(*self)); 61 62 if (self == NULL) 63 return NULL; 64 65 self->err = ROAR_ERROR_NONE; 66 roar_configure(self, param); 67 return self; 68 } 69 70 static void 71 roar_close(void *data) 72 { 73 roar_t * self = data; 74 75 if (self->vss != NULL) 76 roar_vs_close(self->vss, ROAR_VS_TRUE, &(self->err)); 77 self->vss = NULL; 78 roar_disconnect(&(self->con)); 79 } 80 81 static void 82 roar_finish(void *data) 83 { 84 roar_t * self = data; 85 86 roar_close(data); 87 88 if (self->host != NULL) 89 g_free(self->host); 90 if (self->name != NULL) 91 g_free(self->name); 92 93 roar_mm_free(data); 94 } 95 96 static bool 97 roar_open(void *data, struct audio_format *audio_format, GError **error) 98 { 99 roar_t * self = data; 100 101 if (roar_simple_connect(&(self->con), self->host, self->name) < 0) 102 { 103 g_set_error(error, roar_output_quark(), 0, "Failed to connect to Roar server"); 104 return false; 105 } 106 107 self->vss = roar_vs_new_from_con(&(self->con), &(self->err)); 108 109 if (self->vss == NULL || self->err != ROAR_ERROR_NONE) 110 { 111 g_set_error(error, roar_output_quark(), 0, "Failed to connect to server"); 112 return false; 113 } 114 115 116 self->info.rate = audio_format->sample_rate; 117 self->info.channels = audio_format->channels; 118 self->info.codec = ROAR_CODEC_PCM_S; 119 120 switch (audio_format->format) 121 { 122 case SAMPLE_FORMAT_S8: 123 self->info.bits = 8; 124 break; 125 case SAMPLE_FORMAT_S16: 126 self->info.bits = 16; 127 break; 128 case SAMPLE_FORMAT_S24: 129 self->info.bits = 24; 130 break; 131 case SAMPLE_FORMAT_S24_P32: 132 self->info.bits = 32; 133 audio_format->format = SAMPLE_FORMAT_S32; 134 break; 135 case SAMPLE_FORMAT_S32: 136 self->info.bits = 32; 137 break; 138 default: 139 self->info.bits = 16; 140 audio_format->format = SAMPLE_FORMAT_S16; 141 } 142 audio_format->reverse_endian = 0; 143 144 if (roar_vs_stream(self->vss, &(self->info), ROAR_DIR_PLAY, &(self->err)) < 0) 145 { 146 g_set_error(error, roar_output_quark(), 0, "Failed to start stream"); 147 return false; 148 } 149 roar_vs_role(self->vss, ROAR_ROLE_MUSIC, &(self->err)); 150 151 return true; 152 } 153 154 static void 155 roar_cancel(void *data) 156 { 157 roar_t * self = data; 158 159 if (self->vss != NULL) 160 { 161 roar_vs_close(self->vss, ROAR_VS_TRUE, &(self->err)); 162 163 self->vss = roar_vs_new_from_con(&(self->con), &(self->err)); 164 if (self->vss) 165 { 166 roar_vs_stream(self->vss, &(self->info), ROAR_DIR_PLAY, &(self->err)); 167 roar_vs_role(self->vss, ROAR_ROLE_MUSIC, &(self->err)); 168 } 169 } 170 } 171 172 static size_t 173 roar_play(void *data, const void *chunk, size_t size, GError **error) 174 { 175 struct roar * self = data; 176 ssize_t rc; 177 178 if (self->vss == NULL) 179 { 180 g_set_error(error, roar_output_quark(), 0, "Connection is invalid"); 181 return 0; 182 } 183 184 rc = roar_vs_write(self->vss, chunk, size, &(self->err)); 185 if ( rc <= 0 ) 186 { 187 g_set_error(error, roar_output_quark(), 0, "Failed to play data"); 188 return 0; 189 } 190 191 return rc; 192 } 193 194 static const char* 195 roar_tag_convert(enum tag_type type) 196 { 197 switch (type) 198 { 199 case TAG_ARTIST: 200 case TAG_ALBUM_ARTIST: 201 return "AUTHOR"; 202 case TAG_ALBUM: 203 return "ALBUM"; 204 case TAG_TITLE: 205 return "TITLE"; 206 case TAG_TRACK: 207 return "TRACK"; 208 case TAG_NAME: 209 return "NAME"; 210 case TAG_GENRE: 211 return "GENRE"; 212 case TAG_DATE: 213 return "DATE"; 214 case TAG_PERFORMER: 215 return "PERFORMER"; 216 217 default: 218 return NULL; 219 } 220 } 221 222 static void 223 roar_send_tag(void *data, const struct tag *meta) 224 { 225 struct roar * self = data; 226 if (self->vss == NULL) 227 return; 228 229 size_t cnt = 1; 230 struct roar_keyval vals[32]; 231 232 char timebuf[16]; 233 snprintf(timebuf, sizeof(timebuf), "%02d:%02d:%02d", meta->time / 3600, (meta->time % 3600) / 60, meta->time % 60); 234 vals[0].key = "LENGTH"; 235 vals[0].value = timebuf; 236 237 for (unsigned i = 0; i < meta->num_items && cnt < 32; i++) 238 { 239 const char *key = roar_tag_convert(meta->items[i]->type); 240 if (key != NULL) 241 { 242 vals[cnt].key = key; 243 vals[cnt].value = meta->items[i]->value; 244 cnt++; 245 } 246 } 247 248 roar_vs_meta(self->vss, vals, cnt, &(self->err)); 249 } 250 251 const struct audio_output_plugin roar_output_plugin = { 252 .name = "roar", 253 .init = roar_init, 254 .finish = roar_finish, 255 .open = roar_open, 256 .play = roar_play, 257 .cancel = roar_cancel, 258 .close = roar_close, 259 .send_tag = roar_send_tag, 260 261 .mixer_plugin = &roar_mixer_plugin 262 }; 263 264 -
src/output_list.c
diff --git a/src/output_list.c b/src/output_list.c index 24b089e..75d24d6 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