mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-06 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

call dbus_shutdown() before exiting, to make valgrind output more useful

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1819 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-09-14 21:02:18 +00:00
parent 8775309234
commit 04ed0f9536
4 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -769,7 +769,7 @@ if test "x${dbus}" != xno ; then
LIBS="$LIBS $DBUS_LIBS" LIBS="$LIBS $DBUS_LIBS"
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.])
], ],
[ [
HAVE_DBUS=0 HAVE_DBUS=0

5
src/Makefile.am
View file

@ -135,10 +135,9 @@ pulseaudio_SOURCES = \
daemon/main.c \ daemon/main.c \
pulsecore/gccmacro.h pulsecore/gccmacro.h
pulseaudio_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS) pulseaudio_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSNDFILE_CFLAGS) $(CAP_CFLAGS) $(LIBOIL_CFLAGS) $(DBUS_CFLAGS)
pulseaudio_CPPFLAGS = $(AM_CPPFLAGS) pulseaudio_CPPFLAGS = $(AM_CPPFLAGS)
pulseaudio_LDADD = $(AM_LDADD) libpulsecore.la $(LIBLTDL) \ pulseaudio_LDADD = $(AM_LDADD) libpulsecore.la $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS) $(LIBOIL_LIBS) $(DBUS_LIBS)
$(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS) $(LIBOIL_LIBS)
# This is needed because automake doesn't properly expand the foreach below # This is needed because automake doesn't properly expand the foreach below
pulseaudio_DEPENDENCIES = libpulsecore.la $(PREOPEN_LIBS) pulseaudio_DEPENDENCIES = libpulsecore.la $(PREOPEN_LIBS)

8
src/daemon/main.c
View file

@ -58,6 +58,10 @@
#include <tcpd.h> #include <tcpd.h>
#endif #endif
#ifdef HAVE_DBUS
#include <dbus/dbus.h>
#endif
#include <pulse/mainloop.h> #include <pulse/mainloop.h>
#include <pulse/mainloop-signal.h> #include <pulse/mainloop-signal.h>
#include <pulse/timeval.h> #include <pulse/timeval.h>
@ -745,5 +749,9 @@ finish:
libtool_done(); libtool_done();
#ifdef HAVE_DBUS
dbus_shutdown();
#endif
return retval; return retval;
} }

4
src/modules/dbus-util.c
View file

@ -26,10 +26,10 @@
#include <config.h> #include <config.h>
#endif #endif
#include <pulsecore/log.h>
#include <pulsecore/props.h>
#include <pulse/xmalloc.h> #include <pulse/xmalloc.h>
#include <pulse/timeval.h> #include <pulse/timeval.h>
#include <pulsecore/log.h>
#include <pulsecore/props.h>
#include "dbus-util.h" #include "dbus-util.h"