Changeset 24399

Show
Ignore:
Timestamp:
12.08.2011 16:40:33 (8 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:
2 modified

Legend:

Unmodified
Added
Removed
  • gs3-extensions/audioDB/trunk/src/perllib/plugins/AudioDBPlugin.pm

    r24338 r24399  
    141141    $wav_filename = $filename_full_path; 
    142142    } 
    143     $doc_obj->associate_file($wav_filename, "audio.wav", "audio/wav", $top_section); 
     143    $doc_obj->associate_file($wav_filename, "doc.wav", "audio/wav", $top_section); 
    144144 
    145145    if ($self->{'enable_streaming'} ne "disabled") { 
    146146     
    147147    my $streamable_ext = lc($self->{'enable_streaming'}); 
     148    my $streamable_filename; 
    148149 
    149150    if ($input_ext ne $streamable_ext) { 
    150151        # make streamable version 
    151         my $streamable_filename  
     152        $streamable_filename  
    152153        = $self->convert_audio_format($filename_full_path,$streamable_ext); 
     154    } 
     155    else { 
     156        $streamable_filename = $filename_full_path; 
     157    } 
    153158 
    154         $doc_obj->associate_file($streamable_filename, 
    155                      "streamable.$streamable_ext",  
    156                      $streaming_mime_types->{$streamable_ext}, 
    157                      $top_section); 
    158     } 
     159    $doc_obj->associate_file($streamable_filename, 
     160                 "doc.$streamable_ext",  
     161                 $streaming_mime_types->{$streamable_ext}, 
     162                 $top_section); 
     163 
    159164    } 
    160165 
  • gs3-extensions/audioDB/trunk/src/perllib/plugins/FFTExtractor.pm

    r24338 r24399  
    9595 
    9696    # Setup and run the ffmpeg command 
    97     my $ffmpeg_cmd = "ffmpeg $convert_options"; 
     97    my $ffmpeg_cmd = "ffmpeg -y $convert_options"; 
    9898    $ffmpeg_cmd .= " -i \"$source_file_path\""; 
    9999    $ffmpeg_cmd .= " \"$target_file_path\"";