Merge remote branch 'coling/history'

This commit is contained in:
Lennart Poettering 2009-10-07 03:46:06 +02:00
commit d0b478e9a6
10 changed files with 2191 additions and 5 deletions

View 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;

View 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-device-manager "do_routing=1" > /dev/null
fi