2009-03-13 18:43:16 +01:00
|
|
|
/*
|
2011-01-29 10:13:54 +01:00
|
|
|
* Copyright (C) 2003-2011 The Music Player Daemon Project
|
2009-03-13 18:43:16 +01:00
|
|
|
* http://www.musicpd.org
|
2004-10-20 19:49:21 +02:00
|
|
|
*
|
|
|
|
* 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.
|
2009-03-13 18:43:16 +01:00
|
|
|
*
|
|
|
|
* 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.
|
2004-10-20 19:49:21 +02:00
|
|
|
*/
|
|
|
|
|
2009-11-12 09:12:38 +01:00
|
|
|
#include "config.h"
|
2011-09-17 08:54:28 +02:00
|
|
|
#include "shout_output_plugin.h"
|
2009-02-22 17:52:37 +01:00
|
|
|
#include "output_api.h"
|
2009-02-22 17:18:28 +01:00
|
|
|
#include "encoder_plugin.h"
|
|
|
|
#include "encoder_list.h"
|
2010-09-25 15:00:43 +02:00
|
|
|
#include "mpd_error.h"
|
2004-10-21 01:08:40 +02:00
|
|
|
|
2009-02-22 17:52:37 +01:00
|
|
|
#include <shout/shout.h>
|
|
|
|
#include <glib.h>
|
|
|
|
|
2008-10-08 10:49:29 +02:00
|
|
|
#include <assert.h>
|
2008-11-25 17:25:41 +01:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdio.h>
|
2008-10-08 10:49:29 +02:00
|
|
|
|
2009-02-22 17:52:37 +01:00
|
|
|
#undef G_LOG_DOMAIN
|
|
|
|
#define G_LOG_DOMAIN "shout"
|
|
|
|
|
2007-06-12 20:28:57 +02:00
|
|
|
#define DEFAULT_CONN_TIMEOUT 2
|
2004-11-02 14:26:50 +01:00
|
|
|
|
2009-02-22 17:52:37 +01:00
|
|
|
struct shout_buffer {
|
|
|
|
unsigned char data[32768];
|
|
|
|
size_t len;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct shout_data {
|
|
|
|
shout_t *shout_conn;
|
|
|
|
shout_metadata_t *shout_meta;
|
|
|
|
|
|
|
|
struct encoder *encoder;
|
|
|
|
|
|
|
|
float quality;
|
|
|
|
int bitrate;
|
|
|
|
|
|
|
|
int timeout;
|
|
|
|
|
|
|
|
struct shout_buffer buf;
|
|
|
|
};
|
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
static int shout_init_count;
|
shout: introduce pluggable encoder API
I've perhaps gone a bit overboard, but here's the current rundown:
Both Ogg and MP3 use the "shout" audio output plugin. The shout audio
output plugin itself has two new plugins, one for the Ogg encoder,
and another for the MP3 (LAME) encoder.
Configuration for an Ogg stream doesn't change. For an MP3 stream,
configuration is the same as Ogg, with two exceptions. First, you must
specify the optional "encoding" parameter, which should be set to "mp3".
See mpd.conf(5) for more details. Second, the "quality" parameter is
reversed for LAME, such that 1 is high quality for LAME, whereas 10 is
high quality for Ogg.
I've decomposed the code so that all libshout related operations
are done in audioOutput_shout.c, all Ogg specific functions are in
audioOutput_shout_ogg.c, and of course then all LAME specific functions
are handled in audioOutput_shout_mp3.c.
To develop encoder plugins for the shout audio output plugin, I basically
just mimicked the plugin system used for audio outputs. This might be
overkill, but hopefully if anyone ever wants to support some other sort
of stream, like maybe AAC, FLAC, or WMA (hey it could happen), they will
hopefully be all set.
The Ogg encoder is slightly less optimal under this configuration.
It used to send shout data directly out of its ogg_page structures. Now,
in the interest of encapsulation, it copies the data from its ogg_page
structures into a buffer provided by the shout audio output plugin (see
audioOutput_shout_ogg.c, line 77.) I suspect the performance impact
is negligible.
As for metadata, I'm pretty sure they'll both work. I wrote up a test
scaffold that would create a fake tag, and tell the plugin to send it
out to the stream every few seconds. It seemed to work fine. Of course,
if something does break, I'll be glad to fix it.
Lastly, I've renamed lots of things into snake_case, in keeping with
normalperson's wishes in that regard.
[mk: moved the MP3 patch after this one. Splitted this patch into
several parts; the others were already applied before this one. Fixed
a bunch GCC warnings and wrong whitespace modifications. Made it
compile with mpd-mk by adapting to its prototypes]
2008-09-12 16:04:40 +02:00
|
|
|
|
2009-02-26 22:04:59 +01:00
|
|
|
/**
|
|
|
|
* The quark used for GError.domain.
|
|
|
|
*/
|
|
|
|
static inline GQuark
|
|
|
|
shout_output_quark(void)
|
|
|
|
{
|
|
|
|
return g_quark_from_static_string("shout_output");
|
|
|
|
}
|
|
|
|
|
2009-02-22 17:18:28 +01:00
|
|
|
static const struct encoder_plugin *
|
2008-09-12 16:39:51 +02:00
|
|
|
shout_encoder_plugin_get(const char *name)
|
shout: introduce pluggable encoder API
I've perhaps gone a bit overboard, but here's the current rundown:
Both Ogg and MP3 use the "shout" audio output plugin. The shout audio
output plugin itself has two new plugins, one for the Ogg encoder,
and another for the MP3 (LAME) encoder.
Configuration for an Ogg stream doesn't change. For an MP3 stream,
configuration is the same as Ogg, with two exceptions. First, you must
specify the optional "encoding" parameter, which should be set to "mp3".
See mpd.conf(5) for more details. Second, the "quality" parameter is
reversed for LAME, such that 1 is high quality for LAME, whereas 10 is
high quality for Ogg.
I've decomposed the code so that all libshout related operations
are done in audioOutput_shout.c, all Ogg specific functions are in
audioOutput_shout_ogg.c, and of course then all LAME specific functions
are handled in audioOutput_shout_mp3.c.
To develop encoder plugins for the shout audio output plugin, I basically
just mimicked the plugin system used for audio outputs. This might be
overkill, but hopefully if anyone ever wants to support some other sort
of stream, like maybe AAC, FLAC, or WMA (hey it could happen), they will
hopefully be all set.
The Ogg encoder is slightly less optimal under this configuration.
It used to send shout data directly out of its ogg_page structures. Now,
in the interest of encapsulation, it copies the data from its ogg_page
structures into a buffer provided by the shout audio output plugin (see
audioOutput_shout_ogg.c, line 77.) I suspect the performance impact
is negligible.
As for metadata, I'm pretty sure they'll both work. I wrote up a test
scaffold that would create a fake tag, and tell the plugin to send it
out to the stream every few seconds. It seemed to work fine. Of course,
if something does break, I'll be glad to fix it.
Lastly, I've renamed lots of things into snake_case, in keeping with
normalperson's wishes in that regard.
[mk: moved the MP3 patch after this one. Splitted this patch into
several parts; the others were already applied before this one. Fixed
a bunch GCC warnings and wrong whitespace modifications. Made it
compile with mpd-mk by adapting to its prototypes]
2008-09-12 16:04:40 +02:00
|
|
|
{
|
2009-02-22 17:18:28 +01:00
|
|
|
if (strcmp(name, "ogg") == 0)
|
|
|
|
name = "vorbis";
|
|
|
|
else if (strcmp(name, "mp3") == 0)
|
|
|
|
name = "lame";
|
shout: introduce pluggable encoder API
I've perhaps gone a bit overboard, but here's the current rundown:
Both Ogg and MP3 use the "shout" audio output plugin. The shout audio
output plugin itself has two new plugins, one for the Ogg encoder,
and another for the MP3 (LAME) encoder.
Configuration for an Ogg stream doesn't change. For an MP3 stream,
configuration is the same as Ogg, with two exceptions. First, you must
specify the optional "encoding" parameter, which should be set to "mp3".
See mpd.conf(5) for more details. Second, the "quality" parameter is
reversed for LAME, such that 1 is high quality for LAME, whereas 10 is
high quality for Ogg.
I've decomposed the code so that all libshout related operations
are done in audioOutput_shout.c, all Ogg specific functions are in
audioOutput_shout_ogg.c, and of course then all LAME specific functions
are handled in audioOutput_shout_mp3.c.
To develop encoder plugins for the shout audio output plugin, I basically
just mimicked the plugin system used for audio outputs. This might be
overkill, but hopefully if anyone ever wants to support some other sort
of stream, like maybe AAC, FLAC, or WMA (hey it could happen), they will
hopefully be all set.
The Ogg encoder is slightly less optimal under this configuration.
It used to send shout data directly out of its ogg_page structures. Now,
in the interest of encapsulation, it copies the data from its ogg_page
structures into a buffer provided by the shout audio output plugin (see
audioOutput_shout_ogg.c, line 77.) I suspect the performance impact
is negligible.
As for metadata, I'm pretty sure they'll both work. I wrote up a test
scaffold that would create a fake tag, and tell the plugin to send it
out to the stream every few seconds. It seemed to work fine. Of course,
if something does break, I'll be glad to fix it.
Lastly, I've renamed lots of things into snake_case, in keeping with
normalperson's wishes in that regard.
[mk: moved the MP3 patch after this one. Splitted this patch into
several parts; the others were already applied before this one. Fixed
a bunch GCC warnings and wrong whitespace modifications. Made it
compile with mpd-mk by adapting to its prototypes]
2008-09-12 16:04:40 +02:00
|
|
|
|
2009-02-22 17:18:28 +01:00
|
|
|
return encoder_plugin_get(name);
|
shout: introduce pluggable encoder API
I've perhaps gone a bit overboard, but here's the current rundown:
Both Ogg and MP3 use the "shout" audio output plugin. The shout audio
output plugin itself has two new plugins, one for the Ogg encoder,
and another for the MP3 (LAME) encoder.
Configuration for an Ogg stream doesn't change. For an MP3 stream,
configuration is the same as Ogg, with two exceptions. First, you must
specify the optional "encoding" parameter, which should be set to "mp3".
See mpd.conf(5) for more details. Second, the "quality" parameter is
reversed for LAME, such that 1 is high quality for LAME, whereas 10 is
high quality for Ogg.
I've decomposed the code so that all libshout related operations
are done in audioOutput_shout.c, all Ogg specific functions are in
audioOutput_shout_ogg.c, and of course then all LAME specific functions
are handled in audioOutput_shout_mp3.c.
To develop encoder plugins for the shout audio output plugin, I basically
just mimicked the plugin system used for audio outputs. This might be
overkill, but hopefully if anyone ever wants to support some other sort
of stream, like maybe AAC, FLAC, or WMA (hey it could happen), they will
hopefully be all set.
The Ogg encoder is slightly less optimal under this configuration.
It used to send shout data directly out of its ogg_page structures. Now,
in the interest of encapsulation, it copies the data from its ogg_page
structures into a buffer provided by the shout audio output plugin (see
audioOutput_shout_ogg.c, line 77.) I suspect the performance impact
is negligible.
As for metadata, I'm pretty sure they'll both work. I wrote up a test
scaffold that would create a fake tag, and tell the plugin to send it
out to the stream every few seconds. It seemed to work fine. Of course,
if something does break, I'll be glad to fix it.
Lastly, I've renamed lots of things into snake_case, in keeping with
normalperson's wishes in that regard.
[mk: moved the MP3 patch after this one. Splitted this patch into
several parts; the others were already applied before this one. Fixed
a bunch GCC warnings and wrong whitespace modifications. Made it
compile with mpd-mk by adapting to its prototypes]
2008-09-12 16:04:40 +02:00
|
|
|
}
|
2004-10-20 22:41:21 +02:00
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
static struct shout_data *new_shout_data(void)
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
2008-11-25 17:25:41 +01:00
|
|
|
struct shout_data *ret = g_new(struct shout_data, 1);
|
2004-10-20 19:49:21 +02:00
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
ret->shout_conn = shout_new();
|
2008-09-12 16:00:01 +02:00
|
|
|
ret->shout_meta = shout_metadata_new();
|
2004-10-29 15:33:51 +02:00
|
|
|
ret->bitrate = -1;
|
2006-10-10 22:00:33 +02:00
|
|
|
ret->quality = -2.0;
|
2007-06-12 20:28:57 +02:00
|
|
|
ret->timeout = DEFAULT_CONN_TIMEOUT;
|
2004-10-20 22:41:21 +02:00
|
|
|
|
2004-10-20 19:49:21 +02:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
static void free_shout_data(struct shout_data *sd)
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
2008-09-12 16:00:01 +02:00
|
|
|
if (sd->shout_meta)
|
|
|
|
shout_metadata_free(sd->shout_meta);
|
2008-09-12 14:01:45 +02:00
|
|
|
if (sd->shout_conn)
|
|
|
|
shout_free(sd->shout_conn);
|
2004-10-20 22:41:21 +02:00
|
|
|
|
2009-01-25 18:47:21 +01:00
|
|
|
g_free(sd);
|
2004-10-20 19:49:21 +02:00
|
|
|
}
|
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
#define check_block_param(name) { \
|
2009-06-03 06:55:04 +02:00
|
|
|
block_param = config_get_block_param(param, name); \
|
2008-09-12 14:01:45 +02:00
|
|
|
if (!block_param) { \
|
2010-09-25 15:00:43 +02:00
|
|
|
MPD_ERROR("no \"%s\" defined for shout device defined at line " \
|
|
|
|
"%i\n", name, param->line); \
|
2008-09-12 14:01:45 +02:00
|
|
|
} \
|
|
|
|
}
|
2004-10-28 07:14:55 +02:00
|
|
|
|
2009-02-25 18:34:02 +01:00
|
|
|
static void *
|
|
|
|
my_shout_init_driver(const struct audio_format *audio_format,
|
2009-02-26 22:04:59 +01:00
|
|
|
const struct config_param *param,
|
|
|
|
GError **error)
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
2008-09-12 14:01:45 +02:00
|
|
|
struct shout_data *sd;
|
2006-07-20 18:02:40 +02:00
|
|
|
char *test;
|
2009-02-26 19:34:00 +01:00
|
|
|
unsigned port;
|
2006-07-20 18:02:40 +02:00
|
|
|
char *host;
|
|
|
|
char *mount;
|
|
|
|
char *passwd;
|
shout: introduce pluggable encoder API
I've perhaps gone a bit overboard, but here's the current rundown:
Both Ogg and MP3 use the "shout" audio output plugin. The shout audio
output plugin itself has two new plugins, one for the Ogg encoder,
and another for the MP3 (LAME) encoder.
Configuration for an Ogg stream doesn't change. For an MP3 stream,
configuration is the same as Ogg, with two exceptions. First, you must
specify the optional "encoding" parameter, which should be set to "mp3".
See mpd.conf(5) for more details. Second, the "quality" parameter is
reversed for LAME, such that 1 is high quality for LAME, whereas 10 is
high quality for Ogg.
I've decomposed the code so that all libshout related operations
are done in audioOutput_shout.c, all Ogg specific functions are in
audioOutput_shout_ogg.c, and of course then all LAME specific functions
are handled in audioOutput_shout_mp3.c.
To develop encoder plugins for the shout audio output plugin, I basically
just mimicked the plugin system used for audio outputs. This might be
overkill, but hopefully if anyone ever wants to support some other sort
of stream, like maybe AAC, FLAC, or WMA (hey it could happen), they will
hopefully be all set.
The Ogg encoder is slightly less optimal under this configuration.
It used to send shout data directly out of its ogg_page structures. Now,
in the interest of encapsulation, it copies the data from its ogg_page
structures into a buffer provided by the shout audio output plugin (see
audioOutput_shout_ogg.c, line 77.) I suspect the performance impact
is negligible.
As for metadata, I'm pretty sure they'll both work. I wrote up a test
scaffold that would create a fake tag, and tell the plugin to send it
out to the stream every few seconds. It seemed to work fine. Of course,
if something does break, I'll be glad to fix it.
Lastly, I've renamed lots of things into snake_case, in keeping with
normalperson's wishes in that regard.
[mk: moved the MP3 patch after this one. Splitted this patch into
several parts; the others were already applied before this one. Fixed
a bunch GCC warnings and wrong whitespace modifications. Made it
compile with mpd-mk by adapting to its prototypes]
2008-09-12 16:04:40 +02:00
|
|
|
const char *encoding;
|
2009-02-22 17:18:28 +01:00
|
|
|
const struct encoder_plugin *encoder_plugin;
|
|
|
|
unsigned shout_format;
|
2008-10-12 12:14:51 +02:00
|
|
|
unsigned protocol;
|
2008-02-05 11:17:33 +01:00
|
|
|
const char *user;
|
2006-07-20 18:02:40 +02:00
|
|
|
char *name;
|
2009-01-18 19:37:27 +01:00
|
|
|
const char *value;
|
2011-09-09 21:19:00 +02:00
|
|
|
const struct block_param *block_param;
|
2008-01-26 13:46:37 +01:00
|
|
|
int public;
|
2004-10-20 22:41:21 +02:00
|
|
|
|
2009-10-21 23:01:04 +02:00
|
|
|
if (audio_format == NULL ||
|
|
|
|
!audio_format_fully_defined(audio_format)) {
|
|
|
|
g_set_error(error, shout_output_quark(), 0,
|
|
|
|
"Need full audio format specification");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
sd = new_shout_data();
|
2004-10-20 22:41:21 +02:00
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
if (shout_init_count == 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
shout_init();
|
2004-11-01 15:56:32 +01:00
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
shout_init_count++;
|
2004-11-01 15:56:32 +01:00
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
check_block_param("host");
|
|
|
|
host = block_param->value;
|
2004-10-20 22:41:21 +02:00
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
check_block_param("mount");
|
|
|
|
mount = block_param->value;
|
2004-10-20 22:41:21 +02:00
|
|
|
|
2009-02-26 19:34:00 +01:00
|
|
|
port = config_get_block_unsigned(param, "port", 0);
|
|
|
|
if (port == 0) {
|
2009-02-26 22:04:59 +01:00
|
|
|
g_set_error(error, shout_output_quark(), 0,
|
|
|
|
"shout port must be configured");
|
2011-07-18 15:58:02 +02:00
|
|
|
goto failure;
|
2004-10-23 03:04:58 +02:00
|
|
|
}
|
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
check_block_param("password");
|
|
|
|
passwd = block_param->value;
|
2004-10-23 03:04:58 +02:00
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
check_block_param("name");
|
|
|
|
name = block_param->value;
|
2004-10-20 22:41:21 +02:00
|
|
|
|
2009-01-17 20:23:56 +01:00
|
|
|
public = config_get_block_bool(param, "public", false);
|
2004-11-04 05:01:04 +01:00
|
|
|
|
2009-01-18 19:37:27 +01:00
|
|
|
user = config_get_block_string(param, "user", "source");
|
2004-10-20 22:41:21 +02:00
|
|
|
|
2009-01-18 19:37:27 +01:00
|
|
|
value = config_get_block_string(param, "quality", NULL);
|
|
|
|
if (value != NULL) {
|
|
|
|
sd->quality = strtod(value, &test);
|
2004-10-29 15:33:51 +02:00
|
|
|
|
2006-10-10 22:00:33 +02:00
|
|
|
if (*test != '\0' || sd->quality < -1.0 || sd->quality > 10.0) {
|
2009-02-26 22:04:59 +01:00
|
|
|
g_set_error(error, shout_output_quark(), 0,
|
|
|
|
"shout quality \"%s\" is not a number in the "
|
|
|
|
"range -1 to 10, line %i",
|
|
|
|
value, param->line);
|
2011-07-18 15:58:02 +02:00
|
|
|
goto failure;
|
2004-10-29 15:33:51 +02:00
|
|
|
}
|
|
|
|
|
2009-01-18 19:37:27 +01:00
|
|
|
if (config_get_block_string(param, "bitrate", NULL) != NULL) {
|
2009-02-26 22:04:59 +01:00
|
|
|
g_set_error(error, shout_output_quark(), 0,
|
|
|
|
"quality and bitrate are "
|
|
|
|
"both defined");
|
2011-07-18 15:58:02 +02:00
|
|
|
goto failure;
|
2004-10-29 15:33:51 +02:00
|
|
|
}
|
2006-07-20 18:02:40 +02:00
|
|
|
} else {
|
2009-01-18 19:37:27 +01:00
|
|
|
value = config_get_block_string(param, "bitrate", NULL);
|
2009-02-26 22:04:59 +01:00
|
|
|
if (value == NULL) {
|
|
|
|
g_set_error(error, shout_output_quark(), 0,
|
|
|
|
"neither bitrate nor quality defined");
|
2011-07-18 15:58:02 +02:00
|
|
|
goto failure;
|
2009-02-26 22:04:59 +01:00
|
|
|
}
|
2004-10-29 15:33:51 +02:00
|
|
|
|
2009-01-18 19:37:27 +01:00
|
|
|
sd->bitrate = strtol(value, &test, 10);
|
2004-10-29 15:33:51 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (*test != '\0' || sd->bitrate <= 0) {
|
2009-02-26 22:04:59 +01:00
|
|
|
g_set_error(error, shout_output_quark(), 0,
|
|
|
|
"bitrate must be a positive integer");
|
2011-07-18 15:58:02 +02:00
|
|
|
goto failure;
|
2004-10-29 15:33:51 +02:00
|
|
|
}
|
2004-10-23 03:04:58 +02:00
|
|
|
}
|
|
|
|
|
2009-01-18 19:37:27 +01:00
|
|
|
encoding = config_get_block_string(param, "encoding", "ogg");
|
2009-02-22 17:18:28 +01:00
|
|
|
encoder_plugin = shout_encoder_plugin_get(encoding);
|
2009-02-26 22:04:59 +01:00
|
|
|
if (encoder_plugin == NULL) {
|
|
|
|
g_set_error(error, shout_output_quark(), 0,
|
|
|
|
"couldn't find shout encoder plugin \"%s\"",
|
|
|
|
encoding);
|
2011-07-18 15:58:02 +02:00
|
|
|
goto failure;
|
2009-02-26 22:04:59 +01:00
|
|
|
}
|
shout: introduce pluggable encoder API
I've perhaps gone a bit overboard, but here's the current rundown:
Both Ogg and MP3 use the "shout" audio output plugin. The shout audio
output plugin itself has two new plugins, one for the Ogg encoder,
and another for the MP3 (LAME) encoder.
Configuration for an Ogg stream doesn't change. For an MP3 stream,
configuration is the same as Ogg, with two exceptions. First, you must
specify the optional "encoding" parameter, which should be set to "mp3".
See mpd.conf(5) for more details. Second, the "quality" parameter is
reversed for LAME, such that 1 is high quality for LAME, whereas 10 is
high quality for Ogg.
I've decomposed the code so that all libshout related operations
are done in audioOutput_shout.c, all Ogg specific functions are in
audioOutput_shout_ogg.c, and of course then all LAME specific functions
are handled in audioOutput_shout_mp3.c.
To develop encoder plugins for the shout audio output plugin, I basically
just mimicked the plugin system used for audio outputs. This might be
overkill, but hopefully if anyone ever wants to support some other sort
of stream, like maybe AAC, FLAC, or WMA (hey it could happen), they will
hopefully be all set.
The Ogg encoder is slightly less optimal under this configuration.
It used to send shout data directly out of its ogg_page structures. Now,
in the interest of encapsulation, it copies the data from its ogg_page
structures into a buffer provided by the shout audio output plugin (see
audioOutput_shout_ogg.c, line 77.) I suspect the performance impact
is negligible.
As for metadata, I'm pretty sure they'll both work. I wrote up a test
scaffold that would create a fake tag, and tell the plugin to send it
out to the stream every few seconds. It seemed to work fine. Of course,
if something does break, I'll be glad to fix it.
Lastly, I've renamed lots of things into snake_case, in keeping with
normalperson's wishes in that regard.
[mk: moved the MP3 patch after this one. Splitted this patch into
several parts; the others were already applied before this one. Fixed
a bunch GCC warnings and wrong whitespace modifications. Made it
compile with mpd-mk by adapting to its prototypes]
2008-09-12 16:04:40 +02:00
|
|
|
|
2009-02-26 22:04:59 +01:00
|
|
|
sd->encoder = encoder_init(encoder_plugin, param, error);
|
2009-02-22 17:18:28 +01:00
|
|
|
if (sd->encoder == NULL)
|
2011-07-18 15:58:02 +02:00
|
|
|
goto failure;
|
2009-02-22 17:18:28 +01:00
|
|
|
|
|
|
|
if (strcmp(encoding, "mp3") == 0 || strcmp(encoding, "lame") == 0)
|
|
|
|
shout_format = SHOUT_FORMAT_MP3;
|
|
|
|
else
|
|
|
|
shout_format = SHOUT_FORMAT_OGG;
|
|
|
|
|
2009-01-18 19:37:27 +01:00
|
|
|
value = config_get_block_string(param, "protocol", NULL);
|
|
|
|
if (value != NULL) {
|
|
|
|
if (0 == strcmp(value, "shoutcast") &&
|
2009-02-26 22:04:59 +01:00
|
|
|
0 != strcmp(encoding, "mp3")) {
|
|
|
|
g_set_error(error, shout_output_quark(), 0,
|
|
|
|
"you cannot stream \"%s\" to shoutcast, use mp3",
|
|
|
|
encoding);
|
2011-07-18 15:58:02 +02:00
|
|
|
goto failure;
|
2009-02-26 22:04:59 +01:00
|
|
|
} else if (0 == strcmp(value, "shoutcast"))
|
2008-10-12 12:14:51 +02:00
|
|
|
protocol = SHOUT_PROTOCOL_ICY;
|
2009-01-18 19:37:27 +01:00
|
|
|
else if (0 == strcmp(value, "icecast1"))
|
2008-10-12 12:14:51 +02:00
|
|
|
protocol = SHOUT_PROTOCOL_XAUDIOCAST;
|
2009-01-18 19:37:27 +01:00
|
|
|
else if (0 == strcmp(value, "icecast2"))
|
2008-10-12 12:14:51 +02:00
|
|
|
protocol = SHOUT_PROTOCOL_HTTP;
|
2009-02-26 22:04:59 +01:00
|
|
|
else {
|
|
|
|
g_set_error(error, shout_output_quark(), 0,
|
|
|
|
"shout protocol \"%s\" is not \"shoutcast\" or "
|
|
|
|
"\"icecast1\"or \"icecast2\"",
|
|
|
|
value);
|
2011-07-18 15:58:02 +02:00
|
|
|
goto failure;
|
2009-02-26 22:04:59 +01:00
|
|
|
}
|
2008-10-12 12:14:51 +02:00
|
|
|
} else {
|
|
|
|
protocol = SHOUT_PROTOCOL_HTTP;
|
|
|
|
}
|
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
if (shout_set_host(sd->shout_conn, host) != SHOUTERR_SUCCESS ||
|
|
|
|
shout_set_port(sd->shout_conn, port) != SHOUTERR_SUCCESS ||
|
|
|
|
shout_set_password(sd->shout_conn, passwd) != SHOUTERR_SUCCESS ||
|
|
|
|
shout_set_mount(sd->shout_conn, mount) != SHOUTERR_SUCCESS ||
|
|
|
|
shout_set_name(sd->shout_conn, name) != SHOUTERR_SUCCESS ||
|
|
|
|
shout_set_user(sd->shout_conn, user) != SHOUTERR_SUCCESS ||
|
|
|
|
shout_set_public(sd->shout_conn, public) != SHOUTERR_SUCCESS ||
|
2009-02-22 17:18:28 +01:00
|
|
|
shout_set_format(sd->shout_conn, shout_format)
|
2006-07-20 18:02:40 +02:00
|
|
|
!= SHOUTERR_SUCCESS ||
|
2008-10-12 12:14:51 +02:00
|
|
|
shout_set_protocol(sd->shout_conn, protocol) != SHOUTERR_SUCCESS ||
|
2008-09-12 14:01:45 +02:00
|
|
|
shout_set_agent(sd->shout_conn, "MPD") != SHOUTERR_SUCCESS) {
|
2009-02-26 22:04:59 +01:00
|
|
|
g_set_error(error, shout_output_quark(), 0,
|
|
|
|
"%s", shout_get_error(sd->shout_conn));
|
2011-07-18 15:58:02 +02:00
|
|
|
goto failure;
|
2004-10-20 22:41:21 +02:00
|
|
|
}
|
2004-10-20 19:49:21 +02:00
|
|
|
|
2004-11-09 14:04:20 +01:00
|
|
|
/* optional paramters */
|
2009-01-18 19:45:51 +01:00
|
|
|
sd->timeout = config_get_block_unsigned(param, "timeout",
|
|
|
|
DEFAULT_CONN_TIMEOUT);
|
2007-06-12 20:28:57 +02:00
|
|
|
|
2009-01-18 19:37:27 +01:00
|
|
|
value = config_get_block_string(param, "genre", NULL);
|
|
|
|
if (value != NULL && shout_set_genre(sd->shout_conn, value)) {
|
2009-02-26 22:04:59 +01:00
|
|
|
g_set_error(error, shout_output_quark(), 0,
|
|
|
|
"%s", shout_get_error(sd->shout_conn));
|
2011-07-18 15:58:02 +02:00
|
|
|
goto failure;
|
2004-11-09 14:04:20 +01:00
|
|
|
}
|
|
|
|
|
2009-01-18 19:37:27 +01:00
|
|
|
value = config_get_block_string(param, "description", NULL);
|
|
|
|
if (value != NULL && shout_set_description(sd->shout_conn, value)) {
|
2009-02-26 22:04:59 +01:00
|
|
|
g_set_error(error, shout_output_quark(), 0,
|
|
|
|
"%s", shout_get_error(sd->shout_conn));
|
2011-07-18 15:58:02 +02:00
|
|
|
goto failure;
|
2004-11-09 14:04:20 +01:00
|
|
|
}
|
|
|
|
|
2011-02-04 14:14:29 +01:00
|
|
|
value = config_get_block_string(param, "url", NULL);
|
|
|
|
if (value != NULL && shout_set_url(sd->shout_conn, value)) {
|
|
|
|
g_set_error(error, shout_output_quark(), 0,
|
|
|
|
"%s", shout_get_error(sd->shout_conn));
|
2011-07-18 15:58:02 +02:00
|
|
|
goto failure;
|
2011-02-04 14:14:29 +01:00
|
|
|
}
|
|
|
|
|
2004-10-29 15:33:51 +02:00
|
|
|
{
|
|
|
|
char temp[11];
|
|
|
|
memset(temp, 0, sizeof(temp));
|
2006-07-20 18:02:40 +02:00
|
|
|
|
2009-02-22 17:18:28 +01:00
|
|
|
snprintf(temp, sizeof(temp), "%u", audio_format->channels);
|
2008-09-12 14:01:45 +02:00
|
|
|
shout_set_audio_info(sd->shout_conn, SHOUT_AI_CHANNELS, temp);
|
2004-10-29 15:33:51 +02:00
|
|
|
|
2009-02-22 17:18:28 +01:00
|
|
|
snprintf(temp, sizeof(temp), "%u", audio_format->sample_rate);
|
2006-07-20 18:02:40 +02:00
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
shout_set_audio_info(sd->shout_conn, SHOUT_AI_SAMPLERATE, temp);
|
2004-10-29 15:33:51 +02:00
|
|
|
|
2006-10-10 22:00:33 +02:00
|
|
|
if (sd->quality >= -1.0) {
|
2004-10-29 15:33:51 +02:00
|
|
|
snprintf(temp, sizeof(temp), "%2.2f", sd->quality);
|
2008-09-12 14:01:45 +02:00
|
|
|
shout_set_audio_info(sd->shout_conn, SHOUT_AI_QUALITY,
|
2006-07-20 18:02:40 +02:00
|
|
|
temp);
|
|
|
|
} else {
|
2004-10-29 15:33:51 +02:00
|
|
|
snprintf(temp, sizeof(temp), "%d", sd->bitrate);
|
2008-09-12 14:01:45 +02:00
|
|
|
shout_set_audio_info(sd->shout_conn, SHOUT_AI_BITRATE,
|
2006-07-20 18:02:40 +02:00
|
|
|
temp);
|
2004-10-29 15:33:51 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-09-24 07:20:55 +02:00
|
|
|
return sd;
|
2011-07-18 15:58:02 +02:00
|
|
|
|
|
|
|
failure:
|
|
|
|
free_shout_data(sd);
|
|
|
|
return NULL;
|
2004-10-20 19:49:21 +02:00
|
|
|
}
|
|
|
|
|
2009-02-22 15:18:58 +01:00
|
|
|
static bool
|
2009-02-26 22:04:59 +01:00
|
|
|
handle_shout_error(struct shout_data *sd, int err, GError **error)
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
|
|
|
switch (err) {
|
2004-11-09 04:58:12 +01:00
|
|
|
case SHOUTERR_SUCCESS:
|
|
|
|
break;
|
2009-02-22 15:18:58 +01:00
|
|
|
|
2004-11-09 04:58:12 +01:00
|
|
|
case SHOUTERR_UNCONNECTED:
|
|
|
|
case SHOUTERR_SOCKET:
|
2009-02-26 22:04:59 +01:00
|
|
|
g_set_error(error, shout_output_quark(), err,
|
|
|
|
"Lost shout connection to %s:%i: %s",
|
|
|
|
shout_get_host(sd->shout_conn),
|
|
|
|
shout_get_port(sd->shout_conn),
|
|
|
|
shout_get_error(sd->shout_conn));
|
2009-02-22 15:18:58 +01:00
|
|
|
return false;
|
|
|
|
|
2004-11-09 04:58:12 +01:00
|
|
|
default:
|
2009-02-26 22:04:59 +01:00
|
|
|
g_set_error(error, shout_output_quark(), err,
|
|
|
|
"connection to %s:%i error: %s",
|
|
|
|
shout_get_host(sd->shout_conn),
|
|
|
|
shout_get_port(sd->shout_conn),
|
|
|
|
shout_get_error(sd->shout_conn));
|
2009-02-22 15:18:58 +01:00
|
|
|
return false;
|
2004-11-09 04:58:12 +01:00
|
|
|
}
|
|
|
|
|
2009-02-22 15:18:58 +01:00
|
|
|
return true;
|
2004-11-09 04:58:12 +01:00
|
|
|
}
|
|
|
|
|
2009-02-22 15:18:58 +01:00
|
|
|
static bool
|
2009-02-26 22:04:59 +01:00
|
|
|
write_page(struct shout_data *sd, GError **error)
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
2008-03-26 11:37:36 +01:00
|
|
|
int err;
|
2004-11-09 04:58:12 +01:00
|
|
|
|
2009-02-22 17:18:28 +01:00
|
|
|
assert(sd->encoder != NULL);
|
|
|
|
|
|
|
|
sd->buf.len = encoder_read(sd->encoder,
|
|
|
|
sd->buf.data, sizeof(sd->buf.data));
|
2008-09-12 16:42:14 +02:00
|
|
|
if (sd->buf.len == 0)
|
2009-02-22 15:18:58 +01:00
|
|
|
return true;
|
2008-09-12 16:42:14 +02:00
|
|
|
|
2008-09-12 15:57:43 +02:00
|
|
|
err = shout_send(sd->shout_conn, sd->buf.data, sd->buf.len);
|
2009-02-26 22:04:59 +01:00
|
|
|
if (!handle_shout_error(sd, err, error))
|
2009-02-22 15:18:58 +01:00
|
|
|
return false;
|
2004-11-09 04:58:12 +01:00
|
|
|
|
2009-02-22 15:18:58 +01:00
|
|
|
return true;
|
2004-11-09 04:58:12 +01:00
|
|
|
}
|
|
|
|
|
shout: introduce pluggable encoder API
I've perhaps gone a bit overboard, but here's the current rundown:
Both Ogg and MP3 use the "shout" audio output plugin. The shout audio
output plugin itself has two new plugins, one for the Ogg encoder,
and another for the MP3 (LAME) encoder.
Configuration for an Ogg stream doesn't change. For an MP3 stream,
configuration is the same as Ogg, with two exceptions. First, you must
specify the optional "encoding" parameter, which should be set to "mp3".
See mpd.conf(5) for more details. Second, the "quality" parameter is
reversed for LAME, such that 1 is high quality for LAME, whereas 10 is
high quality for Ogg.
I've decomposed the code so that all libshout related operations
are done in audioOutput_shout.c, all Ogg specific functions are in
audioOutput_shout_ogg.c, and of course then all LAME specific functions
are handled in audioOutput_shout_mp3.c.
To develop encoder plugins for the shout audio output plugin, I basically
just mimicked the plugin system used for audio outputs. This might be
overkill, but hopefully if anyone ever wants to support some other sort
of stream, like maybe AAC, FLAC, or WMA (hey it could happen), they will
hopefully be all set.
The Ogg encoder is slightly less optimal under this configuration.
It used to send shout data directly out of its ogg_page structures. Now,
in the interest of encapsulation, it copies the data from its ogg_page
structures into a buffer provided by the shout audio output plugin (see
audioOutput_shout_ogg.c, line 77.) I suspect the performance impact
is negligible.
As for metadata, I'm pretty sure they'll both work. I wrote up a test
scaffold that would create a fake tag, and tell the plugin to send it
out to the stream every few seconds. It seemed to work fine. Of course,
if something does break, I'll be glad to fix it.
Lastly, I've renamed lots of things into snake_case, in keeping with
normalperson's wishes in that regard.
[mk: moved the MP3 patch after this one. Splitted this patch into
several parts; the others were already applied before this one. Fixed
a bunch GCC warnings and wrong whitespace modifications. Made it
compile with mpd-mk by adapting to its prototypes]
2008-09-12 16:04:40 +02:00
|
|
|
static void close_shout_conn(struct shout_data * sd)
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
2009-02-09 16:36:11 +01:00
|
|
|
sd->buf.len = 0;
|
|
|
|
|
2009-02-22 17:18:28 +01:00
|
|
|
if (sd->encoder != NULL) {
|
|
|
|
if (encoder_flush(sd->encoder, NULL))
|
2009-02-26 22:04:59 +01:00
|
|
|
write_page(sd, NULL);
|
2009-02-22 17:18:28 +01:00
|
|
|
|
|
|
|
encoder_close(sd->encoder);
|
|
|
|
}
|
2004-10-26 14:56:10 +02:00
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
if (shout_get_connected(sd->shout_conn) != SHOUTERR_UNCONNECTED &&
|
|
|
|
shout_close(sd->shout_conn) != SHOUTERR_SUCCESS) {
|
2008-11-25 17:25:41 +01:00
|
|
|
g_warning("problem closing connection to shout server: %s\n",
|
|
|
|
shout_get_error(sd->shout_conn));
|
2004-10-23 17:25:42 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-09-24 07:20:55 +02:00
|
|
|
static void my_shout_finish_driver(void *data)
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
2008-09-24 07:20:55 +02:00
|
|
|
struct shout_data *sd = (struct shout_data *)data;
|
2004-10-20 19:49:21 +02:00
|
|
|
|
2009-02-22 17:18:28 +01:00
|
|
|
encoder_finish(sd->encoder);
|
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
free_shout_data(sd);
|
2004-10-20 22:41:21 +02:00
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
shout_init_count--;
|
2004-10-20 22:41:21 +02:00
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
if (shout_init_count == 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
shout_shutdown();
|
2004-10-20 19:49:21 +02:00
|
|
|
}
|
|
|
|
|
2008-09-24 07:20:55 +02:00
|
|
|
static void my_shout_drop_buffered_audio(void *data)
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
2009-02-09 16:35:59 +01:00
|
|
|
G_GNUC_UNUSED
|
2008-09-24 07:20:55 +02:00
|
|
|
struct shout_data *sd = (struct shout_data *)data;
|
2007-08-11 23:36:23 +02:00
|
|
|
|
|
|
|
/* needs to be implemented for shout */
|
2005-03-05 15:01:13 +01:00
|
|
|
}
|
|
|
|
|
2008-09-24 07:20:55 +02:00
|
|
|
static void my_shout_close_device(void *data)
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
2008-09-24 07:20:55 +02:00
|
|
|
struct shout_data *sd = (struct shout_data *)data;
|
2004-11-02 23:13:58 +01:00
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
close_shout_conn(sd);
|
2004-10-23 17:25:42 +02:00
|
|
|
}
|
2004-10-20 22:41:21 +02:00
|
|
|
|
2009-02-22 15:18:58 +01:00
|
|
|
static bool
|
2009-02-26 22:04:59 +01:00
|
|
|
shout_connect(struct shout_data *sd, GError **error)
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
2009-02-09 16:35:54 +01:00
|
|
|
int state;
|
2007-06-12 19:58:17 +02:00
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
state = shout_open(sd->shout_conn);
|
2007-06-12 19:58:17 +02:00
|
|
|
switch (state) {
|
2006-10-11 02:18:43 +02:00
|
|
|
case SHOUTERR_SUCCESS:
|
|
|
|
case SHOUTERR_CONNECTED:
|
2009-02-22 15:18:58 +01:00
|
|
|
return true;
|
|
|
|
|
2006-10-11 02:18:43 +02:00
|
|
|
default:
|
2009-02-26 22:04:59 +01:00
|
|
|
g_set_error(error, shout_output_quark(), 0,
|
|
|
|
"problem opening connection to shout server %s:%i: %s",
|
|
|
|
shout_get_host(sd->shout_conn),
|
|
|
|
shout_get_port(sd->shout_conn),
|
|
|
|
shout_get_error(sd->shout_conn));
|
2009-02-22 15:18:58 +01:00
|
|
|
return false;
|
2004-10-20 22:41:21 +02:00
|
|
|
}
|
2007-08-11 23:36:23 +02:00
|
|
|
}
|
|
|
|
|
2009-02-22 15:18:58 +01:00
|
|
|
static bool
|
2009-02-26 22:04:59 +01:00
|
|
|
my_shout_open_device(void *data, struct audio_format *audio_format,
|
|
|
|
GError **error)
|
2007-08-11 23:36:23 +02:00
|
|
|
{
|
2008-09-24 07:20:55 +02:00
|
|
|
struct shout_data *sd = (struct shout_data *)data;
|
2009-02-22 15:18:58 +01:00
|
|
|
bool ret;
|
2007-08-11 23:36:23 +02:00
|
|
|
|
2009-02-26 22:04:59 +01:00
|
|
|
ret = shout_connect(sd, error);
|
2009-02-22 15:18:58 +01:00
|
|
|
if (!ret)
|
|
|
|
return false;
|
2004-10-20 19:49:21 +02:00
|
|
|
|
2009-02-09 16:36:11 +01:00
|
|
|
sd->buf.len = 0;
|
|
|
|
|
2009-02-26 22:04:59 +01:00
|
|
|
ret = encoder_open(sd->encoder, audio_format, error) &&
|
|
|
|
write_page(sd, error);
|
2009-02-22 17:18:28 +01:00
|
|
|
if (!ret) {
|
2008-09-12 14:01:45 +02:00
|
|
|
shout_close(sd->shout_conn);
|
2009-02-22 15:18:58 +01:00
|
|
|
return false;
|
2004-10-22 21:40:09 +02:00
|
|
|
}
|
|
|
|
|
2009-02-22 15:18:58 +01:00
|
|
|
return true;
|
2004-10-20 19:49:21 +02:00
|
|
|
}
|
|
|
|
|
2010-11-05 08:11:01 +01:00
|
|
|
static unsigned
|
|
|
|
my_shout_delay(void *data)
|
|
|
|
{
|
|
|
|
struct shout_data *sd = (struct shout_data *)data;
|
|
|
|
|
|
|
|
int delay = shout_delay(sd->shout_conn);
|
|
|
|
if (delay < 0)
|
|
|
|
delay = 0;
|
|
|
|
|
|
|
|
return delay;
|
|
|
|
}
|
|
|
|
|
2009-02-23 09:29:56 +01:00
|
|
|
static size_t
|
2009-02-26 22:04:59 +01:00
|
|
|
my_shout_play(void *data, const void *chunk, size_t size, GError **error)
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
2008-09-24 07:20:55 +02:00
|
|
|
struct shout_data *sd = (struct shout_data *)data;
|
2004-10-22 21:40:09 +02:00
|
|
|
|
2009-02-26 22:04:59 +01:00
|
|
|
return encoder_write(sd->encoder, chunk, size, error) &&
|
|
|
|
write_page(sd, error)
|
|
|
|
? size
|
|
|
|
: 0;
|
2004-10-20 19:49:21 +02:00
|
|
|
}
|
|
|
|
|
2009-01-30 20:12:38 +01:00
|
|
|
static bool
|
|
|
|
my_shout_pause(void *data)
|
2008-09-29 16:43:55 +02:00
|
|
|
{
|
|
|
|
static const char silence[1020];
|
|
|
|
|
2009-02-26 22:04:59 +01:00
|
|
|
return my_shout_play(data, silence, sizeof(silence), NULL);
|
2008-09-29 16:43:55 +02:00
|
|
|
}
|
|
|
|
|
2009-02-22 17:18:28 +01:00
|
|
|
static void
|
|
|
|
shout_tag_to_metadata(const struct tag *tag, char *dest, size_t size)
|
|
|
|
{
|
|
|
|
char artist[size];
|
|
|
|
char title[size];
|
|
|
|
|
|
|
|
artist[0] = 0;
|
|
|
|
title[0] = 0;
|
|
|
|
|
2009-02-27 09:01:55 +01:00
|
|
|
for (unsigned i = 0; i < tag->num_items; i++) {
|
2009-02-22 17:18:28 +01:00
|
|
|
switch (tag->items[i]->type) {
|
2009-10-13 16:12:45 +02:00
|
|
|
case TAG_ARTIST:
|
2009-02-22 17:18:28 +01:00
|
|
|
strncpy(artist, tag->items[i]->value, size);
|
|
|
|
break;
|
2009-10-13 16:12:45 +02:00
|
|
|
case TAG_TITLE:
|
2009-02-22 17:18:28 +01:00
|
|
|
strncpy(title, tag->items[i]->value, size);
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-11-08 18:46:14 +01:00
|
|
|
snprintf(dest, size, "%s - %s", artist, title);
|
2009-02-22 17:18:28 +01:00
|
|
|
}
|
|
|
|
|
2008-09-24 07:20:55 +02:00
|
|
|
static void my_shout_set_tag(void *data,
|
2008-09-12 14:01:45 +02:00
|
|
|
const struct tag *tag)
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
2008-09-24 07:20:55 +02:00
|
|
|
struct shout_data *sd = (struct shout_data *)data;
|
2009-02-09 16:36:06 +01:00
|
|
|
bool ret;
|
2009-02-22 17:18:28 +01:00
|
|
|
GError *error = NULL;
|
|
|
|
|
|
|
|
if (sd->encoder->plugin->tag != NULL) {
|
|
|
|
/* encoder plugin supports stream tags */
|
|
|
|
|
2011-07-20 20:54:34 +02:00
|
|
|
ret = encoder_pre_tag(sd->encoder, &error);
|
2009-02-22 17:18:28 +01:00
|
|
|
if (!ret) {
|
|
|
|
g_warning("%s", error->message);
|
|
|
|
g_error_free(error);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2009-02-26 22:04:59 +01:00
|
|
|
ret = write_page(sd, NULL);
|
|
|
|
if (!ret)
|
|
|
|
return;
|
2009-02-22 17:18:28 +01:00
|
|
|
|
|
|
|
ret = encoder_tag(sd->encoder, tag, &error);
|
|
|
|
if (!ret) {
|
|
|
|
g_warning("%s", error->message);
|
|
|
|
g_error_free(error);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* no stream tag support: fall back to icy-metadata */
|
|
|
|
char song[1024];
|
|
|
|
|
|
|
|
shout_tag_to_metadata(tag, song, sizeof(song));
|
2004-10-25 22:09:03 +02:00
|
|
|
|
2009-02-09 16:36:06 +01:00
|
|
|
shout_metadata_add(sd->shout_meta, "song", song);
|
|
|
|
if (SHOUTERR_SUCCESS != shout_set_metadata(sd->shout_conn,
|
|
|
|
sd->shout_meta)) {
|
|
|
|
g_warning("error setting shout metadata\n");
|
|
|
|
}
|
|
|
|
}
|
2004-10-25 22:09:03 +02:00
|
|
|
|
2009-02-26 22:04:59 +01:00
|
|
|
write_page(sd, NULL);
|
2004-10-25 22:09:03 +02:00
|
|
|
}
|
|
|
|
|
2008-09-08 11:43:38 +02:00
|
|
|
const struct audio_output_plugin shoutPlugin = {
|
2008-09-29 15:55:17 +02:00
|
|
|
.name = "shout",
|
|
|
|
.init = my_shout_init_driver,
|
|
|
|
.finish = my_shout_finish_driver,
|
|
|
|
.open = my_shout_open_device,
|
2010-11-05 08:11:01 +01:00
|
|
|
.delay = my_shout_delay,
|
2008-09-29 15:55:17 +02:00
|
|
|
.play = my_shout_play,
|
2008-09-29 16:43:55 +02:00
|
|
|
.pause = my_shout_pause,
|
2008-09-29 15:55:17 +02:00
|
|
|
.cancel = my_shout_drop_buffered_audio,
|
|
|
|
.close = my_shout_close_device,
|
|
|
|
.send_tag = my_shout_set_tag,
|
2004-10-20 19:49:21 +02:00
|
|
|
};
|