Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

changed oss references to alsa (i hope everywhere)

Browse source
This commit is contained in:
fgerlits 2005-07-01 21:44:35 +00:00
parent 387b64e0a5
commit 0b20c3ccf0
4 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

34
livesupport/bin/postInstallGLiveSupport.sh
View file

@ -21,8 +21,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# #
# Author : $Author: mash $ # Author : $Author: fgerlits $
# Version : $Revision: 1.4 $ # Version : $Revision: 1.5 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/postInstallGLiveSupport.sh,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/postInstallGLiveSupport.sh,v $
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -93,10 +93,10 @@ while true; do
scheduler_port=$2; scheduler_port=$2;
shift; shift;; shift; shift;;
-o|--output-dsp) -o|--output-dsp)
output_dsp=$2; output_alsa_device=$2;
shift; shift;; shift; shift;;
-c|--cue_dsp) -c|--cue_alsa_device)
cue_dsp=$2; cue_alsa_device=$2;
shift; shift;; shift; shift;;
--) --)
shift; shift;
@ -126,12 +126,12 @@ if [ "x$scheduler_port" == "x" ]; then
scheduler_port=3344; scheduler_port=3344;
fi fi
if [ "x$output_dsp" == "x" ]; then if [ "x$output_alsa_device" == "x" ]; then
output_dsp=/dev/dsp; output_alsa_device="plughw:0,0";
fi fi
if [ "x$cue_dsp" == "x" ]; then if [ "x$cue_alsa_device" == "x" ]; then
cue_dsp=/dev/dsp; cue_alsa_device="plughw:0,0";
fi fi
echo "Making post-install steps for GLiveSupport."; echo "Making post-install steps for GLiveSupport.";
@ -142,8 +142,8 @@ echo " installation directory: $installdir";
echo " host name: $hostname"; echo " host name: $hostname";
echo " web server port: $http_port"; echo " web server port: $http_port";
echo " scheduler port: $scheduler_port"; echo " scheduler port: $scheduler_port";
echo " live broadcast device: $output_dsp"; echo " live broadcast device: $output_alsa_device";
echo " preview device: $cue_dsp"; echo " preview device: $cue_alsa_device";
echo "" echo ""
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -160,8 +160,8 @@ ls_scheduler_host=$hostname
ls_scheduler_port=$scheduler_port ls_scheduler_port=$scheduler_port
ls_scheduler_urlPrefix= ls_scheduler_urlPrefix=
ls_scheduler_xmlRpcPrefix=RC2 ls_scheduler_xmlRpcPrefix=RC2
ls_output_dsp=$output_dsp ls_output_alsa_device=$output_alsa_device
ls_cue_dsp=$cue_dsp ls_cue_alsa_device=$cue_alsa_device
install_bin=$installdir/bin install_bin=$installdir/bin
@ -183,8 +183,8 @@ ls_scheduler_urlPrefix_s=`echo $ls_scheduler_urlPrefix | \
sed -e "s/\//\\\\\\\\\//g"` sed -e "s/\//\\\\\\\\\//g"`
ls_scheduler_xmlRpcPrefix_s=`echo $ls_scheduler_xmlRpcPrefix | \ ls_scheduler_xmlRpcPrefix_s=`echo $ls_scheduler_xmlRpcPrefix | \
sed -e "s/\//\\\\\\\\\//g"` sed -e "s/\//\\\\\\\\\//g"`
ls_output_dsp_s=`echo $ls_output_dsp | sed -e "s/\//\\\\\\\\\//g"` ls_output_alsa_device_s=`echo $ls_output_alsa_device | sed -e "s/\//\\\\\\\\\//g"`
ls_cue_dsp_s=`echo $ls_cue_dsp | sed -e "s/\//\\\\\\\\\//g"` ls_cue_alsa_device_s=`echo $ls_cue_alsa_device | sed -e "s/\//\\\\\\\\\//g"`
replace_sed_string="s/ls_install_dir/$installdir_s/; \ replace_sed_string="s/ls_install_dir/$installdir_s/; \
s/ls_storageUrlPath/\/$ls_php_urlPrefix_s\/storageServer\/var/; \ s/ls_storageUrlPath/\/$ls_php_urlPrefix_s\/storageServer\/var/; \
@ -193,8 +193,8 @@ replace_sed_string="s/ls_install_dir/$installdir_s/; \
s/ls_alib_xmlRpcPrefix/$ls_alib_xmlRpcPrefix_s/; \ s/ls_alib_xmlRpcPrefix/$ls_alib_xmlRpcPrefix_s/; \
s/ls_php_host/$ls_php_host/; \ s/ls_php_host/$ls_php_host/; \
s/ls_php_port/$ls_php_port/; \ s/ls_php_port/$ls_php_port/; \
s/ls_output_dsp/$ls_output_dsp_s/; \ s/ls_output_alsa_device/$ls_output_alsa_device_s/; \
s/ls_cue_dsp/$ls_cue_dsp_s/; \ s/ls_cue_alsa_device/$ls_cue_alsa_device_s/; \
s/ls_archiveUrlPath/\/$ls_php_urlPrefix_s\/archiveServer\/var/; \ s/ls_archiveUrlPath/\/$ls_php_urlPrefix_s\/archiveServer\/var/; \
s/ls_scheduler_urlPrefix/$ls_scheduler_urlPrefix_s/; \ s/ls_scheduler_urlPrefix/$ls_scheduler_urlPrefix_s/; \
s/ls_scheduler_xmlRpcPrefix/$ls_scheduler_xmlRpcPrefix_s/; \ s/ls_scheduler_xmlRpcPrefix/$ls_scheduler_xmlRpcPrefix_s/; \

18
livesupport/bin/postInstallScheduler.sh
View file

@ -21,8 +21,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# #
# Author : $Author: tomas $ # Author : $Author: fgerlits $
# Version : $Revision: 1.6 $ # Version : $Revision: 1.7 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/postInstallScheduler.sh,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/postInstallScheduler.sh,v $
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -122,7 +122,7 @@ while true; do
dbpassword=$2; dbpassword=$2;
shift; shift;; shift; shift;;
-o|--output-dsp) -o|--output-dsp)
output_dsp=$2; output_alsa_device=$2;
shift; shift;; shift; shift;;
--) --)
shift; shift;
@ -176,8 +176,8 @@ if [ "x$www_root" == "x" ]; then
www_root=/var/www www_root=/var/www
fi fi
if [ "x$output_dsp" == "x" ]; then if [ "x$output_alsa_device" == "x" ]; then
output_dsp=/dev/dsp; output_alsa_device="plughw:0,0";
fi fi
echo "Making post-install steps for the LiveSupport scheduler."; echo "Making post-install steps for the LiveSupport scheduler.";
@ -194,7 +194,7 @@ echo " database user: $dbuser";
echo " database user password: $dbpassword"; echo " database user password: $dbpassword";
echo " apache daemon group: $apache_group"; echo " apache daemon group: $apache_group";
echo " apache document root: $www_root"; echo " apache document root: $www_root";
echo " broadcast device: $output_dsp"; echo " broadcast device: $output_alsa_device";
echo "" echo ""
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -216,7 +216,7 @@ ls_scheduler_host=$hostname
ls_scheduler_port=$scheduler_port ls_scheduler_port=$scheduler_port
ls_scheduler_urlPrefix= ls_scheduler_urlPrefix=
ls_scheduler_xmlRpcPrefix=RC2 ls_scheduler_xmlRpcPrefix=RC2
ls_output_dsp=$output_dsp ls_output_alsa_device=$output_alsa_device
postgres_user=postgres postgres_user=postgres
@ -241,7 +241,7 @@ ls_scheduler_urlPrefix_s=`echo $ls_scheduler_urlPrefix | \
sed -e "s/\//\\\\\\\\\//g"` sed -e "s/\//\\\\\\\\\//g"`
ls_scheduler_xmlRpcPrefix_s=`echo $ls_scheduler_xmlRpcPrefix | \ ls_scheduler_xmlRpcPrefix_s=`echo $ls_scheduler_xmlRpcPrefix | \
sed -e "s/\//\\\\\\\\\//g"` sed -e "s/\//\\\\\\\\\//g"`
ls_output_dsp_s=`echo $ls_output_dsp | sed -e "s/\//\\\\\\\\\//g"` ls_output_alsa_device_s=`echo $ls_output_alsa_device | sed -e "s/\//\\\\\\\\\//g"`
replace_sed_string="s/ls_install_dir/$installdir_s/; \ replace_sed_string="s/ls_install_dir/$installdir_s/; \
s/ls_dbuser/$ls_dbuser/; \ s/ls_dbuser/$ls_dbuser/; \
@ -254,7 +254,7 @@ replace_sed_string="s/ls_install_dir/$installdir_s/; \
s/ls_alib_xmlRpcPrefix/$ls_alib_xmlRpcPrefix_s/; \ s/ls_alib_xmlRpcPrefix/$ls_alib_xmlRpcPrefix_s/; \
s/ls_php_host/$ls_php_host/; \ s/ls_php_host/$ls_php_host/; \
s/ls_php_port/$ls_php_port/; \ s/ls_php_port/$ls_php_port/; \
s/ls_output_dsp/$ls_output_dsp_s/; \ s/ls_output_alsa_device/$ls_output_alsa_device_s/; \
s/ls_archiveUrlPath/\/$ls_php_urlPrefix_s\/archiveServer\/var/; \ s/ls_archiveUrlPath/\/$ls_php_urlPrefix_s\/archiveServer\/var/; \
s/ls_scheduler_urlPrefix/$ls_scheduler_urlPrefix_s/; \ s/ls_scheduler_urlPrefix/$ls_scheduler_urlPrefix_s/; \
s/ls_scheduler_xmlRpcPrefix/$ls_scheduler_xmlRpcPrefix_s/; \ s/ls_scheduler_xmlRpcPrefix/$ls_scheduler_xmlRpcPrefix_s/; \

