aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2008-08-27 02:56:19 -0700
committerEric Wong <normalperson@yhbt.net>2008-08-27 02:56:19 -0700
commit541a989803188f183f36fd33b1eef519fc46ee23 (patch)
treec55124c4c5739ff95e0be1f1355930cf6209473b /src
parent9cb6d62a0302d8e49b2225b97602379db7566b5e (diff)
downloadmpd-541a989803188f183f36fd33b1eef519fc46ee23.tar.gz
mpd-541a989803188f183f36fd33b1eef519fc46ee23.tar.xz
mpd-541a989803188f183f36fd33b1eef519fc46ee23.zip
Fix software mixer
I just forgot to reenable/reinitialize it after the core rewrite.
Diffstat (limited to 'src')
-rw-r--r--src/outputBuffer.c2
-rw-r--r--src/outputBuffer_config_init.h1
2 files changed, 2 insertions, 1 deletions
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)