diff options
author | 2008-04-15 02:22:33 +0000 | |
---|---|---|
committer | 2008-04-15 02:22:33 +0000 | |
commit | 32975c26de725bce68c24b291b3312fca7ebdf0e (patch) | |
tree | 6deddf8ee62e8c4b4fe1eb8a6e66aec06f3ed7b3 /media-video/mplayer/files | |
parent | MPlayer snapshot bump (diff) | |
download | historical-32975c26de725bce68c24b291b3312fca7ebdf0e.tar.gz historical-32975c26de725bce68c24b291b3312fca7ebdf0e.tar.bz2 historical-32975c26de725bce68c24b291b3312fca7ebdf0e.zip |
Restore an old snapshot to provide some now lost functionality
Package-Manager: portage-2.1.5_rc3
Diffstat (limited to 'media-video/mplayer/files')
-rw-r--r-- | media-video/mplayer/files/mplayer-1.0_rc2_p24929-pulse.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/media-video/mplayer/files/mplayer-1.0_rc2_p24929-pulse.patch b/media-video/mplayer/files/mplayer-1.0_rc2_p24929-pulse.patch new file mode 100644 index 000000000000..845c54f5c018 --- /dev/null +++ b/media-video/mplayer/files/mplayer-1.0_rc2_p24929-pulse.patch @@ -0,0 +1,29 @@ +diff -uNr mplayer-1.0_rc2_p24929-orig/libao2/ao_pulse.c mplayer-1.0_rc2_p24929/libao2/ao_pulse.c +--- mplayer-1.0_rc2_p24929-orig/libao2/ao_pulse.c 2007-10-21 12:00:54.000000000 -0700 ++++ mplayer-1.0_rc2_p24929/libao2/ao_pulse.c 2008-01-04 15:46:22.000000000 -0800 +@@ -253,11 +253,16 @@ + /** Play the specified data to the pulseaudio server */ + static int play(void* data, int len, int flags) { + if (len) { +- if (pa_stream_write(stream, data, len, NULL, 0, PA_SEEK_RELATIVE) < 0) { ++ int rc; ++ pa_threaded_mainloop_lock(mainloop); ++ rc = pa_stream_write(stream, data, len, NULL, 0, PA_SEEK_RELATIVE); ++ pa_threaded_mainloop_unlock(mainloop); ++ if (rc < 0) { + GENERIC_ERR_MSG(context, "pa_stream_write() failed"); + return -1; + } + } else { ++ pa_threaded_mainloop_lock(mainloop); + pa_operation *o = pa_stream_trigger(stream, NULL, NULL); + if (!o) { + GENERIC_ERR_MSG(context, "pa_stream_trigger() failed"); +@@ -265,6 +270,7 @@ + } + /* We don't wait for this operation to complete */ + pa_operation_unref(o); ++ pa_threaded_mainloop_unlock(mainloop); + } + return len; + } |