mirror of
https://code.videolan.org/videolan/vlc
synced 2024-09-28 23:09:59 +02:00
pulse: move helper library back to audio_outout/
This commit is contained in:
parent
9b0de3ea18
commit
011527f378
@ -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
|
||||
|
@ -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, " \
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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>
|
@ -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 *);
|
||||
|
Loading…
Reference in New Issue
Block a user