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

be sure to flush the metadata on song change

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2556 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2004-11-09 03:58:12 +00:00
parent fb7de941c3
commit c2a2383090
1 changed files with 47 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/audioOutputs/audioOutput_shout.c
View File

@ -44,6 +44,7 @@ static int shoutInitCount = 0;
typedef struct _ShoutData { typedef struct _ShoutData {
shout_t * shoutConn; shout_t * shoutConn;
int shoutError;
ogg_stream_state os; ogg_stream_state os;
ogg_page og; ogg_page og;
@ -251,7 +252,43 @@ static int myShout_initDriver(AudioOutput * audioOutput, ConfigParam * param) {
return 0; return 0;
} }
/*static void finishEncoder(ShoutData * sd) { static int myShout_handleError(ShoutData * sd, int err) {
switch(err) {
case SHOUTERR_SUCCESS:
break;
case SHOUTERR_UNCONNECTED:
case SHOUTERR_SOCKET:
ERROR("Lost shout connection to %s:%i\n",
shout_get_host(sd->shoutConn),
shout_get_port(sd->shoutConn));
sd->shoutError = 1;
return -1;
default:
ERROR("shout: connection to %s:%i error : %s\n",
shout_get_host(sd->shoutConn),
shout_get_port(sd->shoutConn),
shout_get_error(sd->shoutConn));
sd->shoutError = 1;
return -1;
}
return 0;
}
static int write_page(ShoutData * sd) {
int err = 0;
/*DEBUG("shout_delay: %i\n", shout_delay(sd->shoutConn));*/
shout_sync(sd->shoutConn);
err = shout_send(sd->shoutConn, sd->og.header, sd->og.header_len);
if(myShout_handleError(sd, err) < 0) return -1;
err = shout_send(sd->shoutConn, sd->og.body, sd->og.body_len);
if(myShout_handleError(sd, err) < 0) return -1;
return 0;
}
static void finishEncoder(ShoutData * sd) {
vorbis_analysis_wrote(&sd->vd, 0); vorbis_analysis_wrote(&sd->vd, 0);
while(vorbis_analysis_blockout(&sd->vd, &sd->vb) == 1) { while(vorbis_analysis_blockout(&sd->vd, &sd->vb) == 1) {
@ -263,13 +300,15 @@ static int myShout_initDriver(AudioOutput * audioOutput, ConfigParam * param) {
} }
} }
static void flushEncoder(ShoutData * sd) { static int flushEncoder(ShoutData * sd) {
while(1 == ogg_stream_pageout(&sd->os, &sd->og)); return !(ogg_stream_pageout(&sd->os, &sd->og) <= 0 );
}*/ }
static void clearEncoder(ShoutData * sd) { static void clearEncoder(ShoutData * sd) {
/*finishEncoder(sd); finishEncoder(sd);
flushEncoder(sd);*/ while(1 == flushEncoder(sd)) {
if(!sd->shoutError) write_page(sd);
}
vorbis_comment_clear(&sd->vc); vorbis_comment_clear(&sd->vc);
ogg_stream_clear(&sd->os); ogg_stream_clear(&sd->os);
@ -311,39 +350,6 @@ static void myShout_closeDevice(AudioOutput * audioOutput) {
audioOutput->open = 0; audioOutput->open = 0;
} }
static int myShout_handleError(ShoutData * sd, int err) {
switch(err) {
case SHOUTERR_SUCCESS:
break;
case SHOUTERR_UNCONNECTED:
case SHOUTERR_SOCKET:
ERROR("Lost shout connection to %s:%i\n",
shout_get_host(sd->shoutConn),
shout_get_port(sd->shoutConn));
return -1;
default:
ERROR("shout: connection to %s:%i error : %s\n",
shout_get_host(sd->shoutConn),
shout_get_port(sd->shoutConn),
shout_get_error(sd->shoutConn));
return -1;
}
return 0;
}
static int write_page(ShoutData * sd) {
int err = 0;
shout_sync(sd->shoutConn);
err = shout_send(sd->shoutConn, sd->og.header, sd->og.header_len);
if(myShout_handleError(sd, err) < 0) return -1;
err = shout_send(sd->shoutConn, sd->og.body, sd->og.body_len);
if(myShout_handleError(sd, err) < 0) return -1;
return 0;
}
#define addTag(name, value) { \ #define addTag(name, value) { \
if(value) vorbis_comment_add_tag(&(sd->vc), name, value); \ if(value) vorbis_comment_add_tag(&(sd->vc), name, value); \
} }
@ -420,6 +426,8 @@ static int myShout_openShoutConn(AudioOutput * audioOutput) {
return -1; return -1;
} }
sd->shoutError = 0;
copyTagToVorbisComment(sd); copyTagToVorbisComment(sd);
vorbis_analysis_headerout(&(sd->vd), &(sd->vc), &(sd->header_main), vorbis_analysis_headerout(&(sd->vd), &(sd->vc), &(sd->header_main),