[Mplayer-cvslog] CVS: main/libao2 ao_oss.c,1.27,1.28

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libao2
In directory mail:/var/tmp.root/cvs-serv28192/libao2

Modified Files:
	ao_oss.c 
Log Message:
subrip sometimes uses pipe as newline separator - patch by MOLNAR Andor <dolphy at inf.elte.hu>

Index: ao_oss.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_oss.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ao_oss.c	28 Jun 2002 16:42:32 -0000	1.27
+++ ao_oss.c	4 Jul 2002 22:19:51 -0000	1.28
@@ -219,10 +219,12 @@
 
 // close audio device
 static void uninit(){
+    if(audio_fd<0) return; //already closed
 #ifdef SNDCTL_DSP_RESET
     ioctl(audio_fd, SNDCTL_DSP_RESET, NULL);
 #endif
     close(audio_fd);
+    audio_fd=-1;
 }
 
 // stop playing and empty buffers (for seeking/pause)
@@ -249,13 +251,14 @@
 // stop playing, keep buffers (for pause)
 static void audio_pause()
 {
-    // for now, just call reset();
-    reset();
+    uninit();
 }
 
 // resume playing, after audio_pause()
 static void audio_resume()
 {
+    // for now, just call reset();
+    reset();
 }