From 541a989803188f183f36fd33b1eef519fc46ee23 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 27 Aug 2008 02:56:19 -0700 Subject: Fix software mixer I just forgot to reenable/reinitialize it after the core rewrite. --- src/outputBuffer.c | 2 +- src/outputBuffer_config_init.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/outputBuffer.c b/src/outputBuffer.c index ff3a8e901..a856c9a8c 100644 --- a/src/outputBuffer.c +++ b/src/outputBuffer.c @@ -481,7 +481,7 @@ static void play_next_chunk(void) } send_next_tag(); - /* pcm_volumeChange(a->data, a->len, &ob.audio_format, ob.sw_vol); */ + pcm_volumeChange(a->data, a->len, &ob.audio_format, ob.sw_vol); if (playAudio(a->data, a->len) < 0) stop_playback(); a->len = 0; /* mark the chunk as empty for ob_send() */ diff --git a/src/outputBuffer_config_init.h b/src/outputBuffer_config_init.h index 7461c4d73..a56502f80 100644 --- a/src/outputBuffer_config_init.h +++ b/src/outputBuffer_config_init.h @@ -66,6 +66,7 @@ void config_output_buffer(void) ob.chunks = xcalloc(ob.index->size, sizeof(struct ob_chunk)); ob.preseek_len = xmalloc(ob.index->size * sizeof(ob.chunks[0].len)); ob.state = OB_STATE_STOP; + ob.sw_vol = 1000; } static void ob_free(void) -- cgit v1.2.3