Changeset 29018

Timestamp:

2014-05-02T10:29:52+12:00 (10 years ago)

Author:

jmt12

Message:

Fixing bug where plugin tried to generating streaming video of filetype 'disabled' is streaming was set to disabled

File:

• gs2-extensions/video-and-audio/trunk/src/perllib/plugins/AudioPlugin.pm (modified) (5 diffs)

gs2-extensions/video-and-audio/trunk/src/perllib/plugins/AudioPlugin.pm

@@ -41 +41 @@
 
 my $enable_streaming_list =
-    [{'name' => "disabled", 'desc' => "Do not create any audio file optimised for streaming over the Internet."},
+    [{'name' => "disabled", 'desc' => "Do not create any audio file optimised for streaming over the Internet."}, # Don't move this entry - it's used as a sentinel value below
      {'name' => "flv", 'desc' => "Uses the FLV format for streaming media. Better to target old computers."},
      {'name' => "mp4", 'desc' => "Uses the MP4 container with H264 and AAC codecs. Better quality at very low bitrates but more ressources intensive."},
@@ -77 +77 @@
         'type' => "enum",
         'list' => $enable_streaming_list,
-    'deft' => "disabled",
-    'reqd' => "no" } 
+    'deft' => @{$enable_streaming_list}[0]->{'name'},
+    'reqd' => "no" }
 
 ];
@@ -117 +117 @@
     my $self = shift (@_);
     my ($verbosity, $outhandle, $failhandle) = @_;
+
+    if ($self->{'enable_streaming'} eq @{$enable_streaming_list}[0]->{'name'})
+    {
+      print $outhandle "!Warning! AudioPlugin will generate no streamable audio as format set to \'disabled\'\n";
+    }
 
     $self->SUPER::init(@_);
@@ -317 +322 @@
     = ($convertto_regenerated) ? "regenerate_general_cmd" : "run_cached_general_cmd";
 
-    if ($self->{'enable_streaming'}) {
-
+    if ($self->{'enable_streaming'})
+    {
+      # The first entry in the "enabled_streaming_list" array should be "disabled"
+      if ($self->{'enable_streaming'} ne @{$enable_streaming_list}[0]->{'name'})
+      {
     my $enable_streaming = $self->{'enable_streaming'};
 
@@ -353 +361 @@
         = $self->$optionally_run_general_cmd($stream_cmd,$ifilename,$mp_filename,$streamable_options);
     
-    if (!$streamable_had_error) {
-        
-        my $streamable_url = $mp_file;
-        my $streamable_url_safe = $self->url_safe($streamable_url);
-        
-        $doc_obj->add_utf8_metadata ($section, "streamableaudio", $streamable_url_safe);
-        $doc_obj->associate_file($mp_filename,$mp_file,"audio/mpeg",
-                     $section);
-    }
-    
+    if (!$streamable_had_error)
+        {
+          my $streamable_url = $mp_file;
+          my $streamable_url_safe = $self->url_safe($streamable_url);
+
+          $doc_obj->add_utf8_metadata ($section, "streamableaudio", $streamable_url_safe);
+          $doc_obj->associate_file($mp_filename,$mp_file,"audio/mpeg", $section);
+    }
+
     # The following aren't currently used
-    
     $self->{'mp_file'} = $mp_file;
     $self->{'mp_filename'} = $mp_filename;
-    }
-
-
+      }
+    }
     return $type;
 }