# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1195545652 21600
# Node ID 2f6d5e1a22cd1618e97e7306d43af5ba60e9aa79
# Parent  852fb48fcc67ab99e910280a0b11d90561b190e8# Parent  a838523e04b7c8e5df260abb672eb7f9c26b9e48
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins

diff -r 852fb48fcc67 -r 2f6d5e1a22cd src/OSS4/audio.c
--- a/src/OSS4/audio.c	Tue Nov 20 02:00:27 2007 -0600
+++ b/src/OSS4/audio.c	Tue Nov 20 02:00:52 2007 -0600
@@ -48,6 +48,7 @@
 static gchar *device_name;
 static GThread *buffer_thread;
 static gboolean select_works;
+static int start_vol_l, start_vol_r;
 
 static int (*oss_convert_func) (void **data, int length);
 static int (*oss_stereo_convert_func) (void **data, int length, int fmt);
@@ -434,6 +435,8 @@
         return;
     going = 0;
 
+    oss_set_volume(start_vol_l, start_vol_r);
+
     g_thread_join(buffer_thread);
 
     g_free(device_name);
@@ -641,6 +644,8 @@
 
     buffer_thread = g_thread_create(oss_loop, NULL, TRUE, NULL);
 
+    oss_get_volume(&start_vol_l, &start_vol_r);
+
     return 1;
 }