mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-11-03 09:01:50 -05:00 
			
		
		
		
	device-manager: Add some scripts that are only run under KDE to load/initialise module-device-manager with routing turned on.
This commit is contained in:
		
							parent
							
								
									996fc1f2e2
								
							
						
					
					
						commit
						3130403c81
					
				
					 3 changed files with 52 additions and 3 deletions
				
			
		| 
						 | 
					@ -117,9 +117,11 @@ EXTRA_DIST = \
 | 
				
			||||||
		depmod.py \
 | 
							depmod.py \
 | 
				
			||||||
		daemon/esdcompat.in \
 | 
							daemon/esdcompat.in \
 | 
				
			||||||
		daemon/start-pulseaudio-x11.in \
 | 
							daemon/start-pulseaudio-x11.in \
 | 
				
			||||||
 | 
							daemon/start-pulseaudio-kde.in \
 | 
				
			||||||
		utils/padsp \
 | 
							utils/padsp \
 | 
				
			||||||
		modules/module-defs.h.m4 \
 | 
							modules/module-defs.h.m4 \
 | 
				
			||||||
		daemon/pulseaudio.desktop.in \
 | 
							daemon/pulseaudio.desktop.in \
 | 
				
			||||||
 | 
							daemon/pulseaudio-kde.desktop.in \
 | 
				
			||||||
		map-file \
 | 
							map-file \
 | 
				
			||||||
		daemon/pulseaudio-system.conf \
 | 
							daemon/pulseaudio-system.conf \
 | 
				
			||||||
		modules/alsa/mixer/profile-sets/default.conf \
 | 
							modules/alsa/mixer/profile-sets/default.conf \
 | 
				
			||||||
| 
						 | 
					@ -155,7 +157,8 @@ dbuspolicy_DATA = \
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if HAVE_X11
 | 
					if HAVE_X11
 | 
				
			||||||
xdgautostart_in_files = \
 | 
					xdgautostart_in_files = \
 | 
				
			||||||
		daemon/pulseaudio.desktop.in
 | 
							daemon/pulseaudio.desktop.in \
 | 
				
			||||||
 | 
							daemon/pulseaudio-kde.desktop.in
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
xdgautostart_DATA = $(xdgautostart_in_files:.desktop.in=.desktop)
 | 
					xdgautostart_DATA = $(xdgautostart_in_files:.desktop.in=.desktop)
 | 
				
			||||||
@INTLTOOL_DESKTOP_RULE@
 | 
					@INTLTOOL_DESKTOP_RULE@
 | 
				
			||||||
| 
						 | 
					@ -217,7 +220,7 @@ if HAVE_AVAHI
 | 
				
			||||||
bin_PROGRAMS += pabrowse
 | 
					bin_PROGRAMS += pabrowse
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bin_SCRIPTS = esdcompat start-pulseaudio-x11
 | 
					bin_SCRIPTS = esdcompat start-pulseaudio-x11 start-pulseaudio-kde
 | 
				
			||||||
 | 
					
 | 
				
			||||||
pacat_SOURCES = utils/pacat.c
 | 
					pacat_SOURCES = utils/pacat.c
 | 
				
			||||||
pacat_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la $(LIBSNDFILE_LIBS)
 | 
					pacat_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINORMICRO@.la $(LIBSNDFILE_LIBS)
 | 
				
			||||||
| 
						 | 
					@ -1713,7 +1716,7 @@ module_rygel_media_server_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 | 
				
			||||||
#        Some minor stuff         #
 | 
					#        Some minor stuff         #
 | 
				
			||||||
###################################
 | 
					###################################
 | 
				
			||||||
 | 
					
 | 
				
			||||||
CLEANFILES = esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11 daemon/pulseaudio.desktop
 | 
					CLEANFILES = esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11 start-pulseaudio-kde daemon/pulseaudio.desktop daemon/pulseaudio-kde.desktop
 | 
				
			||||||
 | 
					
 | 
				
			||||||
