mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

pulseutil: include pid value in gst_pulse_client_name() fallback return value

Browse source 
Fixes bug #627162
This commit is contained in:
Philippe Normand 2010-08-17 16:26:41 +02:00 committed by Sebastian Dröge
parent bc5345bbd3
commit 39d2ef5136
3 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -780,6 +780,10 @@ AG_GST_CHECK_FEATURE(LIBPNG, [Portable Network Graphics library], png, [
dnl *** pulseaudio *** dnl *** pulseaudio ***
translit(dnm, m, l) AM_CONDITIONAL(USE_PULSE, true) translit(dnm, m, l) AM_CONDITIONAL(USE_PULSE, true)
AG_GST_CHECK_FEATURE(PULSE, [pulseaudio plug-in], pulseaudio, [ AG_GST_CHECK_FEATURE(PULSE, [pulseaudio plug-in], pulseaudio, [
dnl used in ext/pulse/pulseutil.c
AC_CHECK_HEADERS([process.h])
AG_GST_PKG_CHECK_MODULES(PULSE, libpulse >= 0.9.10) AG_GST_PKG_CHECK_MODULES(PULSE, libpulse >= 0.9.10)
AG_GST_PKG_CHECK_MODULES(PULSE_0_9_11, libpulse >= 0.9.11) AG_GST_PKG_CHECK_MODULES(PULSE_0_9_11, libpulse >= 0.9.11)
if test x$HAVE_PULSE_0_9_11 = xyes; then if test x$HAVE_PULSE_0_9_11 = xyes; then

9
ext/pulse/pulseutil.c
View file

@ -26,6 +26,13 @@
#include "pulseutil.h" #include "pulseutil.h"
#include <gst/audio/multichannel.h> #include <gst/audio/multichannel.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h> /* getpid on UNIX */
#endif
#ifdef HAVE_PROCESS_H
# include <process.h> /* getpid on win32 */
#endif
static const pa_channel_position_t gst_pos_to_pa[GST_AUDIO_CHANNEL_POSITION_NUM] static const pa_channel_position_t gst_pos_to_pa[GST_AUDIO_CHANNEL_POSITION_NUM]
= { = {
[GST_AUDIO_CHANNEL_POSITION_FRONT_MONO] = PA_CHANNEL_POSITION_MONO, [GST_AUDIO_CHANNEL_POSITION_FRONT_MONO] = PA_CHANNEL_POSITION_MONO,
@ -125,7 +132,7 @@ gst_pulse_client_name (void)
else if (pa_get_binary_name (buf, sizeof (buf))) else if (pa_get_binary_name (buf, sizeof (buf)))
return g_strdup (buf); return g_strdup (buf);
else else
return g_strdup ("GStreamer"); return g_strdup_printf ("GStreamer-pid-%lu", (gulong) getpid ());
} }
pa_channel_map * pa_channel_map *

3
win32/common/config.h
View file

@ -255,6 +255,9 @@
/* Define to enable OSX video (used by osxvideosink). */ /* Define to enable OSX video (used by osxvideosink). */
#undef HAVE_OSX_VIDEO #undef HAVE_OSX_VIDEO
/* Define to 1 if you have the <process.h> header file. */
#define HAVE_PROCESS_H 1
/* Define to enable pulseaudio plug-in (used by pulseaudio). */ /* Define to enable pulseaudio plug-in (used by pulseaudio). */
#undef HAVE_PULSE #undef HAVE_PULSE