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

[Holger Levsen]

Author: holger
Date: 2010-08-01 16:54:58 +0000 (Sun, 01 Aug 2010)
New Revision: 617

Modified:
   fai-config/files/home/dvswitch/.Xsession/scratchy
Log:
current version of .Xession for scratchy

Modified: fai-config/files/home/dvswitch/.Xsession/scratchy
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/scratchy	2010-08-01 16:50:10 UTC (rev 616)
+++ fai-config/files/home/dvswitch/.Xsession/scratchy	2010-08-01 16:54:58 UTC (rev 617)
@@ -6,8 +6,8 @@
 setxkbmap -option terminate:ctrl_alt_bksp &
 
 # 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 barney 'ps fax | grep "dvsink-files -h scratchy -p 4321"|grep -v grep | sed -e "s/^ *//" |cut -d " " -f1| xargs -n 1 kill -9'
+xterm -e ssh todd 'ps fax | grep "bash -c dvsink-command -h scratchy -p 4321 -- ffmpeg2theora"|grep -v grep | sed -e "s/^ *//" | cut -d " " -f1  | xargs -n 1 kill -9' 
 xterm -e ssh blinky 'ps fax | grep "dvgrab -noavc -"|grep -v grep | sed -e "s/^ *//" |cut -d " " -f1  | xargs -n 1 kill -9' 
 xterm -e ssh itchy 'ps fax | grep "dvgrab -noavc -"|grep -v grep | sed -e "s/^ *//" |cut -d " " -f1  | xargs -n 1 kill -9' 
 
@@ -16,10 +16,13 @@
 sleep 1
 #xterm -e dvsource-firewire &
 dvsource-firewire &
+sleep 3
 dc-start-source firewire:itchy &
+sleep 3
 dc-start-source firewire:blinky &
-#dvsource-firewire &
-sleep 1
+sleep 3
+dvsource-alsa -h scratchy -p 4321 -s ntsc hw:1 &
+sleep 3
 dvsource-file -l /home/dvswitch/loopdc10f.dv &
 xterm -e "dc-start-sink file:scratchy" &
 xterm -e "dc-start-sink icecast:todd" &