diff options
| author | Christian Schaller <uraeus@gnome.org> | 2004-12-12 12:05:39 +0000 |
|---|---|---|
| committer | Christian Schaller <uraeus@gnome.org> | 2004-12-12 12:05:39 +0000 |
| commit | f46ec4e3b75d8e5c17b877c6c4d5d07898d3742b (patch) | |
| tree | b8633287cfa1b6c30b060d53926687797e98a106 | |
| parent | b5d73d2ec82b55a24355657f9c1c69855dc8a798 (diff) | |
| download | gst-plugins-bad-f46ec4e3b75d8e5c17b877c6c4d5d07898d3742b.tar.gz gst-plugins-bad-f46ec4e3b75d8e5c17b877c6c4d5d07898d3742b.tar.bz2 gst-plugins-bad-f46ec4e3b75d8e5c17b877c6c4d5d07898d3742b.zip | |
merge patch from 158258
Original commit message from CVS:
merge patch from 158258
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | ext/polyp/polypsink.c | 5 |
3 files changed, 6 insertions, 6 deletions
@@ -1,3 +1,8 @@ +2004-12-12 Christian Fredrik Kalager Schaller <christian at fluendo dot com> + + * configure.ac: Update polyaudio requirement to 0.7 + * ext/polyp/polypsink.c: (create_stream): add patch from iain (158258) + 2004-12-11 Zaheer Abbas Merali <zaheerabbas at merali dot org> * gst/interleave/deinterleave.c: diff --git a/configure.ac b/configure.ac index 44b25d8d..2d64fbec 100644 --- a/configure.ac +++ b/configure.ac @@ -1429,7 +1429,7 @@ GST_CHECK_FEATURE(PANGO, [pango], pango, [ dnl *** polypaudio *** translit(dnm, m, l) AM_CONDITIONAL(USE_POLYP, true) GST_CHECK_FEATURE(POLYP, [polyp], polyp, [ - PKG_CHECK_MODULES(POLYP, polyplib >= 0.6, + PKG_CHECK_MODULES(POLYP, polyplib >= 0.7, HAVE_POLYP="yes", HAVE_POLYP="no") AC_SUBST(POLYP_CFLAGS) AC_SUBST(POLYP_CFLAGS) diff --git a/ext/polyp/polypsink.c b/ext/polyp/polypsink.c index 9719a23e..37f5d5f4 100644 --- a/ext/polyp/polypsink.c +++ b/ext/polyp/polypsink.c @@ -319,11 +319,6 @@ create_stream (GstPolypSink * polypsink) polypsink); pa_stream_connect_playback (polypsink->stream, NULL, NULL, PA_STREAM_INTERPOLATE_LATENCY, PA_VOLUME_NORM); - - while (polypsink->context && pa_context_is_pending (polypsink->context)) { - if (pa_mainloop_iterate (polypsink->mainloop, 1, NULL) < 0) - return; - } } static void |