From 0387b30994185a44e6df737c529ddda24325c671 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Thu, 25 May 2006 13:56:14 +0000 Subject: Use only the basename of libpolypdsp.so so that it will work on multi-arch systems. git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@969 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/utils/padsp | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 src/utils/padsp (limited to 'src/utils/padsp') diff --git a/src/utils/padsp b/src/utils/padsp new file mode 100644 index 00000000..9f38cf3d --- /dev/null +++ b/src/utils/padsp @@ -0,0 +1,30 @@ +#!/bin/sh + +# $Id$ +# +# This file is part of polypaudio. +# +# polypaudio 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. +# +# polypaudio 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 polypaudio; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +if [ x"$LD_PRELOAD" = x ] ; then + LD_PRELOAD="libpolypdsp.so" +else + LD_PRELOAD="$LD_PRELOAD libpolypdsp.so" +fi + +export LD_PRELOAD + +exec "$@" -- cgit From ea7995b764ed716bbe17576ebdba3a435de095d3 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Thu, 25 May 2006 15:44:24 +0000 Subject: Fix padsp script so that it accepts parameters, setting relevant environment variables as needed. git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@970 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/utils/padsp | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'src/utils/padsp') diff --git a/src/utils/padsp b/src/utils/padsp index 9f38cf3d..dc89bfb7 100644 --- a/src/utils/padsp +++ b/src/utils/padsp @@ -19,6 +19,57 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA. +while getopts 'hs:n:m:MSDd' param ; do + case $param in + s) + POLYP_SERVER="$OPTARG" + export POLYP_SERVER + ;; + n) + PA_CLIENT_NAME="$OPTARG" + export PA_CLIENT_NAME + ;; + m) + PA_STREAM_NAME="$OPTARG" + export PA_STREAM_NAME + ;; + M) + PA_NO_MIXER=1 + export PA_NO_MIXER + ;; + S) + PA_NO_SNDSTAT=1 + export PA_NO_SNDSTAT + ;; + D) + PA_NO_DSP=1 + export PA_NO_DSP + ;; + d) + PADSP_DEBUG=1 + export PADSP_DEBUG + ;; + *) + echo "$0 - redirect OSS audio devices to Polypaudio" + echo " " + echo "$0 [options] application [arguments]" + echo " " + echo "options:" + echo " -h show brief help" + echo " -s [:] contact a specific Polypaudio server" + echo " -n client name to report to the server" + echo " -m stream name to report to the server" + echo " -M disable /dev/mixer emulation" + echo " -S disable /dev/sndstat emulation" + echo " -D disable /dev/dsp emulation" + echo " -d enable debug output" + exit 0 + ;; + esac +done + +shift $(( $OPTIND - 1 )) + if [ x"$LD_PRELOAD" = x ] ; then LD_PRELOAD="libpolypdsp.so" else -- cgit From b754d5095e8c1bbf41e7c0147dfb2328145a2c83 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Thu, 25 May 2006 17:27:06 +0000 Subject: Wrong prefix used in the padsp script. git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@975 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/utils/padsp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/utils/padsp') diff --git a/src/utils/padsp b/src/utils/padsp index dc89bfb7..b43535b6 100644 --- a/src/utils/padsp +++ b/src/utils/padsp @@ -26,24 +26,24 @@ while getopts 'hs:n:m:MSDd' param ; do export POLYP_SERVER ;; n) - PA_CLIENT_NAME="$OPTARG" - export PA_CLIENT_NAME + PADSP_CLIENT_NAME="$OPTARG" + export PADSP_CLIENT_NAME ;; m) - PA_STREAM_NAME="$OPTARG" - export PA_STREAM_NAME + PADSP_STREAM_NAME="$OPTARG" + export PADSP_STREAM_NAME ;; M) - PA_NO_MIXER=1 - export PA_NO_MIXER + PADSP_NO_MIXER=1 + export PADSP_NO_MIXER ;; S) - PA_NO_SNDSTAT=1 - export PA_NO_SNDSTAT + PADSP_NO_SNDSTAT=1 + export PADSP_NO_SNDSTAT ;; D) - PA_NO_DSP=1 - export PA_NO_DSP + PADSP_NO_DSP=1 + export PADSP_NO_DSP ;; d) PADSP_DEBUG=1 -- cgit From 3fa491dc905edb8f54b10bff0b896e8ad7f733c6 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Thu, 15 Jun 2006 14:47:14 +0000 Subject: Make debug output in padsp a bit less verbose. Specifying -d twice will give original output. git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1018 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/utils/padsp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/utils/padsp') diff --git a/src/utils/padsp b/src/utils/padsp index b43535b6..27f99336 100644 --- a/src/utils/padsp +++ b/src/utils/padsp @@ -46,7 +46,11 @@ while getopts 'hs:n:m:MSDd' param ; do export PADSP_NO_DSP ;; d) - PADSP_DEBUG=1 + if [ x"$PADSP_DEBUG" = x ]; then + PADSP_DEBUG=1 + else + PADSP_DEBUG=$(( $PADSP_DEBUG + 1 )) + fi export PADSP_DEBUG ;; *) -- cgit From f44ba092651aa75055e109e04b4164ea92ae7fdc Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 19 Jun 2006 21:53:48 +0000 Subject: big s/polyp/pulse/g git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1033 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/utils/padsp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/utils/padsp') diff --git a/src/utils/padsp b/src/utils/padsp index 27f99336..6e7e9f06 100644 --- a/src/utils/padsp +++ b/src/utils/padsp @@ -2,20 +2,20 @@ # $Id$ # -# This file is part of polypaudio. +# This file is part of PulseAudio. # -# polypaudio is free software; you can redistribute it and/or modify +# 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. # -# polypaudio is distributed in the hope that it will be useful, but +# 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 polypaudio; if not, write to the Free Software +# along with PulseAudio; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA. @@ -75,9 +75,9 @@ done shift $(( $OPTIND - 1 )) if [ x"$LD_PRELOAD" = x ] ; then - LD_PRELOAD="libpolypdsp.so" + LD_PRELOAD="libpulsedsp.so" else - LD_PRELOAD="$LD_PRELOAD libpolypdsp.so" + LD_PRELOAD="$LD_PRELOAD libpulsedsp.so" fi export LD_PRELOAD -- cgit From 10b5e997d7a8a4e955ce49cc816fdcd36225ff6e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 19 Jun 2006 22:11:49 +0000 Subject: replace a few remaining uppercase "Polypaudio" occurences with "PulseAudio" git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1036 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/utils/padsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/utils/padsp') diff --git a/src/utils/padsp b/src/utils/padsp index 6e7e9f06..d9ebcbc5 100644 --- a/src/utils/padsp +++ b/src/utils/padsp @@ -54,13 +54,13 @@ while getopts 'hs:n:m:MSDd' param ; do export PADSP_DEBUG ;; *) - echo "$0 - redirect OSS audio devices to Polypaudio" + echo "$0 - redirect OSS audio devices to PulseAudio" echo " " echo "$0 [options] application [arguments]" echo " " echo "options:" echo " -h show brief help" - echo " -s [:] contact a specific Polypaudio server" + echo " -s [:] contact a specific PulseAudio server" echo " -n client name to report to the server" echo " -m stream name to report to the server" echo " -M disable /dev/mixer emulation" -- cgit From 3ff68bd7a57186c6c6def975be3fc7e826c8bbcd Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Tue, 20 Jun 2006 13:02:34 +0000 Subject: Fix the final few occurences of polyp. git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1042 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/utils/padsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/utils/padsp') diff --git a/src/utils/padsp b/src/utils/padsp index d9ebcbc5..bae5a728 100644 --- a/src/utils/padsp +++ b/src/utils/padsp @@ -22,8 +22,8 @@ while getopts 'hs:n:m:MSDd' param ; do case $param in s) - POLYP_SERVER="$OPTARG" - export POLYP_SERVER + PULSE_SERVER="$OPTARG" + export PULSE_SERVER ;; n) PADSP_CLIENT_NAME="$OPTARG" -- cgit From 65691997782da950f1e2f38700321e635cc5f37c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 6 Sep 2006 19:47:53 +0000 Subject: implement a few more ioctl()s, including a subset of SNDCTL_DSP_GETOPTR. Just enough to make JavaSound work. git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1373 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/utils/padsp | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 src/utils/padsp (limited to 'src/utils/padsp') diff --git a/src/utils/padsp b/src/utils/padsp old mode 100644 new mode 100755 -- cgit From 06211b7c8fd329137ae9003818543912a87d9898 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Tue, 13 Feb 2007 15:35:19 +0000 Subject: Add copyright notices to all relevant files. (based on svn log) git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1426 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/utils/padsp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/utils/padsp') diff --git a/src/utils/padsp b/src/utils/padsp index bae5a728..c70c3af7 100755 --- a/src/utils/padsp +++ b/src/utils/padsp @@ -4,6 +4,9 @@ # # This file is part of PulseAudio. # +# Copyright 2006 Lennart Poettering +# Copyright 2006 Pierre Ossman for Cendio AB +# # 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 -- cgit