# HG changeset patch # User Jonathan Schleifer # Date 1196270140 -3600 # Node ID 9773d2c69857914a8e33d2998b162fe5293d619e # Parent c19a820de01eec172b767fe181d739aa9efea537# Parent 80d7ab8f2ec5ba228b7cabfa26d345499b234a5a Automated merge with ssh://hg.atheme.org//hg/audacious-plugins diff -r 80d7ab8f2ec5 -r 9773d2c69857 src/OSS4/audio.c --- a/src/OSS4/audio.c Wed Nov 28 16:19:57 2007 +0300 +++ b/src/OSS4/audio.c Wed Nov 28 18:15:40 2007 +0100 @@ -593,6 +593,7 @@ gint oss_open(AFormat fmt, gint rate, gint nch) { + int l, r; if (oss_cfg.use_alt_audio_device && oss_cfg.alt_audio_device) device_name = g_strdup(oss_cfg.alt_audio_device); @@ -645,6 +646,8 @@ buffer_thread = g_thread_create(oss_loop, NULL, TRUE, NULL); oss_get_volume(&start_vol_l, &start_vol_r); + aud_input_get_volume(&l, &r); + oss_set_volume(l, r); return 1; }