diff options
| author | Warren Dukes <warren.dukes@gmail.com> | 2004-11-01 22:54:44 +0000 |
|---|---|---|
| committer | Warren Dukes <warren.dukes@gmail.com> | 2004-11-01 22:54:44 +0000 |
| commit | 5ffa401e74c12e17c179bb0d36aeb854e1d34978 (patch) | |
| tree | 4e31e9c88c68c55c2f060faeab841f44db44988a | |
| parent | 6d7e6a858109ecc3c049b3b0b25c152545bebe06 (diff) | |
| download | mpd-5ffa401e74c12e17c179bb0d36aeb854e1d34978.tar.gz mpd-5ffa401e74c12e17c179bb0d36aeb854e1d34978.tar.xz mpd-5ffa401e74c12e17c179bb0d36aeb854e1d34978.zip | |
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
| -rw-r--r-- | src/audioOutput_shout.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/audioOutput_shout.c b/src/audioOutput_shout.c index dcb905fdf..beebf6ba7 100644 --- a/src/audioOutput_shout.c +++ b/src/audioOutput_shout.c @@ -311,12 +311,13 @@ static int myShout_handleError(ShoutData * sd, int err) { } static int write_page(ShoutData * sd) { + int err = 0; + 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; err = shout_send(sd->shoutConn, sd->og.body, sd->og.body_len); if(myShout_handleError(sd, err) < 0) return -1; - /*shout_sync(sd->shoutConn);*/ return 0; } @@ -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_block_init (&(sd->vd), &(sd->vb)); |