Skip to content

M
mpd
Commit 5ffa401e authored by Warren Dukes's avatar Warren Dukes
Browse files
Options

haha! you thought you had me, but i found your ass, double _init() on the vorbis encoder

git-svn-id: https://svn.musicpd.org/mpd/trunk@2456 09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent 6d7e6a85
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 8 deletions
src/audioOutput_shout.c
View file @ 5ffa401e
...@@ -311,12 +311,13 @@ static int myShout_handleError(ShoutData * sd, int err) { ...@@ -311,12 +311,13 @@ static int myShout_handleError(ShoutData * sd, int err) {
} }
static int write_page(ShoutData * sd) { static int write_page(ShoutData * sd) {
int err = 0;
shout_sync(sd->shoutConn); shout_sync(sd->shoutConn);
int err = shout_send(sd->shoutConn, sd->og.header, sd->og.header_len); err = shout_send(sd->shoutConn, sd->og.header, sd->og.header_len);
if(myShout_handleError(sd, err) < 0) return -1; if(myShout_handleError(sd, err) < 0) return -1;
err = shout_send(sd->shoutConn, sd->og.body, sd->og.body_len); err = shout_send(sd->shoutConn, sd->og.body, sd->og.body_len);
if(myShout_handleError(sd, err) < 0) return -1; if(myShout_handleError(sd, err) < 0) return -1;
/*shout_sync(sd->shoutConn);*/
return 0; return 0;
} }
...@@ -358,12 +359,6 @@ static int initEncoder(ShoutData * sd) { ...@@ -358,12 +359,6 @@ static int initEncoder(ShoutData * sd) {
} }
} }
if(0 != vorbis_encode_setup_init(&(sd->vi))) {
ERROR("problem seting up vorbis encoder for shout\n");
vorbis_info_clear(&(sd->vi));
return -1;
}
vorbis_analysis_init(&(sd->vd), &(sd->vi)); vorbis_analysis_init(&(sd->vd), &(sd->vi));
vorbis_block_init (&(sd->vd), &(sd->vb)); vorbis_block_init (&(sd->vd), &(sd->vb));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment