[MPlayer-cvslog] CVS: main/libao2 ao_jack.c,1.11,1.12

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libao2
In directory mail:/var2/tmp/cvs-serv4405

Modified Files:
	ao_jack.c 
Log Message:
avoid hang when playing more than one file


Index: ao_jack.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_jack.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ao_jack.c	5 Jun 2005 08:37:48 -0000	1.11
+++ ao_jack.c	30 Jun 2005 13:25:08 -0000	1.12
@@ -231,6 +231,7 @@
     mp_msg(MSGT_AO, MSGL_FATAL, "[JACK] cannot open server\n");
     goto err_out;
   }
+  reset();
   jack_set_process_callback(client, outputaudio, 0);
 
   // list matching ports
@@ -295,7 +296,7 @@
   if (!immed)
     usec_sleep(get_delay() * 1000 * 1000);
   // HACK, make sure jack doesn't loop-output dirty buffers
-  paused = 1;
+  reset();
   usec_sleep(100 * 1000);
   jack_client_close(client);
   free(buffer);