[Debconf-video-commits] r777 - in fai-config/files: etc/default/debconf-video home/dvswitch/.Xsession

[Holger Levsen]

Author: holger
Date: 2012-07-04 23:13:03 +0000 (Wed, 04 Jul 2012)
New Revision: 777

Modified:
   fai-config/files/etc/default/debconf-video/r2dvswitch
   fai-config/files/home/dvswitch/.Xsession/r2dvswitch
Log:
r2 uses encoder2, dummy

Modified: fai-config/files/etc/default/debconf-video/r2dvswitch
===================================================================
--- fai-config/files/etc/default/debconf-video/r2dvswitch	2012-07-04 23:02:34 UTC (rev 776)
+++ fai-config/files/etc/default/debconf-video/r2dvswitch	2012-07-04 23:13:03 UTC (rev 777)
@@ -4,9 +4,9 @@
 ROOM_NAME="Roberto Teran"
 # Sources and sinks
 SOURCES="firewire:r2dvswitch firewire:r2grab1 firewire:r2grab2"
-SINKS="file:r2dvswitch icecast:encoder1"
+SINKS="file:r2dvswitch icecast:encoder2"
 # Icecast streaming server parameters
-ICECAST_ADDR=encoder1.dc12.debconf.org
+ICECAST_ADDR=encoder2.dc12.debconf.org
 ICECAST_PORT=8000
 ICECAST_PASS=Ieniech6
 ICECAST_PATH=/talkroom2.ogv

Modified: fai-config/files/home/dvswitch/.Xsession/r2dvswitch
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/r2dvswitch	2012-07-04 23:02:34 UTC (rev 776)
+++ fai-config/files/home/dvswitch/.Xsession/r2dvswitch	2012-07-04 23:13:03 UTC (rev 777)
@@ -12,7 +12,7 @@
 xset s off
 
 # kill old sinks in case there are some left
-xterm -e ssh encoder1 'ps fax | grep "bash -c dvsink-command -h encoder1 -p 4321 -- ffmpeg2theora"|grep -v grep | sed -e "s/^ *//" | cut -d " " -f1  | xargs -n 1 kill -9' 
+xterm -e ssh encoder2 'ps fax | grep "bash -c dvsink-command -h encoder2 -p 4321 -- ffmpeg2theora"|grep -v grep | sed -e "s/^ *//" | cut -d " " -f1  | xargs -n 1 kill -9' 
 xterm -e ssh r2grab1 'ps fax | grep "dvgrab -noavc -"|grep -v grep | sed -e "s/^ *//" |cut -d " " -f1  | xargs -n 1 kill -9' 
 xterm -e ssh r2grab2 'ps fax | grep "dvgrab -noavc -"|grep -v grep | sed -e "s/^ *//" |cut -d " " -f1  | xargs -n 1 kill -9' 
 
@@ -27,7 +27,7 @@
 sleep 3
 dvsource-file -l /home/dvswitch/dc12.dv &
 xterm -e "dc-start-sink file:r2dvswitch" &
-xterm -e "while true ; do dc-start-sink icecast:encoder1 ; done" &
+xterm -e "while true ; do dc-start-sink icecast:encoder2 ; done" &
 
 # last command
 xfce4-session