Author: benh
Date: 2011-07-25 23:02:31 +0000 (Mon, 25 Jul 2011)
New Revision: 709
Modified:
package/trunk/conf/dc11/default-scratchy
package/trunk/debian/changelog
package/trunk/src/dc-start-sink
Log:
* Allow stream path to be independent from room name used in file names
* Fix name of 'Round room' but keep the same stream path
Modified: package/trunk/conf/dc11/default-scratchy
===================================================================
--- package/trunk/conf/dc11/default-scratchy 2011-07-24 21:42:37 UTC (rev 708)
+++ package/trunk/conf/dc11/default-scratchy 2011-07-25 23:02:31 UTC (rev 709)
@@ -1,7 +1,7 @@
# Name of the location from which we are recording
CONFERENCE_NAME='DebConf11'
VENUE_NAME="Banski Dvor, Banja Luka, Bosnia and Herzegovina"
-ROOM_NAME="Roundroom"
+ROOM_NAME="Round room"
# Sources and sinks
SOURCES="firewire:scratchy firewire:blinky firewire:itchy"
SINKS="icecast:todd file:scratchy"
@@ -9,6 +9,7 @@
ICECAST_ADDR=lisa.dc11.debconf.org
ICECAST_PORT=8000
ICECAST_PASS=#ICECAST_PASS#
+ICECAST_PATH=/Roundroom.ogv
# Stream encoding parameters
VIDEO_STREAM_WIDTH=320
VIDEO_STREAM_HEIGHT=240
Modified: package/trunk/debian/changelog
===================================================================
--- package/trunk/debian/changelog 2011-07-24 21:42:37 UTC (rev 708)
+++ package/trunk/debian/changelog 2011-07-25 23:02:31 UTC (rev 709)
@@ -1,3 +1,10 @@
+debconf-video (20110726.1) UNRELEASED; urgency=low
+
+ * Allow stream path to be independent from room name used in file names
+ * Fix name of 'Round room' but keep the same stream path
+
+ -- Ben Hutchings <ben at decadent.org.uk> Tue, 26 Jul 2011 00:57:53 +0200
+
debconf-video (20110723.2) squeeze; urgency=low
* Another upload.
Modified: package/trunk/src/dc-start-sink
===================================================================
--- package/trunk/src/dc-start-sink 2011-07-24 21:42:37 UTC (rev 708)
+++ package/trunk/src/dc-start-sink 2011-07-25 23:02:31 UTC (rev 709)
@@ -8,8 +8,14 @@
VIDEO_STREAM_KBPS=230
AUDIO_STREAM_HZ=48000
AUDIO_STREAM_KBPS=64
+ICECAST_PATH=
source /etc/default/debconf-video
+# Optional variables
+if [ -z "$ICECAST_PATH" ]; then
+ ICECAST_PATH="/${ROOM_NAME// /_}.ogv"
+fi
+
# Read dvswitch configuration so that we don't depend on the sink
# to be configured identically.
source /etc/dvswitchrc
@@ -47,7 +53,7 @@
--organization "'DebConf video team'" \
--copyright "'DebConf video team'" \
\| oggshout $ICECAST_ADDR $ICECAST_PORT \
- "'$ICECAST_PASS'" "'/${ROOM_NAME// /_}.ogv'"
+ "'$ICECAST_PASS'" "'$ICECAST_PATH'"
;;
file)
ssh $sink_host dvsink-files -h $MIXER_HOST -p $MIXER_PORT \