4
livesupport/products/gLiveSupport/etc/gLiveSupport.xml.template
View file

@ -140,13 +140,13 @@
<outputPlayer> <outputPlayer>
<audioPlayer> <audioPlayer>
<gstreamerPlayer audioDevice = "ls_output_dsp" /> <gstreamerPlayer audioDevice = "ls_output_alsa_device" />
</audioPlayer> </audioPlayer>
</outputPlayer> </outputPlayer>
<cuePlayer> <cuePlayer>
<audioPlayer> <audioPlayer>
<gstreamerPlayer audioDevice = "ls_cue_dsp" /> <gstreamerPlayer audioDevice = "ls_cue_alsa_device" />
</audioPlayer> </audioPlayer>
</cuePlayer> </cuePlayer>

4
livesupport/products/gLiveSupport/etc/gLiveSupport.xml.user-template
View file

@ -140,13 +140,13 @@
<outputPlayer> <outputPlayer>
<audioPlayer> <audioPlayer>
<gstreamerPlayer audioDevice = "ls_output_dsp" /> <gstreamerPlayer audioDevice = "plughw:0,0" />
</audioPlayer> </audioPlayer>
</outputPlayer> </outputPlayer>
<cuePlayer> <cuePlayer>
<audioPlayer> <audioPlayer>
<gstreamerPlayer audioDevice = "ls_cue_dsp" /> <gstreamerPlayer audioDevice = "plughw:0,0" />
</audioPlayer> </audioPlayer>
</cuePlayer> </cuePlayer>