[Sumover-dev] [svn commit] r4897 - in vic/branches/mpeg4: video

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

Author: douglask
Date: Tue Dec 21 05:11:55 2010
New Revision: 4897

Modified:
   vic/branches/mpeg4/tcl/ui-ctrlmenu.tcl
   vic/branches/mpeg4/tcl/ui-grabber.tcl
   vic/branches/mpeg4/video/grabber-win32DS.cpp

Log:
Fixes associated with vic.exe bugs when used as an AG node service which don't appear when run stand-alone.

The DeckLink grabber was complaining about empty commands in the Tcl code.

The DirectShow capture resolution menu is now enabled when Large is selected as an AG node service.


Modified: vic/branches/mpeg4/tcl/ui-ctrlmenu.tcl
==============================================================================
--- vic/branches/mpeg4/tcl/ui-ctrlmenu.tcl	(original)
+++ vic/branches/mpeg4/tcl/ui-ctrlmenu.tcl	Tue Dec 21 05:11:55 2010
@@ -794,8 +794,10 @@
 		insert_grabber_panel [$device nickname]
 	}
 	if [device_supports $device large_size_resolution *] {
-		$capResolutionButton configure -state normal
-		attach_capture_resolutions $device
+		if { [info exists capResolutionButton] } {
+			$capResolutionButton configure -state normal
+			attach_capture_resolutions $device
+		}
 	}
 	#set videoFormat $defaultFormat($device)
 	select_format $videoFormat
@@ -1766,7 +1768,6 @@
 	} else {
 		enable_large_button
 	}
-	set_capture_resolution_button_state
 
 	if { $fmt == "pvh"} {
 		set w .menu.encoder.f.encoderLayer

Modified: vic/branches/mpeg4/tcl/ui-grabber.tcl
==============================================================================
--- vic/branches/mpeg4/tcl/ui-grabber.tcl	(original)
+++ vic/branches/mpeg4/tcl/ui-grabber.tcl	Tue Dec 21 05:11:55 2010
@@ -32,7 +32,7 @@
 }
 
 proc build.directshow w {
-    global capResolutionButton largeSizeResolution videoDevice
+    global capResolutionButton videoDevice
 
     label $w.title -text "DirectShow grabber controls"
     frame $w.f -relief sunken -borderwidth 2
@@ -59,7 +59,6 @@
     pack $w.f.resolution -fill x -side left
     pack $w.f.properties -fill x -side right
     pack $w.title $w.f -fill x -expand 1
-	set largeSizeResolution  [resource largeSizeResolution]
     set capResolutionButton $w.f.resolution
     set_capture_resolution_button_state
 }

Modified: vic/branches/mpeg4/video/grabber-win32DS.cpp
==============================================================================
--- vic/branches/mpeg4/video/grabber-win32DS.cpp	(original)
+++ vic/branches/mpeg4/video/grabber-win32DS.cpp	Tue Dec 21 05:11:55 2010
@@ -1284,6 +1284,7 @@
 			DisplayPropertyPage();
             return TCL_OK;
 		}
+		tcl.evalc("set_capture_resolution_button_state");
 	}
     return (InputDevice::command(argc, argv));
 }