vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Sep 22 16:41:15 2013 +0300| [38abd1fa4663d636241b4c88e9de72d94c9e2279] | committer: Rémi Denis-Courmont
pulse: move helper library back to audio_outout/ > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=38abd1fa4663d636241b4c88e9de72d94c9e2279 --- modules/Makefile.am | 9 --------- modules/access/pulse.c | 2 +- modules/audio_output/Makefile.am | 6 ++++++ modules/audio_output/pulse.c | 2 +- modules/{ => audio_output}/vlcpulse.c | 2 +- modules/{ => audio_output}/vlcpulse.h | 0 modules/services_discovery/pulse.c | 2 +- 7 files changed, 10 insertions(+), 13 deletions(-) diff --git a/modules/Makefile.am b/modules/Makefile.am index 385942e..88749ad 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -43,15 +43,6 @@ endif dist_noinst_SCRIPTS = genmf list.sh module.rc.in dist_noinst_DATA = MODULES_LIST -libvlc_pulse_la_SOURCES = vlcpulse.c vlcpulse.h -libvlc_pulse_la_CPPFLAGS = -DMODULE_STRING=\"pulse\" -libvlc_pulse_la_CFLAGS = $(AM_CFLAGS) $(PULSE_CFLAGS) -libvlc_pulse_la_LDFLAGS = -static -libvlc_pulse_la_LIBADD = $(PULSE_LIBS) -if HAVE_PULSE -noinst_LTLIBRARIES += libvlc_pulse.la -endif - include common.am include access/Makefile.am include audio_output/Makefile.am diff --git a/modules/access/pulse.c b/modules/access/pulse.c index a792d75..1dc22f1 100644 --- a/modules/access/pulse.c +++ b/modules/access/pulse.c @@ -29,7 +29,7 @@ #include <vlc_demux.h> #include <vlc_plugin.h> #include <pulse/pulseaudio.h> -#include "../vlcpulse.h" +#include "audio_output/vlcpulse.h" #define HELP_TEXT N_( \ "Pass pulse:// to open the default PulseAudio source, " \ diff --git a/modules/audio_output/Makefile.am b/modules/audio_output/Makefile.am index 8a0157e..242b52b 100644 --- a/modules/audio_output/Makefile.am +++ b/modules/audio_output/Makefile.am @@ -37,10 +37,16 @@ if HAVE_ALSA aout_LTLIBRARIES += libalsa_plugin.la endif +libvlc_pulse_la_SOURCES = audio_output/vlcpulse.c audio_output/vlcpulse.h +libvlc_pulse_la_CPPFLAGS = -DMODULE_STRING=\"pulse\" +libvlc_pulse_la_CFLAGS = $(AM_CFLAGS) $(PULSE_CFLAGS) +libvlc_pulse_la_LDFLAGS = -static +libvlc_pulse_la_LIBADD = $(PULSE_LIBS) libpulse_plugin_la_SOURCES = audio_output/pulse.c libpulse_plugin_la_CFLAGS = $(AM_CFLAGS) $(PULSE_CFLAGS) libpulse_plugin_la_LIBADD = libvlc_pulse.la $(PULSE_LIBS) $(LIBM) if HAVE_PULSE +noinst_LTLIBRARIES += libvlc_pulse.la aout_LTLIBRARIES += libpulse_plugin.la endif diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c index b477740..39b9898 100644 --- a/modules/audio_output/pulse.c +++ b/modules/audio_output/pulse.c @@ -32,7 +32,7 @@ #include <vlc_cpu.h> #include <pulse/pulseaudio.h> -#include "vlcpulse.h" +#include "audio_output/vlcpulse.h" #if !PA_CHECK_VERSION(0,9,22) # include <vlc_xlib.h> #endif diff --git a/modules/vlcpulse.c b/modules/audio_output/vlcpulse.c similarity index 99% rename from modules/vlcpulse.c rename to modules/audio_output/vlcpulse.c index 02c9ff1..feecfa7 100644 --- a/modules/vlcpulse.c +++ b/modules/audio_output/vlcpulse.c @@ -27,7 +27,7 @@ #include <vlc_common.h> #include <pulse/pulseaudio.h> -#include "vlcpulse.h" +#include "audio_output/vlcpulse.h" #include <assert.h> #include <stdlib.h> #include <locale.h> diff --git a/modules/vlcpulse.h b/modules/audio_output/vlcpulse.h similarity index 100% rename from modules/vlcpulse.h rename to modules/audio_output/vlcpulse.h diff --git a/modules/services_discovery/pulse.c b/modules/services_discovery/pulse.c index 92244ee..a981154 100644 --- a/modules/services_discovery/pulse.c +++ b/modules/services_discovery/pulse.c @@ -31,7 +31,7 @@ #include <vlc_plugin.h> #include <vlc_services_discovery.h> #include <pulse/pulseaudio.h> -#include "../vlcpulse.h" +#include "audio_output/vlcpulse.h" static int Open (vlc_object_t *); static void Close (vlc_object_t *); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
