[Debconf-video-commits] r624 - fai-config/files/home/dvswitch/.Xsession

[Holger Levsen]

Author: holger
Date: 2010-08-03 21:49:01 +0000 (Tue, 03 Aug 2010)
New Revision: 624

Modified:
   fai-config/files/home/dvswitch/.Xsession/scratchy
   fai-config/files/home/dvswitch/.Xsession/selma
Log:
as in use now

Modified: fai-config/files/home/dvswitch/.Xsession/scratchy
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/scratchy	2010-08-03 15:47:50 UTC (rev 623)
+++ fai-config/files/home/dvswitch/.Xsession/scratchy	2010-08-03 21:49:01 UTC (rev 624)
@@ -14,18 +14,18 @@
 # setup dvswitch
 xterm -e dvswitch &
 sleep 1
-#xterm -e dvsource-firewire &
-dvsource-firewire &
+xterm -e dvsource-firewire &
+#dvsource-firewire &
 sleep 3
 dc-start-source firewire:itchy &
 sleep 3
 dc-start-source firewire:blinky &
 sleep 3
-dvsource-alsa -h scratchy -p 4321 -s ntsc hw:1,1 &
+dvsource-alsa -h scratchy -p 4321 -s ntsc hw:1,0 &
 sleep 3
 dvsource-file -l /home/dvswitch/loopdc10f.dv &
 xterm -e "dc-start-sink file:scratchy" &
-xterm -e "while true ; do ssh todd 'ps fax | grep ffmpeg2theora| grep interschool| grep -v grep | sed -e "s/^ *//" |cut -d " " -f1 | | xargs -n 1 kill -9'  ; dc-start-sink icecast:todd ; done" &
+xterm -e "while true ; do dc-start-sink icecast:todd ; done" &
 
 # last command
 xfce4-session

Modified: fai-config/files/home/dvswitch/.Xsession/selma
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/selma	2010-08-03 15:47:50 UTC (rev 623)
+++ fai-config/files/home/dvswitch/.Xsession/selma	2010-08-03 21:49:01 UTC (rev 624)
@@ -23,7 +23,7 @@
 sleep 3
 dc-start-source firewire:sideshow &
 sleep 3
-dc-start-source alsa:selma/hw:1,1 &
+dc-start-source alsa:selma/hw:1 &
 sleep 3
 dvsource-file -l /home/dvswitch/loopdc10f.dv &
 xterm -e "dc-start-sink file:selma" &