[Debconf-video-commits] r749 - in fai-config/files: etc/default/debconf-video etc/dvswitchrc home/dvswitch/.Xsession
Holger Levsen
holger at alioth.debian.org
Fri Feb 3 15:05:11 UTC 2012
Author: holger
Date: 2012-02-03 15:05:11 +0000 (Fri, 03 Feb 2012)
New Revision: 749
Added:
fai-config/files/etc/default/debconf-video/r1dvswitch
fai-config/files/etc/default/debconf-video/r3dvswitch
fai-config/files/etc/default/debconf-video/r4dvswitch
fai-config/files/etc/default/debconf-video/r5dvswitch
fai-config/files/etc/dvswitchrc/r1dvswitch
fai-config/files/etc/dvswitchrc/r3dvswitch
fai-config/files/etc/dvswitchrc/r4dvswitch
fai-config/files/etc/dvswitchrc/r5dvswitch
fai-config/files/home/dvswitch/.Xsession/r1dvswitch
fai-config/files/home/dvswitch/.Xsession/r3dvswitch
fai-config/files/home/dvswitch/.Xsession/r4dvswitch
fai-config/files/home/dvswitch/.Xsession/r5dvswitch
Modified:
fai-config/files/home/dvswitch/.Xsession/r2dvswitch
Log:
add configuration for rooms 1,3,4+5
Copied: fai-config/files/etc/default/debconf-video/r1dvswitch (from rev 746, fai-config/files/etc/default/debconf-video/r2dvswitch)
===================================================================
--- fai-config/files/etc/default/debconf-video/r1dvswitch (rev 0)
+++ fai-config/files/etc/default/debconf-video/r1dvswitch 2012-02-03 15:05:11 UTC (rev 749)
@@ -0,0 +1,22 @@
+# Name of the location from which we are recording
+CONFERENCE_NAME='FOSDEM 2012'
+VENUE_NAME="Universite libre de Bruxelles"
+ROOM_NAME="Janson"
+# Sources and sinks
+SOURCES="firewire:r1dvswitch firewire:r1grab"
+SINKS="file:r1dvswitch"
+# Icecast streaming server parameters
+#ICECAST_ADDR=lisa.dc11.debconf.org
+#ICECAST_PORT=8000
+#ICECAST_PASS=Ieniech6
+#ICECAST_PATH=/Roundroom.ogv
+# Stream encoding parameters
+VIDEO_STREAM_WIDTH=320
+VIDEO_STREAM_HEIGHT=240
+VIDEO_STREAM_KBPS=230
+VIDEO_STREAM_OPTS="--cropleft 8 --cropright 8 -x 320 -y 240 -F 25:2 -V 230"
+AUDIO_STREAM_HZ=48000
+AUDIO_STREAM_KBPS=64
+# File store base directory
+FILE_BASE="/video"
+#FILE_SERVER="barney"
Copied: fai-config/files/etc/default/debconf-video/r3dvswitch (from rev 746, fai-config/files/etc/default/debconf-video/r2dvswitch)
===================================================================
--- fai-config/files/etc/default/debconf-video/r3dvswitch (rev 0)
+++ fai-config/files/etc/default/debconf-video/r3dvswitch 2012-02-03 15:05:11 UTC (rev 749)
@@ -0,0 +1,22 @@
+# Name of the location from which we are recording
+CONFERENCE_NAME='FOSDEM 2012'
+VENUE_NAME="Universite libre de Bruxelles"
+ROOM_NAME="K"
+# Sources and sinks
+SOURCES="firewire:r3dvswitch firewire:r3grab"
+SINKS="file:r3dvswitch"
+# Icecast streaming server parameters
+#ICECAST_ADDR=lisa.dc11.debconf.org
+#ICECAST_PORT=8000
+#ICECAST_PASS=Ieniech6
+#ICECAST_PATH=/Roundroom.ogv
+# Stream encoding parameters
+VIDEO_STREAM_WIDTH=320
+VIDEO_STREAM_HEIGHT=240
+VIDEO_STREAM_KBPS=230
+VIDEO_STREAM_OPTS="--cropleft 8 --cropright 8 -x 320 -y 240 -F 25:2 -V 230"
+AUDIO_STREAM_HZ=48000
+AUDIO_STREAM_KBPS=64
+# File store base directory
+FILE_BASE="/video"
+#FILE_SERVER="barney"
Copied: fai-config/files/etc/default/debconf-video/r4dvswitch (from rev 746, fai-config/files/etc/default/debconf-video/r2dvswitch)
===================================================================
--- fai-config/files/etc/default/debconf-video/r4dvswitch (rev 0)
+++ fai-config/files/etc/default/debconf-video/r4dvswitch 2012-02-03 15:05:11 UTC (rev 749)
@@ -0,0 +1,22 @@
+# Name of the location from which we are recording
+CONFERENCE_NAME='FOSDEM 2012'
+VENUE_NAME="Universite libre de Bruxelles"
+ROOM_NAME="H1301"
+# Sources and sinks
+SOURCES="firewire:r4dvswitch firewire:r4grab"
+SINKS="file:r4dvswitch"
+# Icecast streaming server parameters
+#ICECAST_ADDR=lisa.dc11.debconf.org
+#ICECAST_PORT=8000
+#ICECAST_PASS=Ieniech6
+#ICECAST_PATH=/Roundroom.ogv
+# Stream encoding parameters
+VIDEO_STREAM_WIDTH=320
+VIDEO_STREAM_HEIGHT=240
+VIDEO_STREAM_KBPS=230
+VIDEO_STREAM_OPTS="--cropleft 8 --cropright 8 -x 320 -y 240 -F 25:2 -V 230"
+AUDIO_STREAM_HZ=48000
+AUDIO_STREAM_KBPS=64
+# File store base directory
+FILE_BASE="/video"
+#FILE_SERVER="barney"
Copied: fai-config/files/etc/default/debconf-video/r5dvswitch (from rev 746, fai-config/files/etc/default/debconf-video/r2dvswitch)
===================================================================
--- fai-config/files/etc/default/debconf-video/r5dvswitch (rev 0)
+++ fai-config/files/etc/default/debconf-video/r5dvswitch 2012-02-03 15:05:11 UTC (rev 749)
@@ -0,0 +1,22 @@
+# Name of the location from which we are recording
+CONFERENCE_NAME='FOSDEM 2012'
+VENUE_NAME="Universite libre de Bruxelles"
+ROOM_NAME="H1302"
+# Sources and sinks
+SOURCES="firewire:r5dvswitch firewire:r5grab"
+SINKS="file:r5dvswitch"
+# Icecast streaming server parameters
+#ICECAST_ADDR=lisa.dc11.debconf.org
+#ICECAST_PORT=8000
+#ICECAST_PASS=Ieniech6
+#ICECAST_PATH=/Roundroom.ogv
+# Stream encoding parameters
+VIDEO_STREAM_WIDTH=320
+VIDEO_STREAM_HEIGHT=240
+VIDEO_STREAM_KBPS=230
+VIDEO_STREAM_OPTS="--cropleft 8 --cropright 8 -x 320 -y 240 -F 25:2 -V 230"
+AUDIO_STREAM_HZ=48000
+AUDIO_STREAM_KBPS=64
+# File store base directory
+FILE_BASE="/video"
+#FILE_SERVER="barney"
Copied: fai-config/files/etc/dvswitchrc/r1dvswitch (from rev 746, fai-config/files/etc/dvswitchrc/r2dvswitch)
===================================================================
--- fai-config/files/etc/dvswitchrc/r1dvswitch (rev 0)
+++ fai-config/files/etc/dvswitchrc/r1dvswitch 2012-02-03 15:05:11 UTC (rev 749)
@@ -0,0 +1,3 @@
+MIXER_HOST=r1dvswitch
+MIXER_PORT=4321
+VIDEO_STANDARD=pal
Copied: fai-config/files/etc/dvswitchrc/r3dvswitch (from rev 746, fai-config/files/etc/dvswitchrc/r2dvswitch)
===================================================================
--- fai-config/files/etc/dvswitchrc/r3dvswitch (rev 0)
+++ fai-config/files/etc/dvswitchrc/r3dvswitch 2012-02-03 15:05:11 UTC (rev 749)
@@ -0,0 +1,3 @@
+MIXER_HOST=r3dvswitch
+MIXER_PORT=4321
+VIDEO_STANDARD=pal
Copied: fai-config/files/etc/dvswitchrc/r4dvswitch (from rev 746, fai-config/files/etc/dvswitchrc/r2dvswitch)
===================================================================
--- fai-config/files/etc/dvswitchrc/r4dvswitch (rev 0)
+++ fai-config/files/etc/dvswitchrc/r4dvswitch 2012-02-03 15:05:11 UTC (rev 749)
@@ -0,0 +1,3 @@
+MIXER_HOST=r4dvswitch
+MIXER_PORT=4321
+VIDEO_STANDARD=pal
Copied: fai-config/files/etc/dvswitchrc/r5dvswitch (from rev 746, fai-config/files/etc/dvswitchrc/r2dvswitch)
===================================================================
--- fai-config/files/etc/dvswitchrc/r5dvswitch (rev 0)
+++ fai-config/files/etc/dvswitchrc/r5dvswitch 2012-02-03 15:05:11 UTC (rev 749)
@@ -0,0 +1,3 @@
+MIXER_HOST=r5dvswitch
+MIXER_PORT=4321
+VIDEO_STANDARD=pal
Copied: fai-config/files/home/dvswitch/.Xsession/r1dvswitch (from rev 747, fai-config/files/home/dvswitch/.Xsession/r2dvswitch)
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/r1dvswitch (rev 0)
+++ fai-config/files/home/dvswitch/.Xsession/r1dvswitch 2012-02-03 15:05:11 UTC (rev 749)
@@ -0,0 +1,31 @@
+#
+# manual edits will be lost
+# use svn://svn.debian.org/svn/debconf-video/fai-config/files/home/dvswitch/.Xsession/$hostname
+#
+
+export DISPLAY=":0.0"
+
+setxkbmap -option terminate:ctrl_alt_bksp &
+
+# disable screensaver
+xset -dpms
+xset s off
+
+# kill old sinks in case there are some left
+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 r1grab 'ps fax | grep "dvgrab -noavc -"|grep -v grep | sed -e "s/^ *//" |cut -d " " -f1 | xargs -n 1 kill -9'
+
+# setup dvswitch
+xterm -e dvswitch &
+sleep 1
+xterm -e "dc-start-source firewire:r1dvswitch" &
+sleep 3
+xterm -e "dc-start-source firewire:r1grab" &
+sleep 3
+dvsource-file -l /home/dvswitch/fosdem.dv &
+xterm -e "dc-start-sink file:r1dvswitch" &
+#xterm -e "while true ; do dvsink-command -h r1dvswitch -p 4321 -- cat > /home/flumotion/janson ; done" &
+#xterm -e "while true ; do dc-start-sink icecast:todd ; done" &
+
+# last command
+xfce4-session
Modified: fai-config/files/home/dvswitch/.Xsession/r2dvswitch
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/r2dvswitch 2012-02-03 14:38:33 UTC (rev 748)
+++ fai-config/files/home/dvswitch/.Xsession/r2dvswitch 2012-02-03 15:05:11 UTC (rev 749)
@@ -18,13 +18,13 @@
# setup dvswitch
xterm -e dvswitch &
sleep 1
-xterm -e "dc-start-source firewire+tally:r2dvswitch" &
+xterm -e "dc-start-source firewire:r2dvswitch" &
sleep 3
-xterm -e "dc-start-source firewire+tally:r2grab" &
+xterm -e "dc-start-source firewire:r2grab" &
sleep 3
dvsource-file -l /home/dvswitch/fosdem.dv &
xterm -e "dc-start-sink file:r2dvswitch" &
-xterm -e "while true ; do dvsink-command -h r2dvswitch -p 4321 -- cat > /home/flumotion/ferrer ; done" &
+#xterm -e "while true ; do dvsink-command -h r2dvswitch -p 4321 -- cat > /home/flumotion/ferrer ; done" &
#xterm -e "while true ; do dc-start-sink icecast:todd ; done" &
# last command
Copied: fai-config/files/home/dvswitch/.Xsession/r3dvswitch (from rev 747, fai-config/files/home/dvswitch/.Xsession/r2dvswitch)
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/r3dvswitch (rev 0)
+++ fai-config/files/home/dvswitch/.Xsession/r3dvswitch 2012-02-03 15:05:11 UTC (rev 749)
@@ -0,0 +1,31 @@
+#
+# manual edits will be lost
+# use svn://svn.debian.org/svn/debconf-video/fai-config/files/home/dvswitch/.Xsession/$hostname
+#
+
+export DISPLAY=":0.0"
+
+setxkbmap -option terminate:ctrl_alt_bksp &
+
+# disable screensaver
+xset -dpms
+xset s off
+
+# kill old sinks in case there are some left
+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 r3grab 'ps fax | grep "dvgrab -noavc -"|grep -v grep | sed -e "s/^ *//" |cut -d " " -f1 | xargs -n 1 kill -9'
+
+# setup dvswitch
+xterm -e dvswitch &
+sleep 1
+xterm -e "dc-start-source firewire:r3dvswitch" &
+sleep 3
+xterm -e "dc-start-source firewire:r3grab" &
+sleep 3
+dvsource-file -l /home/dvswitch/fosdem.dv &
+xterm -e "dc-start-sink file:r3dvswitch" &
+#xterm -e "while true ; do dvsink-command -h r3dvswitch -p 4321 -- cat > /home/flumotion/k ; done" &
+#xterm -e "while true ; do dc-start-sink icecast:todd ; done" &
+
+# last command
+xfce4-session
Copied: fai-config/files/home/dvswitch/.Xsession/r4dvswitch (from rev 747, fai-config/files/home/dvswitch/.Xsession/r2dvswitch)
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/r4dvswitch (rev 0)
+++ fai-config/files/home/dvswitch/.Xsession/r4dvswitch 2012-02-03 15:05:11 UTC (rev 749)
@@ -0,0 +1,31 @@
+#
+# manual edits will be lost
+# use svn://svn.debian.org/svn/debconf-video/fai-config/files/home/dvswitch/.Xsession/$hostname
+#
+
+export DISPLAY=":0.0"
+
+setxkbmap -option terminate:ctrl_alt_bksp &
+
+# disable screensaver
+xset -dpms
+xset s off
+
+# kill old sinks in case there are some left
+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 r4grab 'ps fax | grep "dvgrab -noavc -"|grep -v grep | sed -e "s/^ *//" |cut -d " " -f1 | xargs -n 1 kill -9'
+
+# setup dvswitch
+xterm -e dvswitch &
+sleep 1
+xterm -e "dc-start-source firewire:r4dvswitch" &
+sleep 3
+xterm -e "dc-start-source firewire:r4grab" &
+sleep 3
+dvsource-file -l /home/dvswitch/fosdem.dv &
+xterm -e "dc-start-sink file:r4dvswitch" &
+#xterm -e "while true ; do dvsink-command -h r4dvswitch -p 4321 -- cat > /home/flumotion/h1302 ; done" &
+#xterm -e "while true ; do dc-start-sink icecast:todd ; done" &
+
+# last command
+xfce4-session
Copied: fai-config/files/home/dvswitch/.Xsession/r5dvswitch (from rev 747, fai-config/files/home/dvswitch/.Xsession/r2dvswitch)
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/r5dvswitch (rev 0)
+++ fai-config/files/home/dvswitch/.Xsession/r5dvswitch 2012-02-03 15:05:11 UTC (rev 749)
@@ -0,0 +1,31 @@
+#
+# manual edits will be lost
+# use svn://svn.debian.org/svn/debconf-video/fai-config/files/home/dvswitch/.Xsession/$hostname
+#
+
+export DISPLAY=":0.0"
+
+setxkbmap -option terminate:ctrl_alt_bksp &
+
+# disable screensaver
+xset -dpms
+xset s off
+
+# kill old sinks in case there are some left
+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 r5grab 'ps fax | grep "dvgrab -noavc -"|grep -v grep | sed -e "s/^ *//" |cut -d " " -f1 | xargs -n 1 kill -9'
+
+# setup dvswitch
+xterm -e dvswitch &
+sleep 1
+xterm -e "dc-start-source firewire:r5dvswitch" &
+sleep 3
+xterm -e "dc-start-source firewire:r5grab" &
+sleep 3
+dvsource-file -l /home/dvswitch/fosdem.dv &
+xterm -e "dc-start-sink file:r5dvswitch" &
+#xterm -e "while true ; do dvsink-command -h r5dvswitch -p 4321 -- cat > /home/flumotion/h1302 ; done" &
+#xterm -e "while true ; do dc-start-sink icecast:todd ; done" &
+
+# last command
+xfce4-session
More information about the Debconf-video-commits
mailing list