[Sumover-dev] [svn commit] r4033 - vic/branches/mpeg4/tcl

[sumover-dev at cs.ucl.ac.uk]

Author: piers
Date: Fri May 11 22:42:52 2007
New Revision: 4033

Modified:
   vic/branches/mpeg4/tcl/cf-util.tcl
   vic/branches/mpeg4/tcl/ui-ctrlmenu.tcl

Log:
Applied patch from Andrew Rowley to improve compatibility with IG2 - 
"This will then allow us to change the note from the AG video startup, rather than appending the video camera name to the node name (which breaks compatibility with the new IG2 system).  I have also been in contact with InSORS to try to fix this at their end too, but this fix would help in any case (plus it is quite simple and could help something else in the future)."


Modified: vic/branches/mpeg4/tcl/cf-util.tcl
==============================================================================
--- vic/branches/mpeg4/tcl/cf-util.tcl	(original)
+++ vic/branches/mpeg4/tcl/cf-util.tcl	Fri May 11 22:42:52 2007
@@ -136,6 +136,7 @@
 
 	$src sdes name [resource rtpName]
 	$src sdes email [resource rtpEmail]
+	$src sdes note [resource rtpNote]
 	$src sdes cname $cname
 	set tool $V(app)-[version]
 	global tcl_platform

Modified: vic/branches/mpeg4/tcl/ui-ctrlmenu.tcl
==============================================================================
--- vic/branches/mpeg4/tcl/ui-ctrlmenu.tcl	(original)
+++ vic/branches/mpeg4/tcl/ui-ctrlmenu.tcl	Fri May 11 22:42:52 2007
@@ -139,7 +139,8 @@
 	global V
 	set net $V(data-net)
 	build.session $w.session [$net addr] [$net port] \
-		[[srctab local] srcid] [$net ttl] [[srctab local] sdes name]
+		[[srctab local] srcid] [$net ttl] [[srctab local] sdes name] \
+		[[srctab local] sdes note]
 
 	button $w.dismiss -text Dismiss -borderwidth 2 -width 8 \
 		-relief raised -anchor c \
@@ -185,8 +186,8 @@
 	}
 }
 
-proc build.session { w dst port srcid ttl name } {
-	set f [smallfont]	
+proc build.session { w dst port srcid ttl name note } {
+	set f [smallfont]
 
 	label $w.title -text Session
 	pack $w.title -fill x
@@ -209,7 +210,7 @@
 
 	frame $w.nb.frame.msg
 	label $w.nb.frame.msg.label -text "Note: " -font $f -anchor e -width 6
-	mk.entry $w.nb.frame.msg update_note ""
+	mk.entry $w.nb.frame.msg update_note $note
 	pack $w.nb.frame.msg.label -side left
 	pack $w.nb.frame.msg.entry -side left -expand 1 -fill x -pady 2