Browse Source

Add install files to the build

pull/64/head
matt335672 3 years ago
parent
commit
91c239ee58
5 changed files with 77 additions and 2 deletions
  1. +1
    -1
      Makefile.am
  2. +2
    -1
      configure.ac
  3. +33
    -0
      instfiles/Makefile.am
  4. +32
    -0
      instfiles/load_pa_modules.sh
  5. +9
    -0
      instfiles/pulseaudio-xrdp.desktop.in

+ 1
- 1
Makefile.am View File

@ -1,4 +1,4 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src
SUBDIRS = src instfiles
EXTRA_DIST = bootstrap.sh

+ 2
- 1
configure.ac View File

@ -80,5 +80,6 @@ AC_TYPE_UINT32_T
AC_CHECK_FUNCS([memset socket])
AC_CONFIG_FILES([Makefile
src/Makefile])
src/Makefile
instfiles/Makefile])
AC_OUTPUT

+ 33
- 0
instfiles/Makefile.am View File

@ -0,0 +1,33 @@
EXTRA_DIST = \
load_pa_modules.sh \
pulseaudio-xrdp.desktop.in
#
# substitute directories in service file
#
CLEANFILES= \
pulseaudio-xrdp.desktop
SUBST_VARS = sed \
-e 's|@pkglibexecdir[@]|$(pkglibexecdir)|g'
subst_verbose = $(subst_verbose_@AM_V@)
subst_verbose_ = $(subst_verbose_@AM_DEFAULT_V@)
subst_verbose_0 = @echo " SUBST $@";
SUFFIXES = .in
.in:
$(subst_verbose)$(SUBST_VARS) $< > $@
#
# files for all platforms
#
# Don't use sysconfdir for this one as it won't work!
xdgautostartdir=/etc/xdg/autostart
xdgautostart_DATA = \
pulseaudio-xrdp.desktop
pkglibexec_SCRIPTS = \
load_pa_modules.sh

+ 32
- 0
instfiles/load_pa_modules.sh View File

@ -0,0 +1,32 @@
#!/bin/sh
PACTL=/usr/bin/pactl
if [ -n "$XRDP_SESSION" -a -n "$XRDP_SOCKET_PATH" ]; then
# These values are not present on xrdp versions before v0.9.8
if [ -z "$XRDP_PULSE_SINK_SOCKET" -o \
-z "$XRDP_PULSE_SOURCE_SOCKET" ]; then
displaynum=${DISPLAY##*:}
displaynum=${displaynum%.*}
XRDP_PULSE_SINK_SOCKET=xrdp_chansrv_audio_out_socket_$displaynum
XRDP_PULSE_SOURCE_SOCKET=xrdp_chansrv_audio_in_socket_$displaynum
fi
# Don't check for the presence of the sockets, as if the modules
# are loaded they won't be there
# Unload modules
$PACTL unload-module module-xrdp-sink >/dev/null 2>&1
$PACTL unload-module module-xrdp-source >/dev/null 2>&1
# Reload modules
$PACTL load-module module-xrdp-sink \
xrdp_socket_path=$XRDP_SOCKET_PATH \
xrdp_pulse_sink_socket=$XRDP_PULSE_SINK_SOCKET && \
\
$PACTL load-module module-xrdp-source \
xrdp_socket_path=$XRDP_SOCKET_PATH \
xrdp_pulse_source_socket=$XRDP_PULSE_SOURCE_SOCKET
fi
exit $?

+ 9
- 0
instfiles/pulseaudio-xrdp.desktop.in View File

@ -0,0 +1,9 @@
[Desktop Entry]
Version=1.0
Name=PulseAudio xrdp modules
Comment=Load PulseAudio Modules for xrdp
Exec=@pkglibexecdir@/load_pa_modules.sh
Terminal=false
Type=Application
Categories=
GenericName=

Loading…
Cancel
Save