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

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

Author: douglask
Date: Tue Sep  7 15:46:18 2010
New Revision: 4884

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

Log:
Modifications to allow AGTk to query scaler resolutions and set scaler resolutions


Modified: vic/branches/mpeg4/tcl/ui-ctrlmenu.tcl
==============================================================================
--- vic/branches/mpeg4/tcl/ui-ctrlmenu.tcl	(original)
+++ vic/branches/mpeg4/tcl/ui-ctrlmenu.tcl	Tue Sep  7 15:46:18 2010
@@ -1649,7 +1649,7 @@
 			close_device
 		}
 	}
-	set_software_scale_buttons_state
+	set_scaler_buttons_state
 }
 
 proc disable_large_button { } {
@@ -1668,21 +1668,21 @@
 	}
 }
 
-proc set_software_scale_buttons_state { } {
-	global inputSize softwareScaleButtons
-	if { [info exists softwareScaleButtons] } {
+proc set_scaler_buttons_state { } {
+	global inputSize scalerButtons
+	if { [info exists scalerButtons] } {
 		if { $inputSize == 1 } {
-			$softwareScaleButtons.b0 configure -state normal
-			$softwareScaleButtons.b1 configure -state normal
-			$softwareScaleButtons.b2 configure -state normal
-			$softwareScaleButtons.b3 configure -state normal
-			$softwareScaleButtons.b4 configure -state normal
+			$scalerButtons.b0 configure -state normal
+			$scalerButtons.b1 configure -state normal
+			$scalerButtons.b2 configure -state normal
+			$scalerButtons.b3 configure -state normal
+			$scalerButtons.b4 configure -state normal
 		} else {
-			$softwareScaleButtons.b0 configure -state disabled
-			$softwareScaleButtons.b1 configure -state disabled
-			$softwareScaleButtons.b2 configure -state disabled
-			$softwareScaleButtons.b3 configure -state disabled
-			$softwareScaleButtons.b4 configure -state disabled
+			$scalerButtons.b0 configure -state disabled
+			$scalerButtons.b1 configure -state disabled
+			$scalerButtons.b2 configure -state disabled
+			$scalerButtons.b3 configure -state disabled
+			$scalerButtons.b4 configure -state disabled
 		}
 	}
 }

Modified: vic/branches/mpeg4/tcl/ui-grabber.tcl
==============================================================================
--- vic/branches/mpeg4/tcl/ui-grabber.tcl	(original)
+++ vic/branches/mpeg4/tcl/ui-grabber.tcl	Tue Sep  7 15:46:18 2010
@@ -194,7 +194,7 @@
 }
 
 proc build.blackmagic w {
-    global setSoftwareScale softwareScaleButtons
+    global scalerResolution scalerButtons
 
     label $w.title -text "Blackmagic DeckLink-Grabber"
     frame $w.f -relief sunken -borderwidth 2
@@ -203,40 +203,42 @@
 
     if {$::tk_version > 8.4 && [windowingsystem] != "x11"} {
         ttk::radiobutton $w.f.b0 -text "none" -command "restart" \
-           -variable setSoftwareScale -value "none"
+           -variable scalerResolution -value "none"
         ttk::radiobutton $w.f.b1 -text "960p" -command "restart" \
-            -variable setSoftwareScale -value "960p"
+            -variable scalerResolution -value "960p"
         ttk::radiobutton $w.f.b2 -text "720p" -command "restart" \
-            -variable setSoftwareScale -value "720p"
+            -variable scalerResolution -value "720p"
         ttk::radiobutton $w.f.b3 -text "576p" -command "restart" \
-            -variable setSoftwareScale -value "576p"
+            -variable scalerResolution -value "576p"
         ttk::radiobutton $w.f.b4 -text "480p" -command "restart" \
-            -variable setSoftwareScale -value "480p"
+            -variable scalerResolution -value "480p"
     } else {
         set f [smallfont]
         radiobutton $w.f.b0 -text "none" -command "restart" \
             -padx 0 -pady 0 \
-            -anchor w -variable setSoftwareScale -font $f -relief flat -value "none"
+            -anchor w -variable scalerResolution -font $f -relief flat -value "none"
         radiobutton $w.f.b1 -text "960p" -command "restart" \
             -padx 0 -pady 0 \
-            -anchor w -variable setSoftwareScale -font $f -relief flat -value "960p"
+            -anchor w -variable scalerResolution -font $f -relief flat -value "960p"
         radiobutton $w.f.b2 -text "720p" -command "restart" \
             -padx 0 -pady 0 \
-            -anchor w -variable setSoftwareScale -font $f -relief flat -value "720p"
+            -anchor w -variable scalerResolution -font $f -relief flat -value "720p"
         radiobutton $w.f.b3 -text "576p" -command "restart" \
             -padx 0 -pady 0 \
-            -anchor w -variable setSoftwareScale -font $f -relief flat -value "576p"
+            -anchor w -variable scalerResolution -font $f -relief flat -value "576p"
         radiobutton $w.f.b4 -text "480p" -command "restart" \
             -padx 0 -pady 0 \
-            -anchor w -variable setSoftwareScale -font $f -relief flat -value "480p"
+            -anchor w -variable scalerResolution -font $f -relief flat -value "480p"
     }
     pack $w.f.scaling $w.f.b0 $w.f.b1 $w.f.b2 $w.f.b3 $w.f.b4 -fill x -side left
 
     pack $w.title $w.f -fill x -expand 1
 
-    set setSoftwareScale "none"
-    set softwareScaleButtons $w.f
-    set_software_scale_buttons_state
+    if { ! [info exists scalerResolution] } {
+        set scalerResolution "none"
+    }
+    set scalerButtons $w.f
+    set_scaler_buttons_state
 }
 
 proc build.meteor w {

Modified: vic/branches/mpeg4/tcl/ui-util.tcl
==============================================================================
--- vic/branches/mpeg4/tcl/ui-util.tcl	(original)
+++ vic/branches/mpeg4/tcl/ui-util.tcl	Tue Sep  7 15:46:18 2010
@@ -367,6 +367,18 @@
 					}
 					puts "			</sizes>"
 				}
+
+				# for the moment only the Blackmagick DeckLink grabber has a scaler
+				if { [string first "Blackmagic-" "[$v nickname]"] == -1 } {
+					puts "			<scaler />"
+				} else {
+					set scaleList [list none 960p 720p 576p 480p]
+					puts "			<scaler>"
+					foreach scale  $scaleList {
+						puts "				<scale>$scale</scale>"
+					}
+					puts "			</scaler>"
+				}
 				puts "		</device>"
 			}
 		}