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

[Ben Hutchings]

Author: benh
Date: 2011-07-22 15:07:17 +0000 (Fri, 22 Jul 2011)
New Revision: 689

Modified:
   fai-config/files/home/dvswitch/.Xsession/scratchy
   fai-config/files/home/dvswitch/.Xsession/selma
Log:
Remove commented-out commands and extra blank lines in .Xsession

Modified: fai-config/files/home/dvswitch/.Xsession/scratchy
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/scratchy	2011-07-22 15:05:52 UTC (rev 688)
+++ fai-config/files/home/dvswitch/.Xsession/scratchy	2011-07-22 15:07:17 UTC (rev 689)
@@ -9,7 +9,6 @@
 xset -dpms
 
 # 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 | 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' 
@@ -18,18 +17,14 @@
 xterm -e dvswitch &
 sleep 1
 xterm -e "dc-start-source firewire+tally:scratchy" &
-#dvsource-firewire &
 sleep 3
 xterm -e "dc-start-source firewire+tally:itchy" &
 sleep 3
 xterm -e "dc-start-source firewire:blinky" &
 sleep 3
-#dvsource-alsa -h scratchy -p 4321 -s pal hw:1,0 &
-#sleep 3
 dvsource-file -l /home/dvswitch/dc11simple.dv &
 xterm -e "dc-start-sink file:scratchy" &
 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	2011-07-22 15:05:52 UTC (rev 688)
+++ fai-config/files/home/dvswitch/.Xsession/selma	2011-07-22 15:07:17 UTC (rev 689)
@@ -9,13 +9,9 @@
 xset -dpms
 
 # 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 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 &
@@ -26,13 +22,9 @@
 sleep 3
 xterm -e "dc-start-source firewire:patty" &
 sleep 3
-#dc-start-source alsa:selma/hw:1 &
-#sleep 3
 dvsource-file -l /home/dvswitch/dc11simple.dv &
 xterm -e "dc-start-sink file:selma" &
 xterm -e "while true ; do dc-start-sink icecast:todd ; done" &
 
-
 # last command
 xfce4-session
-