voxforge.org
VoxForge Dev

Changeset 2461

Show
Ignore:
Timestamp:
03/02/08 23:01:00 (10 months ago)
Author:
kmaclean
Message:

audio.pm conversion to class ... snapshot

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • Trunk/Scripts/Audio_scripts/UserSubmission.pm

    r2460 r2461  
    7070                Convert2Unix($parms, $audio_dir_name);  
    7171                ValidateFilenames($parms, $audio_dir_name) || confess "UserSubmission error: $?" ; 
     72 
    7273                my $readme = UserSubmission::README->new($parms, "$QuarantineDir/$audio_dir_name/README");  
    73                         
    7474                print "!!!!$audio_dir_name:UserSubmission-README says:".$readme->getSamplingrate ."-".$readme->getSamplingrateformat."-".$readme->getFiletype.";dialect:".$readme->getDialect."\n\n" if $debug; 
     75 
    7576                my $audio = UserSubmission::AUDIO->new($parms, $audio_dir_name, $readme) || confess "UserSubmission error: $?" ;        #checks that audio rates in README match actual files    
    7677                if ($audio->getError) { 
     
    8283                my $prompts = UserSubmission::PROMPTS->new($parms, $audio_dir_name, $readme); 
    8384                if ($prompts->getError) { 
    84                         confess "UserSubmission error: $audio->getErrorMessage\n"; 
     85                        confess "UserSubmission error: $prompts->getErrorMessage\n"; 
    8586                } 
    8687                #my $numberofPromptstoProcess = 10; 
    8788                #$audio->Audio2PromptsValidation($parms, $audio_dir_name,$numberofPromptstoProcess)  || confess "UserSubmission error: $?" ; # partial AM training session using audio data to see if HVite has any problems trying to re-align the data - if it does, then audio does not match transcription 
    88                 $audio->Audio2PromptsValidation($parms, $audio_dir_name,$prompts)  || confess "UserSubmission error: $?" ; # partial AM training session using audio data to see if HVite has any problems trying to re-align the data - if it does, then audio does not match transcription 
     89                #$audio->Audio2PromptsValidation($parms, $audio_dir_name,$prompts)  || confess "UserSubmission error: $?" ; # partial AM training session using audio data to see if HVite has any problems trying to re-align the data - if it does, then audio does not match transcription 
     90                $audio->Audio2PromptsValidation($prompts)  || confess "UserSubmission error: $?" ; # partial AM training session using audio data to see if HVite has any problems trying to re-align the data - if it does, then audio does not match transcription 
     91                if ($audio->getError) { 
     92                        confess "UserSubmission error: $audio->getErrorMessage" ; 
     93                } 
    8994                # !!!!!! 
    9095                $directorynames{$audio_dir_name} = [$readme->getSamplingrate, $readme->getSamplingrateformat, $readme->getFiletype, $audio ]; 
  • Trunk/Scripts/Audio_scripts/UserSubmission/AUDIO.pm

    r2460 r2461  
    3939#################################################################### 
    4040sub new { 
    41         my ($class, $parms, $audio_dir_name, $readme) = @_; 
     41        my ($class, $parms, $audio_dir_name, $readme, $prompts) = @_; 
    4242        my $self = _audioValidation($parms, $audio_dir_name, $readme); 
     43        $self->{'parms'} = $parms;                       
     44        $self->{'audio_dir_name'} = $audio_dir_name;  
     45        $self->{'readme'} = $readme; 
     46        $self->{'prompts'} = $prompts;   
     47                                                         
    4348        if (lc $readme->getFiletype() eq "flac") {               
    4449                _flac2Wav($self, $parms, $audio_dir_name,$readme); 
     
    231236        # !!!!!! 
    232237        #my ($self, $parms, $audio_dir_name, $numberofPrompts ) = @_; 
    233         my ($self, $parms, $audio_dir_name, $prompts ) = @_; 
     238        my ($self,$prompts) = @_; 
     239 
     240        my $parms = $self->{'parms'}; 
     241        my $audio_dir_name = $self->{'audio_dir_name'}; 
     242        my $numberofPrompts = $prompts->getPromptCount; 
    234243        # !!!!!!         
    235244                my $debug = $$parms{"debug"}; 
     
    257266                chomp $line; 
    258267                my $filename; 
    259                 if ($line =~ /Aligning File:/) { # this is not working properly ???? 
     268                if ($line =~ /Aligning File:/) {  
    260269                        my @line=split(/:/, $line); 
    261270                        $filename = pop(@line); 
     
    270279                # !!!!!!         
    271280                } elsif ($line =~ /Created lattice with/) { 
    272                         my @line=split(/ /, $line); 
    273281                        $count++; 
    274282                # !!!!!!         
     
    389397        return $self->{'originalAudioFormat'}; 
    390398}                
     399 
    3914001;