pulse: move helper library back to audio_outout/

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 385942eb8f84005b7b26ab3120782f027464bc29..88749adfdb99e685346d32dd268079a048cfe5cb 100644 (file)
--- 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 a792d75cfac66c8a20bea7a0891dc4a3d11599ac..1dc22f1805c08ca05ad5450d9b4b72d5738aa3e8 100644 (file)
--- 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 8a0157e23a30ae7f982396186afdeef3ee6ce9ad..242b52b26eaa40bcb386f9509ef1ed830867607a 100644 (file)
--- 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 b477740c47ea30dce9a40e03d2ac35937f8b43ac..39b989861e9ac1017bc315b746c7a80d4d1cf97f 100644 (file)
--- 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 02c9ff12b93b2b6057ddc8839a49afcdb056520f..feecfa722928a732081de7c09c77a359bec260d9 100644 (file)
--- 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 92244eef24c6c9ab8e5ad601e4e811ba3e3bcdc1..a98115451c38fc68a3dea2ab485e2fa46eb72ef8 100644 (file)
--- 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 *);