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

Timestamp:

2012-04-05T15:53:05+12:00 (12 years ago)

Author:

davidb

Message:

Updates to code that take account of changes in the central PM modules

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

@@ -247 +247 @@
 
     $file = $file_unicode;
-    my $filemeta = $self->filename_to_utf8_metadata($file);
-    my $filemeta_url_safe = $self->url_safe($filemeta);
+#    my $filemeta = $self->filename_to_utf8_metadata($file);
+#    my $filemeta_url_safe = $self->url_safe($filemeta);
+
+    my $filemeta_url_safe = &unicode::filename_to_url($file);
 
     $doc_obj->add_utf8_metadata ($section, "Audio", $filemeta_url_safe);
@@ -254 +256 @@
     # Also want to set filename as 'Source' metadata to be
     # consistent with other plugins
-    $doc_obj->add_utf8_metadata ($section, "Source", $filemeta_url_safe);
+#    $doc_obj->add_utf8_metadata ($section, "Source", $filemeta_url_safe);
 
 
@@ -288 +290 @@
     if ($self->{'enable_streaming'}) {
 
+    my $enable_streaming = $self->{'enable_streaming'};
+
     # Even if the original file or 'converttotype' is set to MP3
     # we'll still go ahead and generate this MP3 as it might very
@@ -295 +299 @@
     my $streaming_size    = $self->{'streamingsize'};
     
-    
-    my ($stream_cmd,$mp3_filename,$mp3_file) 
-        = $self->audio_stream_cmd($originalfilename || $filename,
-                      $streaming_bitrate, $streaming_size);
+    my $ifilename = $originalfilename || $filename;
+    
+    my ($stream_cmd,$mp_filename,$mp_file);
+    if ($enable_streaming eq "mp4") {
+        ($stream_cmd,$mp_filename,$mp_file) 
+        = $self->audio_mp4_stream_cmd($ifilename, $streaming_size,
+                      $streaming_bitrate);
+    }
+    else {
+        ($stream_cmd,$mp_filename,$mp_file) 
+        = $self->audio_stream_ffmpeg_cmd($ifilename, $enable_streaming,
+                      $streaming_bitrate, $streaming_size,);
+
+    }
     
     
     my $streamable_options = { @{$self->{'ffmpeg_monitor'}},
                    'message_prefix' => "Stream",
-                   'message' => "Generating streamable audio: $mp3_file" }; 
+                   'message' => "Generating streamable audio: $mp_file" }; 
     
     my $streamable_result;
     my $streamable_had_error;
     ($streamable_regenerated,$streamable_result,$streamable_had_error)
-        = $self->$optionally_run_general_cmd($stream_cmd,$mp3_filename,$streamable_options);
+        = $self->$optionally_run_general_cmd($stream_cmd,$ifilename,$mp_filename,$streamable_options);
     
     if (!$streamable_had_error) {
         
-        my $streamable_url = $mp3_file;
+        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($mp3_filename,$mp3_file,"audio/mpeg",
+        $doc_obj->associate_file($mp_filename,$mp_file,"audio/mpeg",
                      $section);
     }
@@ -322 +336 @@
     # The following aren't currently used
     
-    $self->{'mp3_file'} = $mp3_file;
-    $self->{'mp3_filename'} = $mp3_filename;
+    $self->{'mp_file'} = $mp_file;
+    $self->{'mp_filename'} = $mp_filename;
     }