video producer check in

[Ivan R. Judson]

For the Osprey problem, we should have 2 on order to test and figure out
configuration stuff.

I don't think we can help fix that until they come in.

--Ivan 

> -----Original Message-----
> From: owner-ag-dev at mcs.anl.gov 
> [mailto:owner-ag-dev at mcs.anl.gov] On Behalf Of Eric Olson
> Sent: Tuesday, June 29, 2004 9:46 AM
> To: ag-dev at mcs.anl.gov
> Subject: video producer check in
> 
> Just a heads up, I made a change to VideoProducer.py that 
> fixes a problem that port settings from the config file 
> getting loaded, but were being overridden by the default 
> port.  This is why our one camera in the WS wasn't working 
> before (i'll go fix it now).  Someone else (maybe Tom since 
> he has some experience with this) may want to verify this is 
> a reasonable fix.
> 
> This fixes one outstanding problem with video producer 
> settings, but there may be one or two more:
> * People on ag-tech having problems with windows capture cards in XP.
> * Strange situations, that I haven't seen recently, where the 
> /dev/video entries weren't showing up in Node Management, 
> and/or we were only given the choice of the x11 video device 
> (could have been a problem with the video machine setup such 
> as the bttv module not loaded).
> 
> Eric
> 
> ---------- Forwarded message ----------
> Date: Tue, 29 Jun 2004 09:34:06 -0500
> From: Eric Olson <eolson at mcs.anl.gov>
> To: ag-cvs at mcs.anl.gov
> Subject: [CVS AccessGrid] VideoProducerService.py:Don't 
> override the port
>     setting that was loaded in the default config.
> 
> Commit in AccessGrid/services/node on MAIN
> VideoProducerService.py+6-2 | 1.29 -> 1.30
> 
>  Don't override the port setting that was loaded in the 
> default config.
> Keep the setting if it's one of the valid portTypes.
> 
> ______________________________________________________________
> __________________
> AccessGrid/services/node
> VideoProducerService.py 1.29 -> 1.30
> 
>  diff -u -r1.29 -r1.30
> --- VideoProducerService.py	27 May 2004 16:11:03 -0000	1.29
> +++ VideoProducerService.py	29 Jun 2004 14:34:06 -0000	1.30
> @@ -5,7 +5,7 @@
> 
>  # Author:      Thomas D. Uram
>  #
>  # Created:     2003/06/02
> 
> -# RCS-ID:      $Id: VideoProducerService.py,v 1.29 
> 2004/05/27 16:11:03 turam Exp $
> 
> +# RCS-ID:      $Id: VideoProducerService.py,v 1.30 
> 2004/06/29 14:34:06 eolson Exp $
> 
>  # Copyright:   (c) 2002
>  # Licence:     See COPYING.TXT
>  
> #-------------------------------------------------------------
> ----------------
> 
> @@ -244,7 +244,11 @@
> 
>  
>              # Create the port parameter as an option set 
> parameter, now
>              # that we have multiple possible values for "port"
> 
> -            self.port = OptionSetParameter( "port", 
> self.resource.portTypes[0],
> 
> +            if ( isinstance(self.port, TextParameter) or 
> isinstance(self.port, ValueParameter) ) and self.port.value 
> != "" and self.port.value in self.resource.portTypes:
> +                self.port = OptionSetParameter( "port", 
> self.port.value,
> +                                                             
> self.resource.portTypes )
> +            else:
> +                self.port = OptionSetParameter( "port", 
> + self.resource.portTypes[0],
> 
>                                                               
> self.resource.portTypes )
>  
>              # Replace or append the "port" element
>                                  CVSspam 0.2.8
> 
>