mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote branch 'phish3/master'

Browse source
This commit is contained in:
Lennart Poettering 2009-10-07 03:43:24 +02:00
commit 9f226d25d6
4 changed files with 2166 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -1198,6 +1198,7 @@ if test "x${dbus}" != xno || test "x${bluez}" != xno || test "x${hal}" != xno ;
HAVE_DBUS=1 HAVE_DBUS=1
saved_LIBS="$LIBS" saved_LIBS="$LIBS"
LIBS="$LIBS $DBUS_LIBS" LIBS="$LIBS $DBUS_LIBS"
CFLAGS="$CFLAGS $DBUS_CFLAGS"
AC_CHECK_FUNCS(dbus_watch_get_unix_fd) AC_CHECK_FUNCS(dbus_watch_get_unix_fd)
LIBS="$saved_LIBS" LIBS="$saved_LIBS"
AC_DEFINE([HAVE_DBUS], 1, [Have D-Bus.]) AC_DEFINE([HAVE_DBUS], 1, [Have D-Bus.])

7
src/Makefile.am
View file

@ -1009,6 +1009,7 @@ modlibexec_LTLIBRARIES += \
module-combine.la \ module-combine.la \
module-remap-sink.la \ module-remap-sink.la \
module-ladspa-sink.la \ module-ladspa-sink.la \
module-equalizer-sink.la \
module-esound-sink.la \ module-esound-sink.la \
module-tunnel-sink.la \ module-tunnel-sink.la \
module-tunnel-source.la \ module-tunnel-source.la \
@ -1204,6 +1205,7 @@ SYMDEF_FILES = \
modules/module-combine-symdef.h \ modules/module-combine-symdef.h \
modules/module-remap-sink-symdef.h \ modules/module-remap-sink-symdef.h \
modules/module-ladspa-sink-symdef.h \ modules/module-ladspa-sink-symdef.h \
modules/module-equalizer-sink-symdef.h \
modules/module-esound-compat-spawnfd-symdef.h \ modules/module-esound-compat-spawnfd-symdef.h \
modules/module-esound-compat-spawnpid-symdef.h \ modules/module-esound-compat-spawnpid-symdef.h \
modules/module-match-symdef.h \ modules/module-match-symdef.h \
@ -1403,6 +1405,11 @@ module_ladspa_sink_la_CFLAGS = -DLADSPA_PATH=\"$(libdir)/ladspa:/usr/local/lib/l
module_ladspa_sink_la_LDFLAGS = $(MODULE_LDFLAGS) module_ladspa_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
module_ladspa_sink_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la module_ladspa_sink_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
module_equalizer_sink_la_SOURCES = modules/module-equalizer-sink.c
module_equalizer_sink_la_CFLAGS = $(AM_CFLAGS)
module_equalizer_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
module_equalizer_sink_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) -lfftw3f libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
module_match_la_SOURCES = modules/module-match.c module_match_la_SOURCES = modules/module-match.c
module_match_la_LDFLAGS = $(MODULE_LDFLAGS) module_match_la_LDFLAGS = $(MODULE_LDFLAGS)
module_match_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la module_match_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la

2157
src/modules/module-equalizer-sink.c Executable file
View file

File diff suppressed because it is too large Load diff

2
src/pulsecore/memblock.c
View file

@ -54,7 +54,7 @@
* stored in SHM and our OS does not commit the memory before we use * stored in SHM and our OS does not commit the memory before we use
* it for the first time. */ * it for the first time. */
#define PA_MEMPOOL_SLOTS_MAX 1024 #define PA_MEMPOOL_SLOTS_MAX 1024
#define PA_MEMPOOL_SLOT_SIZE (64*1024) #define PA_MEMPOOL_SLOT_SIZE (128*1024)
#define PA_MEMEXPORT_SLOTS_MAX 128 #define PA_MEMEXPORT_SLOTS_MAX 128