Mercurial > audlegacy-plugins

changeset 2179:2f6d5e1a22cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
author William Pitcock <nenolod@atheme.org>
date Tue, 20 Nov 2007 02:00:52 -0600
parents 852fb48fcc67 (current diff) a838523e04b7 (diff)
children f629e0c90f18
files
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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;
 }