Changeset 24399

Timestamp:

2011-08-12T16:40:33+12:00 (12 years ago)

Author:

davidb

Message:

Latest round of changes to code, in preparing for demo to Goldsmiths

Location:

gs3-extensions/audioDB/trunk/src/perllib/plugins

Files:

• AudioDBPlugin.pm (modified) (1 diff)
• FFTExtractor.pm (modified) (1 diff)

gs3-extensions/audioDB/trunk/src/perllib/plugins/AudioDBPlugin.pm

@@ -141 +141 @@
     $wav_filename = $filename_full_path;
     }
-    $doc_obj->associate_file($wav_filename, "audio.wav", "audio/wav", $top_section);
+    $doc_obj->associate_file($wav_filename, "doc.wav", "audio/wav", $top_section);
 
     if ($self->{'enable_streaming'} ne "disabled") {
     
     my $streamable_ext = lc($self->{'enable_streaming'});
+    my $streamable_filename;
 
     if ($input_ext ne $streamable_ext) {
         # make streamable version
-        my $streamable_filename 
+        $streamable_filename 
         = $self->convert_audio_format($filename_full_path,$streamable_ext);
+    }
+    else {
+        $streamable_filename = $filename_full_path;
+    }
 
-        $doc_obj->associate_file($streamable_filename,
-                     "streamable.$streamable_ext", 
-                     $streaming_mime_types->{$streamable_ext},
-                     $top_section);
-    }
+    $doc_obj->associate_file($streamable_filename,
+                 "doc.$streamable_ext", 
+                 $streaming_mime_types->{$streamable_ext},
+                 $top_section);
+
     }
 

gs3-extensions/audioDB/trunk/src/perllib/plugins/FFTExtractor.pm

@@ -95 +95 @@
 
     # Setup and run the ffmpeg command
-    my $ffmpeg_cmd = "ffmpeg $convert_options";
+    my $ffmpeg_cmd = "ffmpeg -y $convert_options";
     $ffmpeg_cmd .= " -i \"$source_file_path\"";
     $ffmpeg_cmd .= " \"$target_file_path\"";