esdcompat: daemon/esdcompat.in Makefile
 | 
					esdcompat: daemon/esdcompat.in Makefile
 | 
				
			||||||
	sed -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
 | 
						sed -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
 | 
				
			||||||
| 
						 | 
					@ -1726,6 +1729,11 @@ start-pulseaudio-x11: daemon/start-pulseaudio-x11.in Makefile
 | 
				
			||||||
		-e 's,@PACTL_BINARY\@,$(bindir)/pactl,g' < $< > $@
 | 
							-e 's,@PACTL_BINARY\@,$(bindir)/pactl,g' < $< > $@
 | 
				
			||||||
	chmod +x start-pulseaudio-x11
 | 
						chmod +x start-pulseaudio-x11
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					start-pulseaudio-kde: daemon/start-pulseaudio-kde.in Makefile
 | 
				
			||||||
 | 
						sed -e 's,@PA_BINARY\@,$(PA_BINARY),g' \
 | 
				
			||||||
 | 
							-e 's,@PACTL_BINARY\@,$(bindir)/pactl,g' < $< > $@
 | 
				
			||||||
 | 
						chmod +x start-pulseaudio-kde
 | 
				
			||||||
 | 
					
 | 
				
			||||||
client.conf: pulse/client.conf.in Makefile
 | 
					client.conf: pulse/client.conf.in Makefile
 | 
				
			||||||
	sed -e 's,@PA_BINARY\@,$(PA_BINARY),g' < $< > $@
 | 
						sed -e 's,@PA_BINARY\@,$(PA_BINARY),g' < $< > $@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										11
									
								
								src/daemon/pulseaudio-kde.desktop.in
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								src/daemon/pulseaudio-kde.desktop.in
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,11 @@
 | 
				
			||||||
 | 
					[Desktop Entry]
 | 
				
			||||||
 | 
					Version=1.0
 | 
				
			||||||
 | 
					Encoding=UTF-8
 | 
				
			||||||
 | 
					_Name=PulseAudio Sound System KDE Routing Policy
 | 
				
			||||||
 | 
					_Comment=Start the PulseAudio Sound System with KDE Routing Policy
 | 
				
			||||||
 | 
					Exec=start-pulseaudio-kde
 | 
				
			||||||
 | 
					Terminal=false
 | 
				
			||||||
 | 
					Type=Application
 | 
				
			||||||
 | 
					Categories=
 | 
				
			||||||
 | 
					GenericName=
 | 
				
			||||||
 | 
					OnlyShowIn=KDE;
 | 
				
			||||||
							
								
								
									
										30
									
								
								src/daemon/start-pulseaudio-kde.in
									
										
									
									
									
										Executable file
									
								
							
							
						
						
									
										30
									
								
								src/daemon/start-pulseaudio-kde.in
									
										
									
									
									
										Executable file
									
								
							| 
						 | 
					@ -0,0 +1,30 @@
 | 
				
			||||||
 | 
					#!/bin/sh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# This file is part of PulseAudio.
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# PulseAudio is free software; you can redistribute it and/or modify
 | 
				
			||||||
 | 
					# it under the terms of the GNU Lesser General Public License as published by
 | 
				
			||||||
 | 
					# the Free Software Foundation; either version 2 of the License, or
 | 
				
			||||||
 | 
					# (at your option) any later version.
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# PulseAudio is distributed in the hope that it will be useful, but
 | 
				
			||||||
 | 
					# WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
				
			||||||
 | 
					# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 | 
				
			||||||
 | 
					# General Public License for more details.
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# You should have received a copy of the GNU Lesser General Public License
 | 
				
			||||||
 | 
					# along with PulseAudio; if not, write to the Free Software
 | 
				
			||||||
 | 
					# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 | 
				
			||||||
 | 
					# USA.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					set -e
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[ -z "$PULSE_SERVER" ]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@PA_BINARY@ --start "$@"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					if [ x"$DISPLAY" != x ] ; then
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @PACTL_BINARY@ load-module module-module-device-manager "do_routing=1" > /dev/null
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					fi
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue