Changeset 20003

Timestamp:

2009-07-17T10:19:54+12:00 (15 years ago)

Author:

davidb

Message:

Some minor tweaks to better align the audio and video plugins

Location:

extensions/gsdl-video/trunk/perllib/plugins

Files:

• AudioPlugin.pm (modified) (2 diffs)
• VideoConverter.pm (modified) (1 diff)
• VideoPlugin.pm (modified) (2 diffs)

extensions/gsdl-video/trunk/perllib/plugins/AudioPlugin.pm

@@ -153 +153 @@
 
 
-    # Convert the video to a new type (if required).
+    # Convert the audio to a new type (if required).
     my $converttotype = $self->{'converttotype'};
     my $converttosize = $self->{'converttosize'};
@@ -333 +333 @@
 
 
+sub read_into_doc_obj {
+    my $self = shift (@_);  
+    my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $processor, $maxdocs, $total_count, $gli) = @_;
+
+    $self->{'media_type'} = "audio";
+
+    my ($rv,$doc_obj) = $self->SUPER::read_into_doc_obj(@_);
+
+    if ($rv != 1) {
+    return ($rv,$doc_obj);
+    }
+    
+    $self->{'media_type'} = undef;
+
+    return ($rv,$doc_obj);
+}
+
 
 

extensions/gsdl-video/trunk/perllib/plugins/VideoConverter.pm

@@ -394 +394 @@
 
     my $s_opt = "";
-    if ($self->{'media_type'} ne "audio") {
+    my $media_type = $self->{'media_type'};
+    if ($media_type ne "audio") {
     $s_opt = $self->optional_frame_scale($streaming_size,$video_width,$video_height);
     }

extensions/gsdl-video/trunk/perllib/plugins/VideoPlugin.pm

@@ -602 +602 @@
     my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $processor, $maxdocs, $total_count, $gli) = @_;
 
+    $self->{'media_type'} = "video";
+
     my ($rv,$doc_obj) = $self->SUPER::read_into_doc_obj(@_);
 
@@ -624 +626 @@
     }
     
+    $self->{'media_type'} = undef;
+
     return ($rv,$doc_obj);
 }