2004-10-20 19:49:21 +02:00
|
|
|
/* the Music Player Daemon (MPD)
|
2007-04-05 05:22:33 +02:00
|
|
|
* Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
|
2004-10-20 19:49:21 +02:00
|
|
|
* This project's homepage is: http://www.musicpd.org
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
*/
|
|
|
|
|
2008-10-26 11:29:44 +01:00
|
|
|
#include "shout_plugin.h"
|
2009-01-08 21:37:02 +01:00
|
|
|
#include "config.h"
|
2004-10-21 01:08:40 +02:00
|
|
|
|
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
|
|
|
|
2007-06-12 19:58:17 +02:00
|
|
|
#define CONN_ATTEMPT_INTERVAL 60
|
2007-06-12 20:28:57 +02:00
|
|
|
#define DEFAULT_CONN_TIMEOUT 2
|
2004-11-02 14:26:50 +01:00
|
|
|
|
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
|
|
|
|
2008-09-12 16:39:53 +02:00
|
|
|
static const struct shout_encoder_plugin *const shout_encoder_plugins[] = {
|
2008-10-09 15:18:21 +02:00
|
|
|
#ifdef HAVE_SHOUT_MP3
|
2008-09-12 16:39:51 +02:00
|
|
|
&shout_mp3_encoder,
|
2008-10-09 15:18:21 +02:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SHOUT_OGG
|
2008-09-12 16:39:51 +02:00
|
|
|
&shout_ogg_encoder,
|
2008-10-09 15:18:21 +02:00
|
|
|
#endif
|
2008-09-12 16:39:51 +02:00
|
|
|
NULL
|
|
|
|
};
|
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
|
|
|
|
2008-09-12 16:39:53 +02:00
|
|
|
static const struct shout_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
|
|
|
{
|
2008-09-12 16:39:51 +02:00
|
|
|
unsigned i;
|
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
|
|
|
|
2008-09-12 16:39:51 +02:00
|
|
|
for (i = 0; shout_encoder_plugins[i] != NULL; ++i)
|
|
|
|
if (strcmp(shout_encoder_plugins[i]->name, name) == 0)
|
|
|
|
return shout_encoder_plugins[i];
|
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
|
|
|
|
2008-09-12 16:39:51 +02:00
|
|
|
return NULL;
|
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-23 17:25:42 +02:00
|
|
|
ret->opened = 0;
|
2004-10-26 04:32:37 +02:00
|
|
|
ret->tag = NULL;
|
2008-09-12 14:01:45 +02:00
|
|
|
ret->tag_to_send = 0;
|
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;
|
2008-09-12 14:01:45 +02:00
|
|
|
ret->conn_attempts = 0;
|
|
|
|
ret->last_attempt = 0;
|
2007-08-11 23:36:23 +02:00
|
|
|
ret->timer = NULL;
|
2008-09-12 16:41:22 +02:00
|
|
|
ret->buf.len = 0;
|
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);
|
2006-07-20 18:02:40 +02:00
|
|
|
if (sd->tag)
|
2008-08-29 15:02:49 +02:00
|
|
|
tag_free(sd->tag);
|
2007-08-11 23:36:23 +02:00
|
|
|
if (sd->timer)
|
|
|
|
timer_free(sd->timer);
|
2004-10-20 22:41:21 +02:00
|
|
|
|
2004-10-20 19:49:21 +02:00
|
|
|
free(sd);
|
|
|
|
}
|
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
#define check_block_param(name) { \
|
|
|
|
block_param = getBlockParam(param, name); \
|
|
|
|
if (!block_param) { \
|
2008-11-25 17:25:41 +01:00
|
|
|
g_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
|
|
|
|
2008-09-29 16:43:55 +02:00
|
|
|
static void *my_shout_init_driver(struct audio_output *audio_output,
|
2008-09-24 07:20:55 +02:00
|
|
|
const struct audio_format *audio_format,
|
|
|
|
ConfigParam *param)
|
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;
|
2004-10-20 22:41:21 +02:00
|
|
|
int 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;
|
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;
|
2008-09-12 14:01:45 +02:00
|
|
|
BlockParam *block_param;
|
2008-01-26 13:46:37 +01:00
|
|
|
int public;
|
2004-10-20 22:41:21 +02:00
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
sd = new_shout_data();
|
2008-09-29 16:43:55 +02:00
|
|
|
sd->audio_output = audio_output;
|
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
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
check_block_param("port");
|
2004-10-20 22:41:21 +02:00
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
port = strtol(block_param->value, &test, 10);
|
2004-10-20 22:41:21 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (*test != '\0' || port <= 0) {
|
2008-11-25 17:25:41 +01:00
|
|
|
g_error("shout port \"%s\" is not a positive integer, line %i\n",
|
|
|
|
block_param->value, block_param->line);
|
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
|
|
|
|
2007-09-06 01:59:36 +02:00
|
|
|
public = getBoolBlockParam(param, "public", 1);
|
|
|
|
if (public == CONF_BOOL_UNSET)
|
|
|
|
public = 0;
|
2004-11-04 05:01:04 +01:00
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
block_param = getBlockParam(param, "user");
|
|
|
|
if (block_param)
|
|
|
|
user = block_param->value;
|
2006-07-20 18:02:40 +02:00
|
|
|
else
|
|
|
|
user = "source";
|
2004-10-20 22:41:21 +02:00
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
block_param = getBlockParam(param, "quality");
|
2004-10-20 22:41:21 +02:00
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
if (block_param) {
|
|
|
|
int line = block_param->line;
|
2004-10-23 03:04:58 +02:00
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
sd->quality = strtod(block_param->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) {
|
2008-11-25 17:25:41 +01:00
|
|
|
g_error("shout quality \"%s\" is not a number in the "
|
|
|
|
"range -1 to 10, line %i\n", block_param->value,
|
|
|
|
block_param->line);
|
2004-10-29 15:33:51 +02:00
|
|
|
}
|
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
block_param = getBlockParam(param, "bitrate");
|
2004-10-29 15:33:51 +02:00
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
if (block_param) {
|
2008-11-25 17:25:41 +01:00
|
|
|
g_error("quality (line %i) and bitrate (line %i) are "
|
|
|
|
"both defined for shout output\n", line,
|
|
|
|
block_param->line);
|
2004-10-29 15:33:51 +02:00
|
|
|
}
|
2006-07-20 18:02:40 +02:00
|
|
|
} else {
|
2008-09-12 14:01:45 +02:00
|
|
|
block_param = getBlockParam(param, "bitrate");
|
2004-10-29 15:33:51 +02:00
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
if (!block_param) {
|
2008-11-25 17:25:41 +01:00
|
|
|
g_error("neither bitrate nor quality defined for shout "
|
|
|
|
"output at line %i\n", param->line);
|
2004-10-29 15:33:51 +02:00
|
|
|
}
|
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
sd->bitrate = strtol(block_param->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) {
|
2008-11-25 17:25:41 +01:00
|
|
|
g_error("bitrate at line %i should be a positive integer "
|
|
|
|
"\n", block_param->line);
|
2004-10-29 15:33:51 +02:00
|
|
|
}
|
2004-10-23 03:04:58 +02:00
|
|
|
}
|
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
check_block_param("format");
|
2008-09-24 07:20:36 +02:00
|
|
|
|
|
|
|
assert(audio_format != NULL);
|
|
|
|
sd->audio_format = *audio_format;
|
2008-09-12 14:01:45 +02: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
|
|
|
block_param = getBlockParam(param, "encoding");
|
|
|
|
if (block_param) {
|
2008-10-12 12:13:27 +02:00
|
|
|
if (0 == strcmp(block_param->value, "mp3"))
|
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
|
|
|
encoding = block_param->value;
|
2008-10-12 12:13:27 +02:00
|
|
|
else if (0 == strcmp(block_param->value, "ogg"))
|
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
|
|
|
encoding = block_param->value;
|
|
|
|
else
|
2008-11-25 17:25:41 +01:00
|
|
|
g_error("shout encoding \"%s\" is not \"ogg\" or "
|
|
|
|
"\"mp3\", line %i\n", block_param->value,
|
|
|
|
block_param->line);
|
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
|
|
|
} else {
|
|
|
|
encoding = "ogg";
|
|
|
|
}
|
2008-09-12 16:39:51 +02:00
|
|
|
|
|
|
|
sd->encoder = shout_encoder_plugin_get(encoding);
|
|
|
|
if (sd->encoder == NULL)
|
2008-12-23 18:05:25 +01:00
|
|
|
g_error("couldn't find shout encoder plugin \"%s\"\n",
|
|
|
|
encoding);
|
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
|
|
|
|
2008-10-12 12:14:51 +02:00
|
|
|
block_param = getBlockParam(param, "protocol");
|
|
|
|
if (block_param) {
|
|
|
|
if (0 == strcmp(block_param->value, "shoutcast") &&
|
|
|
|
0 != strcmp(encoding, "mp3"))
|
2008-11-25 17:25:41 +01:00
|
|
|
g_error("you cannot stream \"%s\" to shoutcast, use mp3\n",
|
|
|
|
encoding);
|
2008-10-12 12:14:51 +02:00
|
|
|
else if (0 == strcmp(block_param->value, "shoutcast"))
|
|
|
|
protocol = SHOUT_PROTOCOL_ICY;
|
|
|
|
else if (0 == strcmp(block_param->value, "icecast1"))
|
|
|
|
protocol = SHOUT_PROTOCOL_XAUDIOCAST;
|
|
|
|
else if (0 == strcmp(block_param->value, "icecast2"))
|
|
|
|
protocol = SHOUT_PROTOCOL_HTTP;
|
|
|
|
else
|
2008-11-25 17:25:41 +01:00
|
|
|
g_error("shout protocol \"%s\" is not \"shoutcast\" or "
|
|
|
|
"\"icecast1\"or "
|
|
|
|
"\"icecast2\", line %i\n", block_param->value,
|
|
|
|
block_param->line);
|
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 ||
|
|
|
|
shout_set_nonblocking(sd->shout_conn, 1) != SHOUTERR_SUCCESS ||
|
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
|
|
|
shout_set_format(sd->shout_conn, sd->encoder->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) {
|
2008-11-25 17:25:41 +01:00
|
|
|
g_error("error configuring shout defined at line %i: %s\n",
|
|
|
|
param->line, shout_get_error(sd->shout_conn));
|
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 */
|
2008-09-12 14:01:45 +02:00
|
|
|
block_param = getBlockParam(param, "timeout");
|
|
|
|
if (block_param) {
|
|
|
|
sd->timeout = (int)strtol(block_param->value, &test, 10);
|
2007-06-12 20:28:57 +02:00
|
|
|
if (*test != '\0' || sd->timeout <= 0) {
|
2008-11-25 17:25:41 +01:00
|
|
|
g_error("shout timeout is not a positive integer, "
|
|
|
|
"line %i\n", block_param->line);
|
2007-06-12 20:28:57 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
block_param = getBlockParam(param, "genre");
|
|
|
|
if (block_param && shout_set_genre(sd->shout_conn, block_param->value)) {
|
2008-11-25 17:25:41 +01:00
|
|
|
g_error("error configuring shout defined at line %i: %s\n",
|
|
|
|
param->line, shout_get_error(sd->shout_conn));
|
2004-11-09 14:04:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
block_param = getBlockParam(param, "description");
|
|
|
|
if (block_param && shout_set_description(sd->shout_conn,
|
|
|
|
block_param->value)) {
|
2008-11-25 17:25:41 +01:00
|
|
|
g_error("error configuring shout defined at line %i: %s\n",
|
|
|
|
param->line, shout_get_error(sd->shout_conn));
|
2004-11-09 14:04:20 +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
|
|
|
|
2008-10-10 14:03:33 +02:00
|
|
|
snprintf(temp, sizeof(temp), "%u", sd->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
|
|
|
|
2008-10-10 14:40:54 +02:00
|
|
|
snprintf(temp, sizeof(temp), "%u", sd->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
|
|
|
if (sd->encoder->init_func(sd) != 0)
|
2008-11-25 17:25:41 +01:00
|
|
|
g_error("shout: encoder plugin '%s' failed to initialize\n",
|
|
|
|
sd->encoder->name);
|
2004-10-20 22:41:21 +02:00
|
|
|
|
2008-09-24 07:20:55 +02:00
|
|
|
return sd;
|
2004-10-20 19:49:21 +02:00
|
|
|
}
|
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
static int handle_shout_error(struct shout_data *sd, int err)
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
|
|
|
switch (err) {
|
2004-11-09 04:58:12 +01:00
|
|
|
case SHOUTERR_SUCCESS:
|
|
|
|
break;
|
|
|
|
case SHOUTERR_UNCONNECTED:
|
|
|
|
case SHOUTERR_SOCKET:
|
2008-11-25 17:25:41 +01:00
|
|
|
g_warning("Lost shout connection to %s:%i: %s\n",
|
|
|
|
shout_get_host(sd->shout_conn),
|
|
|
|
shout_get_port(sd->shout_conn),
|
|
|
|
shout_get_error(sd->shout_conn));
|
2008-09-12 14:01:45 +02:00
|
|
|
sd->shout_error = 1;
|
2004-11-09 04:58:12 +01:00
|
|
|
return -1;
|
|
|
|
default:
|
2008-11-25 17:25:41 +01:00
|
|
|
g_warning("shout: connection to %s:%i error: %s\n",
|
|
|
|
shout_get_host(sd->shout_conn),
|
|
|
|
shout_get_port(sd->shout_conn),
|
|
|
|
shout_get_error(sd->shout_conn));
|
2008-09-12 14:01:45 +02:00
|
|
|
sd->shout_error = 1;
|
2004-11-09 04:58:12 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-09-12 15:57:43 +02:00
|
|
|
static int write_page(struct shout_data *sd)
|
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
|
|
|
|
2008-09-12 16:42:14 +02:00
|
|
|
if (sd->buf.len == 0)
|
|
|
|
return 0;
|
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
shout_sync(sd->shout_conn);
|
2008-09-12 15:57:43 +02:00
|
|
|
err = shout_send(sd->shout_conn, sd->buf.data, sd->buf.len);
|
2008-09-12 14:01:45 +02:00
|
|
|
if (handle_shout_error(sd, err) < 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
2008-09-12 16:41:22 +02:00
|
|
|
sd->buf.len = 0;
|
2004-11-09 04:58:12 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
{
|
2008-09-12 15:57:43 +02:00
|
|
|
if (sd->opened) {
|
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
|
|
|
if (sd->encoder->clear_encoder_func(sd))
|
2008-09-12 15:57:43 +02:00
|
|
|
write_page(sd);
|
|
|
|
}
|
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-10-29 20:40:27 +01:00
|
|
|
sd->opened = false;
|
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
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
close_shout_conn(sd);
|
2004-10-23 17:25:42 +02: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
|
|
|
sd->encoder->finish_func(sd);
|
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
|
|
|
{
|
2008-09-24 07:20:55 +02:00
|
|
|
struct shout_data *sd = (struct shout_data *)data;
|
2007-08-11 23:36:23 +02:00
|
|
|
timer_reset(sd->timer);
|
|
|
|
|
|
|
|
/* 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-11-02 23:13:58 +01:00
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
if (sd->timer) {
|
2007-08-11 23:36:23 +02:00
|
|
|
timer_free(sd->timer);
|
|
|
|
sd->timer = NULL;
|
|
|
|
}
|
2004-10-23 17:25:42 +02:00
|
|
|
}
|
2004-10-20 22:41:21 +02:00
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
static int shout_connect(struct shout_data *sd)
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
2004-11-02 14:26:50 +01:00
|
|
|
time_t t = time(NULL);
|
2008-09-12 14:01:45 +02:00
|
|
|
int state = shout_get_connected(sd->shout_conn);
|
2007-08-11 23:36:23 +02:00
|
|
|
|
|
|
|
/* already connected */
|
|
|
|
if (state == SHOUTERR_CONNECTED)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* waiting to connect */
|
2008-09-12 14:01:45 +02:00
|
|
|
if (state == SHOUTERR_BUSY && sd->conn_attempts != 0) {
|
2007-08-11 23:36:23 +02:00
|
|
|
/* timeout waiting to connect */
|
2008-09-12 14:01:45 +02:00
|
|
|
if ((t - sd->last_attempt) > sd->timeout) {
|
2008-11-25 17:25:41 +01:00
|
|
|
g_warning("timeout connecting to shout server %s:%i "
|
|
|
|
"(attempt %i)\n",
|
|
|
|
shout_get_host(sd->shout_conn),
|
|
|
|
shout_get_port(sd->shout_conn),
|
|
|
|
sd->conn_attempts);
|
2007-08-11 23:36:23 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* we're in some funky state, so just reset it to unconnected */
|
|
|
|
if (state != SHOUTERR_UNCONNECTED)
|
2008-09-12 14:01:45 +02:00
|
|
|
shout_close(sd->shout_conn);
|
2007-06-09 17:51:20 +02:00
|
|
|
|
2007-08-11 23:36:23 +02:00
|
|
|
/* throttle new connection attempts */
|
2008-09-12 14:01:45 +02:00
|
|
|
if (sd->conn_attempts != 0 &&
|
|
|
|
(t - sd->last_attempt) <= CONN_ATTEMPT_INTERVAL) {
|
2004-11-02 14:26:50 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2007-08-11 23:36:23 +02:00
|
|
|
/* initiate a new connection */
|
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
sd->conn_attempts++;
|
|
|
|
sd->last_attempt = t;
|
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:
|
2007-08-11 23:36:23 +02:00
|
|
|
return 0;
|
2006-10-11 02:18:43 +02:00
|
|
|
case SHOUTERR_BUSY:
|
2007-08-11 23:36:23 +02:00
|
|
|
return 1;
|
2006-10-11 02:18:43 +02:00
|
|
|
default:
|
2008-11-25 17:25:41 +01:00
|
|
|
g_warning("problem opening connection to shout server %s:%i "
|
|
|
|
"(attempt %i): %s\n",
|
|
|
|
shout_get_host(sd->shout_conn),
|
|
|
|
shout_get_port(sd->shout_conn),
|
|
|
|
sd->conn_attempts, shout_get_error(sd->shout_conn));
|
2004-10-20 22:41:21 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2007-08-11 23:36:23 +02:00
|
|
|
}
|
|
|
|
|
2008-09-24 07:20:55 +02:00
|
|
|
static int open_shout_conn(void *data)
|
2007-08-11 23:36:23 +02:00
|
|
|
{
|
2008-09-24 07:20:55 +02:00
|
|
|
struct shout_data *sd = (struct shout_data *)data;
|
2007-08-11 23:36:23 +02:00
|
|
|
int status;
|
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
status = shout_connect(sd);
|
2007-08-11 23:36:23 +02:00
|
|
|
if (status != 0)
|
|
|
|
return status;
|
2004-10-20 19:49:21 +02: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
|
|
|
if (sd->encoder->init_encoder_func(sd) < 0) {
|
2008-09-12 14:01:45 +02:00
|
|
|
shout_close(sd->shout_conn);
|
2004-10-22 21:40:09 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2008-09-12 16:42:14 +02:00
|
|
|
write_page(sd);
|
2004-10-22 21:40:09 +02:00
|
|
|
|
2008-09-12 15:57:43 +02:00
|
|
|
sd->shout_error = 0;
|
2008-10-29 20:40:27 +01:00
|
|
|
sd->opened = true;
|
2008-09-12 15:57:43 +02:00
|
|
|
sd->tag_to_send = 1;
|
2008-09-12 14:01:45 +02:00
|
|
|
sd->conn_attempts = 0;
|
2004-10-23 03:04:58 +02:00
|
|
|
|
2004-10-20 19:49:21 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-10-29 20:40:27 +01:00
|
|
|
static bool my_shout_open_device(void *data,
|
2008-09-24 07:20:36 +02:00
|
|
|
struct audio_format *audio_format)
|
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-26 14:56:10 +02:00
|
|
|
|
2008-09-24 07:20:55 +02:00
|
|
|
if (!sd->opened && open_shout_conn(sd) < 0)
|
2008-10-29 20:40:27 +01:00
|
|
|
return false;
|
2007-06-12 19:58:17 +02:00
|
|
|
|
2007-08-11 23:36:23 +02:00
|
|
|
if (sd->timer)
|
|
|
|
timer_free(sd->timer);
|
|
|
|
|
2008-09-24 07:20:36 +02:00
|
|
|
sd->timer = timer_new(audio_format);
|
2007-08-11 23:36:23 +02:00
|
|
|
|
2008-10-29 20:40:27 +01:00
|
|
|
return true;
|
2004-10-26 14:56:10 +02:00
|
|
|
}
|
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
static void send_metadata(struct shout_data * sd)
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
2008-09-12 16:00:01 +02:00
|
|
|
static const int size = 1024;
|
|
|
|
char song[size];
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (!sd->opened || !sd->tag)
|
|
|
|
return;
|
2004-10-26 04:32:37 +02: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
|
|
|
if (sd->encoder->send_metadata_func(sd, song, size)) {
|
2008-09-12 16:00:01 +02:00
|
|
|
shout_metadata_add(sd->shout_meta, "song", song);
|
|
|
|
if (SHOUTERR_SUCCESS != shout_set_metadata(sd->shout_conn,
|
|
|
|
sd->shout_meta)) {
|
2008-11-25 17:25:41 +01:00
|
|
|
g_warning("error setting shout metadata\n");
|
2008-09-12 16:00:01 +02:00
|
|
|
return;
|
|
|
|
}
|
2004-10-26 04:32:37 +02:00
|
|
|
}
|
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
sd->tag_to_send = 0;
|
2004-10-26 04:32:37 +02:00
|
|
|
}
|
|
|
|
|
2008-10-29 20:40:27 +01:00
|
|
|
static bool
|
|
|
|
my_shout_play(void *data, const char *chunk, size_t size)
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
2008-09-24 07:20:55 +02:00
|
|
|
struct shout_data *sd = (struct shout_data *)data;
|
2007-08-11 23:36:23 +02:00
|
|
|
int status;
|
|
|
|
|
|
|
|
if (!sd->timer->started)
|
|
|
|
timer_start(sd->timer);
|
|
|
|
|
|
|
|
timer_add(sd->timer, size);
|
2004-10-23 03:04:58 +02:00
|
|
|
|
2008-09-12 14:01:45 +02:00
|
|
|
if (sd->opened && sd->tag_to_send)
|
|
|
|
send_metadata(sd);
|
2004-10-26 14:56:10 +02:00
|
|
|
|
2007-08-11 23:36:23 +02:00
|
|
|
if (!sd->opened) {
|
2008-09-24 07:20:55 +02:00
|
|
|
status = open_shout_conn(sd);
|
2007-08-11 23:36:23 +02:00
|
|
|
if (status < 0) {
|
2008-10-29 20:40:27 +01:00
|
|
|
return false;
|
2007-08-11 23:36:23 +02:00
|
|
|
} else if (status > 0) {
|
|
|
|
timer_sync(sd->timer);
|
2008-10-29 20:40:27 +01:00
|
|
|
return true;
|
2007-08-11 23:36:23 +02:00
|
|
|
}
|
2004-10-25 23:36:08 +02:00
|
|
|
}
|
|
|
|
|
2008-10-29 20:40:33 +01:00
|
|
|
if (sd->encoder->encode_func(sd, chunk, size))
|
2008-10-29 20:40:27 +01:00
|
|
|
return false;
|
2004-10-22 21:40:09 +02:00
|
|
|
|
2008-10-29 20:40:33 +01:00
|
|
|
if (write_page(sd) < 0)
|
2008-10-29 20:40:27 +01:00
|
|
|
return false;
|
2004-11-01 21:02:08 +01:00
|
|
|
|
2008-10-29 20:40:27 +01:00
|
|
|
return true;
|
2004-10-20 19:49:21 +02:00
|
|
|
}
|
|
|
|
|
2008-09-29 16:43:55 +02:00
|
|
|
static void my_shout_pause(void *data)
|
|
|
|
{
|
|
|
|
struct shout_data *sd = (struct shout_data *)data;
|
|
|
|
static const char silence[1020];
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
/* play silence until the player thread sends us a command */
|
|
|
|
|
|
|
|
while (sd->opened && !audio_output_is_pending(sd->audio_output)) {
|
|
|
|
ret = my_shout_play(data, silence, sizeof(silence));
|
|
|
|
if (ret != 0)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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;
|
2004-10-25 22:09:03 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (sd->tag)
|
2008-08-29 15:02:49 +02:00
|
|
|
tag_free(sd->tag);
|
2004-10-26 04:32:37 +02:00
|
|
|
sd->tag = NULL;
|
2008-09-12 14:01:45 +02:00
|
|
|
sd->tag_to_send = 0;
|
2004-10-25 22:09:03 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (!tag)
|
|
|
|
return;
|
2004-10-25 22:09:03 +02:00
|
|
|
|
2008-08-29 15:02:49 +02:00
|
|
|
sd->tag = tag_dup(tag);
|
2008-09-12 14:01:45 +02:00
|
|
|
sd->tag_to_send = 1;
|
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,
|
|
|
|
.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
|
|
|
};
|