Changeset 22439 for gs2-extensions/music-ir

Timestamp:

2010-07-19T16:01:02+12:00 (14 years ago)

Author:

davidb

Message:

Initial work on supporting jSongMiner

Location:

gs2-extensions/music-ir/trunk/perllib/plugins

Files:

• MusicIRPlugin.pm (modified) (7 diffs)
• jAudioExtractor.pm (modified) (1 diff)
• jSongMinerExtractor.pm (added)
• jSongMinerMetadata.pm (added)

gs2-extensions/music-ir/trunk/perllib/plugins/MusicIRPlugin.pm

@@ -29 +29 @@
 use BasePlugin;
 use jAudioExtractor;
+use jSongMinerExtractor;
 
 use strict;
@@ -37 +38 @@
 
 sub BEGIN {
-    @MusicIRPlugin::ISA = ('BasePlugin', 'jAudioExtractor');
+    @MusicIRPlugin::ISA = ('BasePlugin', 'jAudioExtractor', 'jSongMinerExtractor');
 }
 
@@ -44 +45 @@
       { 'name' => "compute_mir_features",
     'desc' => "{BasePlugin.compute_mir_features}",
+    'type' => "enum",
+    'list' => [{'name' => "true",  'desc' => "{common.true}"},
+           {'name' => "false", 'desc' => "{common.false}"}],
+    'deft' => "false",
+    'reqd' => "no" },
+      { 'name' => "retrieve_mir_metadata",
+    'desc' => "{BasePlugin.retrieve_mir_metadata}",
     'type' => "enum",
     'list' => [{'name' => "true",  'desc' => "{common.true}"},
@@ -73 +81 @@
 
     
-    my $jac_self = new jAudioExtractor($pluginlist, $inputargs, $hashArgOptLists);
+    my $jae_self = new jAudioExtractor($pluginlist, $inputargs, $hashArgOptLists,1);
+    my $jsme_self = new jSongMinerExtractor($pluginlist, $inputargs, $hashArgOptLists,1);
     my $base_self = new BasePlugin($pluginlist, $inputargs, $hashArgOptLists);
 
-    my $self = BasePlugin::merge_inheritance($jac_self,$base_self);
+    my $self = BasePlugin::merge_inheritance($jae_self,$jsme_self,$base_self);
 
     return bless $self, $class;
@@ -93 +102 @@
     $self->SUPER::begin(@_);
     $self->jAudioExtractor::begin(@_);
+    $self->jSongMinerExtractor::begin(@_);
 }
 
@@ -122 +132 @@
     }
 
+    
     #we have no text - adds dummy text and NoText metadata
     $self->add_dummy_text($doc_obj, $doc_obj->get_top_section());
@@ -129 +140 @@
 }
 
+sub post_process_doc_obj {
+    my $self = shift (@_);  
+    my ($pluginfo, $base_dir, $file, $metadata, $doc_obj, $gli) = @_;
+
+    my $outhandle = $self->{'outhandle'};
+    my ($filename_full_path, $filename_no_path) = &util::get_full_filenames($base_dir, $file);
+
+    if ($self->{'retrieve_mir_metadata'} eq "true") {
+    my $top_section = $doc_obj->get_top_section();
+    my $id3_titles = $doc_obj->get_metadata($top_section,"ID3.Title");
+
+    my $id3_title = shift @$id3_titles || "Unknown";
+
+    my $id3_artists = $doc_obj->get_metadata($top_section,"ID3.Artist");
+    my $id3_artist = shift @$id3_artists || "Unkown";
+
+    my $metadata_txt_filename = $self->retrieve_metadata($filename_full_path,$id3_title,$id3_artist);
+    }
+
+
+    return 1;
+}
+
 
 1;

gs2-extensions/music-ir/trunk/perllib/plugins/jAudioExtractor.pm

@@ -1 +1 @@
 ###########################################################################
 #
-# jAudioExtractor - helper plugin that does office document conversion 
-#                       using jodconverter combined with MIR
+# jAudioExtractor - helper plugin that computers audio features for 
+#                        music information retrieval use, using jAudio
 #
 # A component of the Greenstone digital library software