aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-11-09 03:10:14 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-11-09 03:10:14 +0000
commitfb7de941c3a948ed68915b4ad249831a70d4ff79 (patch)
tree12cc702879a62b091e1524fc0ae571da790a6b32
parentc3eabe01dafec8b16f04824b74b365a7ebffb866 (diff)
downloadmpd-fb7de941c3a948ed68915b4ad249831a70d4ff79.tar.gz
mpd-fb7de941c3a948ed68915b4ad249831a70d4ff79.tar.xz
mpd-fb7de941c3a948ed68915b4ad249831a70d4ff79.zip
don't set granulepos, that's pad, mmmkay?
git-svn-id: https://svn.musicpd.org/mpd/trunk@2555 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--src/audio.c3
-rw-r--r--src/audioOutputs/audioOutput_shout.c5
2 files changed, 2 insertions, 6 deletions
diff --git a/src/audio.c b/src/audio.c
index 47c1880cc..41489742a 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -261,7 +261,8 @@ int openAudioDevice(AudioFormat * audioFormat) {
if(!audioOpened || !isCurrentFormat) {
flushAudioBuffer();
copyAudioFormat(&audio_format, audioFormat);
- audioBufferSize = (audio_format.bits/8)*audio_format.channels;
+ audioBufferSize = (audio_format.bits >> 3)*
+ audio_format.channels;
audioBufferSize*= audio_format.sampleRate >> 5;
audioBuffer = realloc(audioBuffer, audioBufferSize);
}
diff --git a/src/audioOutputs/audioOutput_shout.c b/src/audioOutputs/audioOutput_shout.c
index 6d228fa02..b23210819 100644
--- a/src/audioOutputs/audioOutput_shout.c
+++ b/src/audioOutputs/audioOutput_shout.c
@@ -340,7 +340,6 @@ static int write_page(ShoutData * sd) {
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;
}
@@ -464,15 +463,11 @@ static int myShout_openDevice(AudioOutput * audioOutput,
}
static void myShout_sendMetadata(ShoutData * sd) {
- ogg_int64_t granulepos = sd->vd.granulepos;
-
if(!sd->opened || !sd->tag) return;
clearEncoder(sd);
if(initEncoder(sd) < 0) return;
- sd->vd.granulepos = granulepos;
-
copyTagToVorbisComment(sd);
vorbis_analysis_headerout(&(sd->vd), &(sd->vc), &(sd->header_main),