summaryrefslogtreecommitdiffstats
path: root/libao2
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-06-30 13:25:08 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-06-30 13:25:08 +0000
commit6dad56fda6899de9003dd78c5fd85d3b10ee09f7 (patch)
treee61597b7556f88a00308f660c02319408ff33c34 /libao2
parente63017700f77c6f6f968ac2a12e6987bd7cf4d20 (diff)
downloadmpv-6dad56fda6899de9003dd78c5fd85d3b10ee09f7.tar.bz2
mpv-6dad56fda6899de9003dd78c5fd85d3b10ee09f7.tar.xz
avoid hang when playing more than one file
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15869 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2')
-rw-r--r--libao2/ao_jack.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libao2/ao_jack.c b/libao2/ao_jack.c
index a386f09665..8ff008594e 100644
--- a/libao2/ao_jack.c
+++ b/libao2/ao_jack.c
@@ -231,6 +231,7 @@ static int init(int rate, int channels, int format, int flags) {
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 @@ static void uninit(int immed) {
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);