From 633de92a04667d2755cba04c1834b423ed2b2de3 Mon Sep 17 00:00:00 2001 From: fgerlits Date: Wed, 20 Jul 2005 09:04:28 +0000 Subject: [PATCH] replaced stale references to OSS audio devices with ALSA names --- livesupport/bin/postInstallGLiveSupport.sh | 18 +++++++++--------- livesupport/bin/postInstallScheduler.sh | 12 ++++++------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/livesupport/bin/postInstallGLiveSupport.sh b/livesupport/bin/postInstallGLiveSupport.sh index 5b9f86b36..82d1a19d1 100755 --- a/livesupport/bin/postInstallGLiveSupport.sh +++ b/livesupport/bin/postInstallGLiveSupport.sh @@ -21,8 +21,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: maroy $ -# Version : $Revision: 1.7 $ +# Author : $Author: fgerlits $ +# Version : $Revision: 1.8 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/postInstallGLiveSupport.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- @@ -59,10 +59,10 @@ printUsage() echo " -p, --port The port of the apache web server [default: 80]" echo " -P, --scheduler-port The port of the scheduler daemon to install" echo " [default: 3344]"; - echo " -o, --output-dsp The dsp device of live-mode broadcast"; - echo " [default: /dev/dsp]"; - echo " -c, --cue-dsp The dsp device of preview listening"; - echo " [default: /dev/dsp]"; + echo " -o, --output-device The audio device of live-mode broadcast"; + echo " [default: plughw:0,0]"; + echo " -c, --cue-device The audio device of preview listening"; + echo " [default: plughw:0,0]"; echo " -h, --help Print this message and exit."; echo ""; } @@ -73,7 +73,7 @@ printUsage() #------------------------------------------------------------------------------- CMD=${0##*/} -opts=$(getopt -o d:H:hp:P:c:o: -l directory:,host:,help,port:,scheduler-port:,cue-dsp:,output-dsp: -n $CMD -- "$@") || exit 1 +opts=$(getopt -o d:H:hp:P:c:o: -l directory:,host:,help,port:,scheduler-port:,cue-device:,output-device: -n $CMD -- "$@") || exit 1 eval set -- "$opts" while true; do case "$1" in @@ -92,10 +92,10 @@ while true; do -P|--scheduler-port) scheduler_port=$2; shift; shift;; - -o|--output-dsp) + -o|--output-device) output_alsa_device=$2; shift; shift;; - -c|--cue_alsa_device) + -c|--cue-device) cue_alsa_device=$2; shift; shift;; --) diff --git a/livesupport/bin/postInstallScheduler.sh b/livesupport/bin/postInstallScheduler.sh index e59f066d7..c2199030f 100755 --- a/livesupport/bin/postInstallScheduler.sh +++ b/livesupport/bin/postInstallScheduler.sh @@ -21,8 +21,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: maroy $ -# Version : $Revision: 1.8 $ +# Author : $Author: fgerlits $ +# Version : $Revision: 1.9 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/postInstallScheduler.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- @@ -72,8 +72,8 @@ printUsage() echo " database. [default: livesupport]"; echo " -w, --dbpassword The database user password."; echo " [default: livesupport]"; - echo " -o, --output-dsp The dsp device of broadcast"; - echo " [default: /dev/dsp]"; + echo " -o, --output-device The audio device of broadcast"; + echo " [default: plughw:0,0]"; echo " -h, --help Print this message and exit."; echo ""; } @@ -84,7 +84,7 @@ printUsage() #------------------------------------------------------------------------------- CMD=${0##*/} -opts=$(getopt -o d:D:g:H:hp:P:r:s:u:w:o: -l apache-group:,database:,dbserver:,dbuser:,dbpassword:,directory:,host:,help,port:,scheduler-port:,www-root:,output-dsp -n $CMD -- "$@") || exit 1 +opts=$(getopt -o d:D:g:H:hp:P:r:s:u:w:o: -l apache-group:,database:,dbserver:,dbuser:,dbpassword:,directory:,host:,help,port:,scheduler-port:,www-root:,output-device -n $CMD -- "$@") || exit 1 eval set -- "$opts" while true; do case "$1" in @@ -121,7 +121,7 @@ while true; do -w|--dbpassword) dbpassword=$2; shift; shift;; - -o|--output-dsp) + -o|--output-device) output_alsa_device=$2; shift; shift;; --)