[ingex-commits] ingex/studio/web/WebIngex/ingex-modules/Setup.ingexmodule deletercf.pl, 1.1, 1.2 htmlutil.pm, 1.3, 1.4 recorder.pl, 1.3, 1.4

[John F. <jo...@us...>]

Update of /cvsroot/ingex/ingex/studio/web/WebIngex/ingex-modules/Setup.ingexmodule
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2908

Modified Files:
	deletercf.pl htmlutil.pm recorder.pl 
Log Message:
Added more readable encode resolution and encode wrapping parameters to recorders page.

Index: htmlutil.pm
===================================================================
RCS file: /cvsroot/ingex/ingex/studio/web/WebIngex/ingex-modules/Setup.ingexmodule/htmlutil.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** htmlutil.pm	17 Nov 2009 16:20:10 -0000	1.3
--- htmlutil.pm	24 Nov 2009 15:36:42 -0000	1.4
***************
*** 322,326 ****
  sub get_recorder_config
  {
!     my ($rcf, $vrs) = @_;
      
      # stop the warnings about deep recursion
--- 322,326 ----
  sub get_recorder_config
  {
!     my ($rcf, $vrs, $fmts) = @_;
      
      # stop the warnings about deep recursion
***************
*** 373,378 ****
          my $value = $rp->{"VALUE"};
          if ($rp->{"NAME"} eq "MXF_RESOLUTION" ||
!             $rp->{"NAME"} eq "ENCODE1_RESOLUTION" ||
!             $rp->{"NAME"} eq "ENCODE2_RESOLUTION" ||
              $rp->{"NAME"} eq "QUAD_RESOLUTION")
          {
--- 373,377 ----
          my $value = $rp->{"VALUE"};
          if ($rp->{"NAME"} eq "MXF_RESOLUTION" ||
!             $rp->{"NAME"} =~ /ENCODE(\d*)_RESOLUTION/ ||
              $rp->{"NAME"} eq "QUAD_RESOLUTION")
          {
***************
*** 393,396 ****
--- 392,415 ----
              }
          }
+         elsif ($rp->{"NAME"} eq "MXF_WRAPPING" ||
+             $rp->{"NAME"} =~ /ENCODE(\d*)_WRAPPING/ ||
+             $rp->{"NAME"} eq "QUAD_WRAPPING")
+         {
+         	if ($rp->{"VALUE"} == 0)
+             {
+                 $value = "not set (0)";
+             }
+             else
+             {
+                 foreach my $fmt (@{ $fmts })
+                 {
+                     if ($fmt->{"ID"} == $rp->{"VALUE"})
+                     {
+                         $value = "$fmt->{'NAME'} ($value)";
+                         last;
+                     }
+                 }
+             }
+         }
          push(@paramRows,
              Tr({-class=>"simpleTable", -align=>"left", -valign=>"top"}, 

Index: deletercf.pl
===================================================================
RCS file: /cvsroot/ingex/ingex/studio/web/WebIngex/ingex-modules/Setup.ingexmodule/deletercf.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** deletercf.pl	5 Sep 2008 17:24:26 -0000	1.1
--- deletercf.pl	24 Nov 2009 15:36:42 -0000	1.2
***************
*** 72,76 ****
      or return_error_page("failed to load video resolutions: $prodautodb::errstr");
  
! my $page = get_delete_content($rcf, $vrs) or
      return_error_page("failed to fill in content for delete recorder config page");
     
--- 72,79 ----
      or return_error_page("failed to load video resolutions: $prodautodb::errstr");
  
! my $fmts = load_file_formats($dbh)
! 	or return_error_page("failed to load file formats: $prodautodb::errstr");
! 
! my $page = get_delete_content($rcf, $vrs, $fmts) or
      return_error_page("failed to fill in content for delete recorder config page");
     
***************
*** 86,94 ****
  sub get_delete_content
  {
!     my ($rcf, $vrs) = @_;
      
      my @pageContent;
  
!     my $rcfHTML = htmlutil::get_recorder_config($rcf, $vrs);
      
      push(@pageContent, h1('Delete recorder configuration'),
--- 89,97 ----
  sub get_delete_content
  {
!     my ($rcf, $vrs, $fmts) = @_;
      
      my @pageContent;
  
!     my $rcfHTML = htmlutil::get_recorder_config($rcf, $vrs, $fmts);
      
      push(@pageContent, h1('Delete recorder configuration'),

Index: recorder.pl
===================================================================
RCS file: /cvsroot/ingex/ingex/studio/web/WebIngex/ingex-modules/Setup.ingexmodule/recorder.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** recorder.pl	18 Sep 2009 17:43:02 -0000	1.3
--- recorder.pl	24 Nov 2009 15:36:42 -0000	1.4
***************
*** 44,47 ****
--- 44,50 ----
      or return_error_page("failed to load video resolutions: $prodautodb::errstr");
  
+ my $fmts = load_file_formats($dbh)
+ 	or return_error_page("failed to load file formats: $prodautodb::errstr");
+ 
  my $recs = load_recorders($dbh) 
      or return_error_page("failed to load recorders: $prodautodb::errstr");
***************
*** 144,148 ****
      )
      {    
!         my $rcfHTML = htmlutil::get_recorder_config($rcf, $vrs);
          
          my $rcfConfig = $rcf->{"config"};
--- 147,151 ----
      )
      {    
!         my $rcfHTML = htmlutil::get_recorder_config($rcf, $vrs, $fmts);
          
          my $rcfConfig = $rcf->{"config"};