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

[Holger Levsen]

Author: holger
Date: 2011-07-21 17:35:37 +0000 (Thu, 21 Jul 2011)
New Revision: 679

Modified:
   fai-config/files/home/dvswitch/.Xsession/scratchy
   fai-config/files/home/dvswitch/.Xsession/selma
Log:
adaptions fro this year

Modified: fai-config/files/home/dvswitch/.Xsession/scratchy
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/scratchy	2011-07-21 16:48:33 UTC (rev 678)
+++ fai-config/files/home/dvswitch/.Xsession/scratchy	2011-07-21 17:35:37 UTC (rev 679)
@@ -21,9 +21,9 @@
 sleep 3
 dc-start-source firewire:blinky &
 sleep 3
-dvsource-alsa -h scratchy -p 4321 -s ntsc hw:1,0 &
-sleep 3
-dvsource-file -l /home/dvswitch/loopdc10f.dv &
+#dvsource-alsa -h scratchy -p 4321 -s pal hw:1,0 &
+#sleep 3
+dvsource-file -l /home/dvswitch/dc11simple.ogv &
 xterm -e "dc-start-sink file:scratchy" &
 xterm -e "while true ; do dc-start-sink icecast:todd ; done" &
 

Modified: fai-config/files/home/dvswitch/.Xsession/selma
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/selma	2011-07-21 16:48:33 UTC (rev 678)
+++ fai-config/files/home/dvswitch/.Xsession/selma	2011-07-21 17:35:37 UTC (rev 679)
@@ -8,26 +8,26 @@
 # kill old sinks in case there are some left
 #xterm -e ssh barney 'ps fax | grep "dvsink-files -h scratchy -p 4321"|grep -v grep|cut -d " " -f1| xargs -n 1 kill -9'
 #xterm -e ssh daffy 'ps fax | grep "bash -c dvsink-command -h scratchy -p 4321 -- ffmpeg2theora"|grep -v grep|cut -d " " -f1  | xargs -n 1 kill -9' 
+xterm -e ssh todd 'ps fax | grep "bash -c dvsink-command -h selma -p 4321 -- ffmpeg2theora"|grep -v grep | sed -e "s/^ *//" | cut -d " " -f1  | xargs -n 1 kill -9'
 
 xterm -e ssh jackie 'ps fax | grep "dvgrab -noavc -"|grep -v grep | sed -e "s/^ *//" |cut -d " " -f1  | xargs -n 1 kill -9' 
-xterm -e ssh sideshow 'ps fax | grep "dvgrab -noavc -"|grep -v grep | sed -e "s/^ *//" |cut -d " " -f1  | xargs -n 1 kill -9' 
 xterm -e ssh patty 'ps fax | grep "dvgrab -noavc -"|grep -v grep | sed -e "s/^ *//" |cut -d " " -f1  | xargs -n 1 kill -9' 
 #sleep 1
 
 # setup dvswitch
 xterm -e dvswitch &
 sleep 1
+xterm -e dvsource-firewire &
+sleep 1
 dc-start-source firewire:jackie &
 sleep 3
 dc-start-source firewire:patty &
 sleep 3
-dc-start-source firewire:sideshow &
-sleep 3
-dc-start-source alsa:selma/hw:1 &
-sleep 3
-dvsource-file -l /home/dvswitch/loopdc10f.dv &
+#dc-start-source alsa:selma/hw:1 &
+#sleep 3
+dvsource-file -l /home/dvswitch/dc11simple.ogv &
 xterm -e "dc-start-sink file:selma" &
-xterm -e "while true ; do dc-start-sink icecast:ned ; done" &
+xterm -e "while true ; do dc-start-sink icecast:todd ; done" &
 
 
 # last command