1 diff -urN akode-2.0.1.orig/Makefile.in akode-2.0.1/Makefile.in
2 --- akode-2.0.1.orig/Makefile.in 2006-07-23 00:17:11.000000000 +0200
3 +++ akode-2.0.1/Makefile.in 2006-09-06 14:38:04.000000000 +0200
5 PACKAGE_VERSION = @PACKAGE_VERSION@
6 PATH_SEPARATOR = @PATH_SEPARATOR@
7 PKG_CONFIG = @PKG_CONFIG@
8 -POLYP_CFLAGS = @POLYP_CFLAGS@
9 -POLYP_LDFLAGS = @POLYP_LDFLAGS@
10 -POLYP_LIBADD = @POLYP_LIBADD@
11 +PULSE_CFLAGS = @PULSE_CFLAGS@
12 +PULSE_LDFLAGS = @PULSE_LDFLAGS@
13 +PULSE_LIBADD = @PULSE_LIBADD@
17 diff -urN akode-2.0.1.orig/akode/Makefile.in akode-2.0.1/akode/Makefile.in
18 --- akode-2.0.1.orig/akode/Makefile.in 2006-07-23 00:17:11.000000000 +0200
19 +++ akode-2.0.1/akode/Makefile.in 2006-09-06 14:38:04.000000000 +0200
21 PACKAGE_VERSION = @PACKAGE_VERSION@
22 PATH_SEPARATOR = @PATH_SEPARATOR@
23 PKG_CONFIG = @PKG_CONFIG@
24 -POLYP_CFLAGS = @POLYP_CFLAGS@
25 -POLYP_LDFLAGS = @POLYP_LDFLAGS@
26 -POLYP_LIBADD = @POLYP_LIBADD@
27 +PULSE_CFLAGS = @PULSE_CFLAGS@
28 +PULSE_LDFLAGS = @PULSE_LDFLAGS@
29 +PULSE_LIBADD = @PULSE_LIBADD@
33 diff -urN akode-2.0.1.orig/akode/akodeplay/Makefile.in akode-2.0.1/akode/akodeplay/Makefile.in
34 --- akode-2.0.1.orig/akode/akodeplay/Makefile.in 2006-07-23 00:17:11.000000000 +0200
35 +++ akode-2.0.1/akode/akodeplay/Makefile.in 2006-09-06 14:38:04.000000000 +0200
37 PACKAGE_VERSION = @PACKAGE_VERSION@
38 PATH_SEPARATOR = @PATH_SEPARATOR@
39 PKG_CONFIG = @PKG_CONFIG@
40 -POLYP_CFLAGS = @POLYP_CFLAGS@
41 -POLYP_LDFLAGS = @POLYP_LDFLAGS@
42 -POLYP_LIBADD = @POLYP_LIBADD@
43 +PULSE_CFLAGS = @PULSE_CFLAGS@
44 +PULSE_LDFLAGS = @PULSE_LDFLAGS@
45 +PULSE_LIBADD = @PULSE_LIBADD@
49 diff -urN akode-2.0.1.orig/akode/configure.in.in akode-2.0.1/akode/configure.in.in
50 --- akode-2.0.1.orig/akode/configure.in.in 2005-10-27 17:12:36.000000000 +0200
51 +++ akode-2.0.1/akode/configure.in.in 2006-09-06 14:45:46.000000000 +0200
53 AC_SUBST(JACK_LDFLAGS)
56 -AC_ARG_WITH(polypaudio,AC_HELP_STRING([--with-polypaudio],[Enable Polypaudio server support @<:@default=check@:>@]),[polypaudio_test="$withval"],[polypaudio_test="yes"])
57 +AC_ARG_WITH(pulseaudio,AC_HELP_STRING([--with-pulseaudio],[Enable PulseAudio server support @<:@default=check@:>@]),[pulseaudio_test="$withval"],[pulseaudio_test="yes"])
59 -if test "x$polypaudio_test" = "xyes" ; then
60 -AC_MSG_CHECKING(for Polypaudio 0.7 or later)
61 -if $PKG_CONFIG --atleast-version 0.7 polyplib-simple >/dev/null 2>&1 ; then
62 - POLYP_CFLAGS="`$PKG_CONFIG --cflags polyplib-simple`"
63 - POLYP_LIBADD="`$PKG_CONFIG --libs-only-l polyplib-simple`"
64 - POLYP_LDFLAGS="`$PKG_CONFIG --libs-only-L polyplib-simple`"
66 +if test "x$pulseaudio_test" = "xyes" ; then
67 +AC_MSG_CHECKING(for PulseAudio 0.9.2 or later)
68 +if $PKG_CONFIG --atleast-version 0.9.2 libpulse-simple >/dev/null 2>&1 ; then
69 + PULSE_CFLAGS="`$PKG_CONFIG --cflags libpulse-simple`"
70 + PULSE_LIBADD="`$PKG_CONFIG --libs-only-l libpulse-simple`"
71 + PULSE_LDFLAGS="`$PKG_CONFIG --libs-only-L libpulse-simple`"
74 - AC_DEFINE(HAVE_LIBPOLYP, 1,
75 - [Define if you have polyplib (required if you want Polypaudio server support)])
76 + AC_DEFINE(HAVE_LIBPULSE, 1,
77 + [Define if you have libpulse (required if you want PulseAudio server support)])
79 AC_MSG_RESULT(not installed)
81 -AC_SUBST(POLYP_CFLAGS)
82 -AC_SUBST(POLYP_LIBADD)
83 -AC_SUBST(POLYP_LDFLAGS)
84 +AC_SUBST(PULSE_CFLAGS)
85 +AC_SUBST(PULSE_LIBADD)
86 +AC_SUBST(PULSE_LDFLAGS)
89 AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=no@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="no"])
91 AM_CONDITIONAL(include_oss_sink, test x$have_oss = xyes)
92 AM_CONDITIONAL(include_sun_sink, test x$have_sun = xyes)
93 AM_CONDITIONAL(include_jack_sink, test x$have_jack = xyes)
94 -AM_CONDITIONAL(include_polyp_sink, test x$have_polyp = xyes)
95 +AM_CONDITIONAL(include_polyp_sink, test x$have_pulse = xyes)
96 AM_CONDITIONAL(include_ffmpeg_decoder, test x$have_ffmpeg = xyes)
98 AC_MSG_CHECKING(for compilable aKode)
99 diff -urN akode-2.0.1.orig/akode/lib/Makefile.in akode-2.0.1/akode/lib/Makefile.in
100 --- akode-2.0.1.orig/akode/lib/Makefile.in 2006-07-23 00:17:11.000000000 +0200
101 +++ akode-2.0.1/akode/lib/Makefile.in 2006-09-06 14:38:04.000000000 +0200
103 PACKAGE_VERSION = @PACKAGE_VERSION@
104 PATH_SEPARATOR = @PATH_SEPARATOR@
105 PKG_CONFIG = @PKG_CONFIG@
106 -POLYP_CFLAGS = @POLYP_CFLAGS@
107 -POLYP_LDFLAGS = @POLYP_LDFLAGS@
108 -POLYP_LIBADD = @POLYP_LIBADD@
109 +PULSE_CFLAGS = @PULSE_CFLAGS@
110 +PULSE_LDFLAGS = @PULSE_LDFLAGS@
111 +PULSE_LIBADD = @PULSE_LIBADD@
113 SET_MAKE = @SET_MAKE@
115 diff -urN akode-2.0.1.orig/akode/plugins/Makefile.in akode-2.0.1/akode/plugins/Makefile.in
116 --- akode-2.0.1.orig/akode/plugins/Makefile.in 2006-07-23 00:17:11.000000000 +0200
117 +++ akode-2.0.1/akode/plugins/Makefile.in 2006-09-06 14:38:04.000000000 +0200
119 PACKAGE_VERSION = @PACKAGE_VERSION@
120 PATH_SEPARATOR = @PATH_SEPARATOR@
121 PKG_CONFIG = @PKG_CONFIG@
122 -POLYP_CFLAGS = @POLYP_CFLAGS@
123 -POLYP_LDFLAGS = @POLYP_LDFLAGS@
124 -POLYP_LIBADD = @POLYP_LIBADD@
125 +PULSE_CFLAGS = @PULSE_CFLAGS@
126 +PULSE_LDFLAGS = @PULSE_LDFLAGS@
127 +PULSE_LIBADD = @PULSE_LIBADD@
129 SET_MAKE = @SET_MAKE@
131 @@ -251,11 +251,11 @@
132 @include_oss_sink_TRUE@AKODE_OSS_SINK = oss_sink
133 @include_sun_sink_TRUE@AKODE_SUN_SINK = sun_sink
134 @include_jack_sink_TRUE@AKODE_JACK_SINK = jack_sink
135 -@include_polyp_sink_TRUE@AKODE_POLYP_SINK = polyp_sink
136 +@include_polyp_sink_TRUE@AKODE_PULSE_SINK = polyp_sink
137 SUBDIRS = $(AKODE_MPC_DECODER) $(AKODE_XIPH_DECODER) \
138 $(AKODE_MPEG_DECODER) $(AKODE_FFMPEG_DECODER) \
139 $(AKODE_ALSA_SINK) $(AKODE_OSS_SINK) $(AKODE_SUN_SINK) \
140 - $(AKODE_JACK_SINK) $(AKODE_POLYP_SINK) \
141 + $(AKODE_JACK_SINK) $(AKODE_PULSE_SINK) \
142 $(AKODE_SRC_RESAMPLER)
144 #>- all: all-recursive
145 diff -urN akode-2.0.1.orig/akode/plugins/alsa_sink/Makefile.in akode-2.0.1/akode/plugins/alsa_sink/Makefile.in
146 --- akode-2.0.1.orig/akode/plugins/alsa_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200
147 +++ akode-2.0.1/akode/plugins/alsa_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200
149 PACKAGE_VERSION = @PACKAGE_VERSION@
150 PATH_SEPARATOR = @PATH_SEPARATOR@
151 PKG_CONFIG = @PKG_CONFIG@
152 -POLYP_CFLAGS = @POLYP_CFLAGS@
153 -POLYP_LDFLAGS = @POLYP_LDFLAGS@
154 -POLYP_LIBADD = @POLYP_LIBADD@
155 +PULSE_CFLAGS = @PULSE_CFLAGS@
156 +PULSE_LDFLAGS = @PULSE_LDFLAGS@
157 +PULSE_LIBADD = @PULSE_LIBADD@
159 SET_MAKE = @SET_MAKE@
161 diff -urN akode-2.0.1.orig/akode/plugins/ffmpeg_decoder/Makefile.in akode-2.0.1/akode/plugins/ffmpeg_decoder/Makefile.in
162 --- akode-2.0.1.orig/akode/plugins/ffmpeg_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200
163 +++ akode-2.0.1/akode/plugins/ffmpeg_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200
165 PACKAGE_VERSION = @PACKAGE_VERSION@
166 PATH_SEPARATOR = @PATH_SEPARATOR@
167 PKG_CONFIG = @PKG_CONFIG@
168 -POLYP_CFLAGS = @POLYP_CFLAGS@
169 -POLYP_LDFLAGS = @POLYP_LDFLAGS@
170 -POLYP_LIBADD = @POLYP_LIBADD@
171 +PULSE_CFLAGS = @PULSE_CFLAGS@
172 +PULSE_LDFLAGS = @PULSE_LDFLAGS@
173 +PULSE_LIBADD = @PULSE_LIBADD@
175 SET_MAKE = @SET_MAKE@
177 diff -urN akode-2.0.1.orig/akode/plugins/jack_sink/Makefile.in akode-2.0.1/akode/plugins/jack_sink/Makefile.in
178 --- akode-2.0.1.orig/akode/plugins/jack_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200
179 +++ akode-2.0.1/akode/plugins/jack_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200
181 PACKAGE_VERSION = @PACKAGE_VERSION@
182 PATH_SEPARATOR = @PATH_SEPARATOR@
183 PKG_CONFIG = @PKG_CONFIG@
184 -POLYP_CFLAGS = @POLYP_CFLAGS@
185 -POLYP_LDFLAGS = @POLYP_LDFLAGS@
186 -POLYP_LIBADD = @POLYP_LIBADD@
187 +PULSE_CFLAGS = @PULSE_CFLAGS@
188 +PULSE_LDFLAGS = @PULSE_LDFLAGS@
189 +PULSE_LIBADD = @PULSE_LIBADD@
191 SET_MAKE = @SET_MAKE@
193 diff -urN akode-2.0.1.orig/akode/plugins/mpc_decoder/Makefile.in akode-2.0.1/akode/plugins/mpc_decoder/Makefile.in
194 --- akode-2.0.1.orig/akode/plugins/mpc_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200
195 +++ akode-2.0.1/akode/plugins/mpc_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200
197 PACKAGE_VERSION = @PACKAGE_VERSION@
198 PATH_SEPARATOR = @PATH_SEPARATOR@
199 PKG_CONFIG = @PKG_CONFIG@
200 -POLYP_CFLAGS = @POLYP_CFLAGS@
201 -POLYP_LDFLAGS = @POLYP_LDFLAGS@
202 -POLYP_LIBADD = @POLYP_LIBADD@
203 +PULSE_CFLAGS = @PULSE_CFLAGS@
204 +PULSE_LDFLAGS = @PULSE_LDFLAGS@
205 +PULSE_LIBADD = @PULSE_LIBADD@
207 SET_MAKE = @SET_MAKE@
209 diff -urN akode-2.0.1.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in akode-2.0.1/akode/plugins/mpc_decoder/mppdec/Makefile.in
210 --- akode-2.0.1.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in 2006-07-23 00:17:11.000000000 +0200
211 +++ akode-2.0.1/akode/plugins/mpc_decoder/mppdec/Makefile.in 2006-09-06 14:38:04.000000000 +0200
213 PACKAGE_VERSION = @PACKAGE_VERSION@
214 PATH_SEPARATOR = @PATH_SEPARATOR@
215 PKG_CONFIG = @PKG_CONFIG@
216 -POLYP_CFLAGS = @POLYP_CFLAGS@
217 -POLYP_LDFLAGS = @POLYP_LDFLAGS@
218 -POLYP_LIBADD = @POLYP_LIBADD@
219 +PULSE_CFLAGS = @PULSE_CFLAGS@
220 +PULSE_LDFLAGS = @PULSE_LDFLAGS@
221 +PULSE_LIBADD = @PULSE_LIBADD@
223 SET_MAKE = @SET_MAKE@
225 diff -urN akode-2.0.1.orig/akode/plugins/mpeg_decoder/Makefile.in akode-2.0.1/akode/plugins/mpeg_decoder/Makefile.in
226 --- akode-2.0.1.orig/akode/plugins/mpeg_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200
227 +++ akode-2.0.1/akode/plugins/mpeg_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200
229 PACKAGE_VERSION = @PACKAGE_VERSION@
230 PATH_SEPARATOR = @PATH_SEPARATOR@
231 PKG_CONFIG = @PKG_CONFIG@
232 -POLYP_CFLAGS = @POLYP_CFLAGS@
233 -POLYP_LDFLAGS = @POLYP_LDFLAGS@
234 -POLYP_LIBADD = @POLYP_LIBADD@
235 +PULSE_CFLAGS = @PULSE_CFLAGS@
236 +PULSE_LDFLAGS = @PULSE_LDFLAGS@
237 +PULSE_LIBADD = @PULSE_LIBADD@
239 SET_MAKE = @SET_MAKE@
241 diff -urN akode-2.0.1.orig/akode/plugins/oss_sink/Makefile.in akode-2.0.1/akode/plugins/oss_sink/Makefile.in
242 --- akode-2.0.1.orig/akode/plugins/oss_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200
243 +++ akode-2.0.1/akode/plugins/oss_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200
245 PACKAGE_VERSION = @PACKAGE_VERSION@
246 PATH_SEPARATOR = @PATH_SEPARATOR@
247 PKG_CONFIG = @PKG_CONFIG@
248 -POLYP_CFLAGS = @POLYP_CFLAGS@
249 -POLYP_LDFLAGS = @POLYP_LDFLAGS@
250 -POLYP_LIBADD = @POLYP_LIBADD@
251 +PULSE_CFLAGS = @PULSE_CFLAGS@
252 +PULSE_LDFLAGS = @PULSE_LDFLAGS@
253 +PULSE_LIBADD = @PULSE_LIBADD@
255 SET_MAKE = @SET_MAKE@
257 diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.am akode-2.0.1/akode/plugins/polyp_sink/Makefile.am
258 --- akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.am 2005-07-15 13:20:03.000000000 +0200
259 +++ akode-2.0.1/akode/plugins/polyp_sink/Makefile.am 2006-09-06 14:38:04.000000000 +0200
261 -INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(POLYP_CFLAGS) $(all_includes)
262 +INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(PULSE_CFLAGS) $(all_includes)
264 lib_LTLIBRARIES = libakode_polyp_sink.la
266 libakode_polyp_sink_la_SOURCES = polyp_sink.cpp
267 -libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(POLYP_LDFLAGS)
268 -libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(POLYP_LIBADD)
269 +libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(PULSE_LDFLAGS)
270 +libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(PULSE_LIBADD)
271 diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.in akode-2.0.1/akode/plugins/polyp_sink/Makefile.in
272 --- akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200
273 +++ akode-2.0.1/akode/plugins/polyp_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200
275 PACKAGE_VERSION = @PACKAGE_VERSION@
276 PATH_SEPARATOR = @PATH_SEPARATOR@
277 PKG_CONFIG = @PKG_CONFIG@
278 -POLYP_CFLAGS = @POLYP_CFLAGS@
279 -POLYP_LDFLAGS = @POLYP_LDFLAGS@
280 -POLYP_LIBADD = @POLYP_LIBADD@
281 +PULSE_CFLAGS = @PULSE_CFLAGS@
282 +PULSE_LDFLAGS = @PULSE_LDFLAGS@
283 +PULSE_LIBADD = @PULSE_LIBADD@
285 SET_MAKE = @SET_MAKE@
287 @@ -265,13 +265,13 @@
288 target_vendor = @target_vendor@
289 unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
290 unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
291 -INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(POLYP_CFLAGS) $(all_includes)
292 +INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(PULSE_CFLAGS) $(all_includes)
293 lib_LTLIBRARIES = libakode_polyp_sink.la
294 libakode_polyp_sink_la_SOURCES = polyp_sink.cpp
295 -#>- libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(POLYP_LDFLAGS)
296 +#>- libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(PULSE_LDFLAGS)
298 -libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED) $(POLYP_LDFLAGS)
299 -libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(POLYP_LIBADD)
300 +libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED) $(PULSE_LDFLAGS)
301 +libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(PULSE_LIBADD)
305 diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/polyp_sink.cpp akode-2.0.1/akode/plugins/polyp_sink/polyp_sink.cpp
306 --- akode-2.0.1.orig/akode/plugins/polyp_sink/polyp_sink.cpp 2005-10-20 22:54:12.000000000 +0200
307 +++ akode-2.0.1/akode/plugins/polyp_sink/polyp_sink.cpp 2006-09-06 15:14:52.000000000 +0200
309 #elif defined(HAVE_INTTYPES_H)
310 #include <inttypes.h>
312 -#include <polyp/polyplib-simple.h>
313 +#include <pulse/simple.h>
315 #include "audioframe.h"
316 #include "audiobuffer.h"
319 bool PolypSink::open() {
321 - m_data->server = pa_simple_new(0, "akode-client", PA_STREAM_PLAYBACK, 0, "", &m_data->sample_spec, 0, 255, &error );
322 + m_data->server = pa_simple_new(0, "akode-client", PA_STREAM_PLAYBACK, 0, "", &m_data->sample_spec, 0, 0, &error );
323 if (!m_data->server || error != 0) {
324 m_data->error = true;
326 diff -urN akode-2.0.1.orig/akode/plugins/src_resampler/Makefile.in akode-2.0.1/akode/plugins/src_resampler/Makefile.in
327 --- akode-2.0.1.orig/akode/plugins/src_resampler/Makefile.in 2006-07-23 00:17:11.000000000 +0200
328 +++ akode-2.0.1/akode/plugins/src_resampler/Makefile.in 2006-09-06 14:38:04.000000000 +0200
330 PACKAGE_VERSION = @PACKAGE_VERSION@
331 PATH_SEPARATOR = @PATH_SEPARATOR@
332 PKG_CONFIG = @PKG_CONFIG@
333 -POLYP_CFLAGS = @POLYP_CFLAGS@
334 -POLYP_LDFLAGS = @POLYP_LDFLAGS@
335 -POLYP_LIBADD = @POLYP_LIBADD@
336 +PULSE_CFLAGS = @PULSE_CFLAGS@
337 +PULSE_LDFLAGS = @PULSE_LDFLAGS@
338 +PULSE_LIBADD = @PULSE_LIBADD@
340 SET_MAKE = @SET_MAKE@
342 diff -urN akode-2.0.1.orig/akode/plugins/sun_sink/Makefile.in akode-2.0.1/akode/plugins/sun_sink/Makefile.in
343 --- akode-2.0.1.orig/akode/plugins/sun_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200
344 +++ akode-2.0.1/akode/plugins/sun_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200
346 PACKAGE_VERSION = @PACKAGE_VERSION@
347 PATH_SEPARATOR = @PATH_SEPARATOR@
348 PKG_CONFIG = @PKG_CONFIG@
349 -POLYP_CFLAGS = @POLYP_CFLAGS@
350 -POLYP_LDFLAGS = @POLYP_LDFLAGS@
351 -POLYP_LIBADD = @POLYP_LIBADD@
352 +PULSE_CFLAGS = @PULSE_CFLAGS@
353 +PULSE_LDFLAGS = @PULSE_LDFLAGS@
354 +PULSE_LIBADD = @PULSE_LIBADD@
356 SET_MAKE = @SET_MAKE@
358 diff -urN akode-2.0.1.orig/akode/plugins/xiph_decoder/Makefile.in akode-2.0.1/akode/plugins/xiph_decoder/Makefile.in
359 --- akode-2.0.1.orig/akode/plugins/xiph_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200
360 +++ akode-2.0.1/akode/plugins/xiph_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200
362 PACKAGE_VERSION = @PACKAGE_VERSION@
363 PATH_SEPARATOR = @PATH_SEPARATOR@
364 PKG_CONFIG = @PKG_CONFIG@
365 -POLYP_CFLAGS = @POLYP_CFLAGS@
366 -POLYP_LDFLAGS = @POLYP_LDFLAGS@
367 -POLYP_LIBADD = @POLYP_LIBADD@
368 +PULSE_CFLAGS = @PULSE_CFLAGS@
369 +PULSE_LDFLAGS = @PULSE_LDFLAGS@
370 +PULSE_LIBADD = @PULSE_LIBADD@
372 SET_MAKE = @SET_MAKE@
374 diff -urN akode-2.0.1.orig/config.h.in akode-2.0.1/config.h.in
375 --- akode-2.0.1.orig/config.h.in 2006-07-23 00:17:04.000000000 +0200
376 +++ akode-2.0.1/config.h.in 2006-09-06 14:44:55.000000000 +0200
378 /* Define if you have libOggFLAC (required for loading OggFLAC files) */
379 #undef HAVE_LIBOGGFLAC
381 -/* Define if you have polyplib (required if you want Polypaudio server
382 +/* Define if you have libpulse (required if you want PulseAudio server
384 -#undef HAVE_LIBPOLYP
385 +#undef HAVE_LIBPULSE
387 /* defined if you have libsamplerate library and header */
388 #undef HAVE_LIBSAMPLERATE
389 diff -urN akode-2.0.1.orig/configure.in akode-2.0.1/configure.in
390 --- akode-2.0.1.orig/configure.in 2006-07-23 00:16:52.000000000 +0200
391 +++ akode-2.0.1/configure.in 2006-09-06 14:45:21.000000000 +0200
392 @@ -400,24 +400,24 @@
393 AC_SUBST(JACK_LDFLAGS)
396 -AC_ARG_WITH(polypaudio,AC_HELP_STRING([--with-polypaudio],[Enable Polypaudio server support @<:@default=check@:>@]),[polypaudio_test="$withval"],[polypaudio_test="yes"])
397 +AC_ARG_WITH(pulseaudio,AC_HELP_STRING([--with-pulseaudio],[Enable PulseAudio server support @<:@default=check@:>@]),[pulseaudio_test="$withval"],[pulseaudio_test="yes"])
399 -if test "x$polypaudio_test" = "xyes" ; then
400 -AC_MSG_CHECKING(for Polypaudio 0.7 or later)
401 -if $PKG_CONFIG --atleast-version 0.7 polyplib-simple >/dev/null 2>&1 ; then
402 - POLYP_CFLAGS="`$PKG_CONFIG --cflags polyplib-simple`"
403 - POLYP_LIBADD="`$PKG_CONFIG --libs-only-l polyplib-simple`"
404 - POLYP_LDFLAGS="`$PKG_CONFIG --libs-only-L polyplib-simple`"
406 +if test "x$pulseaudio_test" = "xyes" ; then
407 +AC_MSG_CHECKING(for PulseAudio 0.9.2 or later)
408 +if $PKG_CONFIG --atleast-version 0.9.2 libpulse-simple >/dev/null 2>&1 ; then
409 + PULSE_CFLAGS="`$PKG_CONFIG --cflags libpulse-simple`"
410 + PULSE_LIBADD="`$PKG_CONFIG --libs-only-l libpulse-simple`"
411 + PULSE_LDFLAGS="`$PKG_CONFIG --libs-only-L libpulse-simple`"
414 - AC_DEFINE(HAVE_LIBPOLYP, 1,
415 - [Define if you have polyplib (required if you want Polypaudio server support)])
416 + AC_DEFINE(HAVE_LIBPULSE, 1,
417 + [Define if you have libpulse (required if you want PulseAudio server support)])
419 AC_MSG_RESULT(not installed)
421 -AC_SUBST(POLYP_CFLAGS)
422 -AC_SUBST(POLYP_LIBADD)
423 -AC_SUBST(POLYP_LDFLAGS)
424 +AC_SUBST(PULSE_CFLAGS)
425 +AC_SUBST(PULSE_LIBADD)
426 +AC_SUBST(PULSE_LDFLAGS)
429 AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=no@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="no"])
431 AM_CONDITIONAL(include_oss_sink, test x$have_oss = xyes)
432 AM_CONDITIONAL(include_sun_sink, test x$have_sun = xyes)
433 AM_CONDITIONAL(include_jack_sink, test x$have_jack = xyes)
434 -AM_CONDITIONAL(include_polyp_sink, test x$have_polyp = xyes)
435 +AM_CONDITIONAL(include_polyp_sink, test x$have_pulse = xyes)
436 AM_CONDITIONAL(include_ffmpeg_decoder, test x$have_ffmpeg = xyes)
438 AC_MSG_CHECKING(for compilable aKode)