voxforge.org
VoxForge Dev

Changeset 2515

Show
Ignore:
Timestamp:
03/28/08 10:11:13 (5 months ago)
Author:
kmaclean
Message:

speech submission snapshot

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder

    • Property svn:ignore set to
      CapturePlayback.java-bak
  • Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/CapturePlayback.java

    r2469 r2515  
    8686    AudioInputStream audioInputStream; 
    8787    SamplingGraph samplingGraph; 
    88 // !!!!!! 
    89     int numberofPrompts = 5; 
     88 
     89    // int numberofPrompts = 5; 
     90    int numberofPrompts = 40; 
    9091    JButton [] playA = new JButton [numberofPrompts]; //creates the array, not the objects! 
    9192    JButton [] captA = new JButton [numberofPrompts]; //creates the array, not the objects! 
    92 /* 
    93     JButton play1; 
    94     JButton capt1; 
    95     JButton play2; 
    96     JButton capt2; 
    97     JButton play3; 
    98     JButton capt3; 
    99     JButton play4; 
    100     JButton capt4; 
    101     JButton play5; 
    102     JButton capt5; 
    103     JButton play6; 
    104     JButton capt6; 
    105     JButton play7; 
    106     JButton capt7; 
    107     JButton play8; 
    108     JButton capt8; 
    109     JButton play9; 
    110     JButton capt9; 
    111     JButton play10; 
    112     JButton capt10; 
    113  !!!!!! */        
    11493     
    11594    JButton uploadB; 
    11695    JButton moreInfoB;     
    11796    JButton aboutB;  
    118   
    119     // !!!!!! 
     97 
    12098    boolean [] play_stateA = new boolean [numberofPrompts]; 
    12199    boolean [] capt_stateA = new boolean [numberofPrompts]; 
    122 /* 
    123     boolean play1_state; 
    124     boolean capt1_state; 
    125     boolean play2_state; 
    126     boolean capt2_state; 
    127     boolean play3_state; 
    128     boolean capt3_state; 
    129     boolean play4_state; 
    130     boolean capt4_state; 
    131     boolean play5_state; 
    132     boolean capt5_state; 
    133     boolean play6_state; 
    134     boolean capt6_state; 
    135     boolean play7_state; 
    136     boolean capt7_state; 
    137     boolean play8_state; 
    138     boolean capt8_state; 
    139     boolean play9_state; 
    140     boolean capt9_state; 
    141     boolean play10_state; 
    142     boolean capt10_state; 
    143  !!!!!! */ 
     100 
    144101    License licenseObject = new License(); 
    145102    String license = licenseObject.getLicense(); 
     
    151108    String errStr; 
    152109 
    153     // !!!!!! 
    154110    double [] durationA= new double [numberofPrompts]; 
    155111    double duration = 0; 
    156 /* 
    157     double duration1 = 0; 
    158     double duration2 = 0; 
    159     double duration3 = 0;   
    160     double duration4 = 0; 
    161     double duration5 = 0; 
    162     double duration6 = 0; 
    163     double duration7 = 0;   
    164     double duration8 = 0; 
    165     double duration9 = 0;   
    166     double duration10 = 0; 
    167  !!!!!! */ 
     112 
    168113    double seconds; 
    169     // !!!!!! 
     114 
    170115    long [] totalBytesWrittenA= new long [numberofPrompts]; 
    171116    long totalBytesWritten = 0L; 
    172     /* 
    173     long totalBytesWritten1 = 0L; 
    174     long totalBytesWritten2 = 0L; 
    175     long totalBytesWritten3 = 0L; 
    176     long totalBytesWritten4 = 0L; 
    177     long totalBytesWritten5 = 0L; 
    178     long totalBytesWritten6 = 0L; 
    179     long totalBytesWritten7 = 0L; 
    180     long totalBytesWritten8 = 0L; 
    181     long totalBytesWritten9 = 0L; 
    182     long totalBytesWritten10 = 0L; 
    183         !!!!!! */     
    184      
     117      
    185118    File file; 
    186119    Vector lines = new Vector(); 
    187120   
    188121    private File wavFile; 
    189     // !!!!!! 
    190122    private File[] wavFileA = new File [numberofPrompts]; 
    191     /* 
    192     private File wavFile1; 
    193     private File wavFile2; 
    194     private File wavFile3; 
    195     private File wavFile4; 
    196     private File wavFile5;   
    197     private File wavFile6; 
    198     private File wavFile7; 
    199     private File wavFile8; 
    200     private File wavFile9; 
    201     private File wavFile10; 
    202     !!!!!! */ 
     123  
    203124    private File [] uploadWavFileA = new File [numberofPrompts]; 
    204     /* 
    205     private File uploadWavFile1; 
    206     private File uploadWavFile2; 
    207     private File uploadWavFile3; 
    208     private File uploadWavFile4; 
    209     private File uploadWavFile5;      
    210     private File uploadWavFile6; 
    211     private File uploadWavFile7; 
    212     private File uploadWavFile8; 
    213     private File uploadWavFile9; 
    214     private File uploadWavFile10;   
    215     !!!!!! */       
     125   
    216126    private File promptsFile;   
    217127    private File readmeFile;     
     
    226136    JTextField subjectBox; 
    227137    String subject; 
    228     // !!!!!! 
     138 
    229139    String [] promptA = new String [numberofPrompts]; 
    230     /* 
    231     String prompt1; 
    232     String prompt2; 
    233     String prompt3; 
    234     String prompt4; 
    235     String prompt5;   
    236     String prompt6; 
    237     String prompt7; 
    238     String prompt8; 
    239     String prompt9; 
    240     String prompt10;   
    241     !!!!!! */ 
    242     // !!!!!! 
    243140    String [] promptidA = new String [numberofPrompts];; 
    244     /* 
    245     String promptID1; 
    246     String promptID2; 
    247     String promptID3; 
    248     String promptID4; 
    249     String promptID5;     
    250     String promptID6; 
    251     String promptID7; 
    252     String promptID8; 
    253     String promptID9; 
    254     String promptID10;   
    255     !!!!!! */   
     141  
    256142//  required for the PHP uploader to work properly 
    257143    String fileFieldName = "userfile";  
     
    376262        //String [][] promptArray = prompts.getPrompts(); 
    377263         
    378         // !!!!!! 
    379         String [][] promptArray = (new Prompts(numberofPrompts,this.language)).getPrompts(); 
     264    // !!!!!! 
     265        String [][] promptArray = (new Prompts(numberofPrompts,this.language)).getPrompts(); 
     266    for (int i = 0; i < numberofPrompts; i++) { 
     267        this.promptidA [i] = promptArray[0][i]; 
     268        this.promptA [i] = promptArray[1][i]; 
     269        System.err.println("Prompts:" + this.promptidA[i] + ":"+ this.promptA [i]); 
     270    } 
     271    
     272//  this.language = language; 
     273    this.destinationURL = destinationURL; 
     274    this.endPageURL = endPageURL; 
     275    this.helpPageURL = helpPageURL; 
     276    this.cookie = cookie; 
     277     
     278    capturePlayback = this; 
     279 
     280        // Create WAV files to hold recordings 
     281        try { 
    380282        for (int i = 0; i < numberofPrompts; i++) { 
    381                 this.promptidA [i] = promptArray[0][i]; 
    382                 this.promptA [i] = promptArray[1][i]; 
    383         } 
    384     
    385         // !!!!!! 
    386 /* !!!!!! 
    387  *          this.promptID1 = promptArray[0][0]; 
    388         this.prompt1 = promptArray[1][0]; 
    389                 this.promptID2 = promptArray[0][1]; 
    390                 this.prompt2 = promptArray[1][1]; 
    391                 this.promptID3 = promptArray[0][2]; 
    392                 this.prompt3 = promptArray[1][2]; 
    393                 this.promptID4 = promptArray[0][3];  
    394                 this.prompt4 = promptArray[1][3]; 
    395                 this.promptID5 = promptArray[0][4]; 
    396                 this.prompt5 = promptArray[1][4]; 
    397                 this.promptID6 = promptArray[0][5]; 
    398         this.prompt6 = promptArray[1][5]; 
    399                 this.promptID7 = promptArray[0][6]; 
    400                 this.prompt7 = promptArray[1][6]; 
    401                 this.promptID8 = promptArray[0][7]; 
    402                 this.prompt8 = promptArray[1][7]; 
    403                 this.promptID9 = promptArray[0][8];  
    404                 this.prompt9 = promptArray[1][8]; 
    405                 this.promptID10 = promptArray[0][9]; 
    406                 this.prompt10 = promptArray[1][9]; 
    407 !!!!!!  */                       
    408     //}  
    409  
    410 //        this.language = language; 
    411         this.destinationURL = destinationURL; 
    412         this.endPageURL = endPageURL; 
    413         this.helpPageURL = helpPageURL; 
    414         this.cookie = cookie; 
    415          
    416         capturePlayback = this; 
    417  
    418                 // Create WAV files to hold recordings 
    419                 try { 
    420                         // !!!!!! 
    421                 for (int i = 0; i < numberofPrompts; i++) { 
    422                         wavFileA [i] = new File(tempdir + "wavFile" + i + ".wav"); 
    423                         wavFileA[i].deleteOnExit(); 
    424                 } 
    425                 /* 
    426                         wavFile1 = new File(tempdir + "wavFile1.wav"); 
    427                         wavFile1.deleteOnExit(); 
    428                         wavFile2 = new File(tempdir + "wavFile2.wav"); 
    429                         wavFile2.deleteOnExit(); 
    430                         wavFile3 = new File(tempdir + "wavFile3.wav"); 
    431                         wavFile3.deleteOnExit(); 
    432                         wavFile4 = new File(tempdir + "wavFile4.wav"); 
    433                         wavFile4.deleteOnExit(); 
    434                         wavFile5 = new File(tempdir + "wavFile5.wav"); 
    435                         wavFile5.deleteOnExit(); 
    436                         wavFile6 = new File(tempdir + "wavFile6.wav"); 
    437                         wavFile6.deleteOnExit(); 
    438                         wavFile7 = new File(tempdir + "wavFile7.wav"); 
    439                         wavFile7.deleteOnExit(); 
    440                         wavFile8 = new File(tempdir + "wavFile8.wav"); 
    441                         wavFile8.deleteOnExit(); 
    442                         wavFile9 = new File(tempdir + "wavFile9.wav"); 
    443                         wavFile9.deleteOnExit(); 
    444                         wavFile10 = new File(tempdir + "wavFile10.wav"); 
    445                         wavFile10.deleteOnExit(); 
    446                         */ 
    447                 for (int i = 0; i < numberofPrompts; i++) { 
    448                                 uploadWavFileA[i] = new File(tempdir + this.promptidA [i] + ".wav"); 
    449                                 uploadWavFileA[i].deleteOnExit(); 
    450                 } 
    451                 /* 
    452                         uploadWavFile1 = new File(tempdir + this.promptID1 + ".wav"); 
    453                         uploadWavFile1.deleteOnExit(); 
    454                         uploadWavFile2 = new File(tempdir + this.promptID2 + ".wav"); 
    455                         uploadWavFile2.deleteOnExit(); 
    456                         uploadWavFile3 = new File(tempdir + this.promptID3 + ".wav"); 
    457                         uploadWavFile3.deleteOnExit(); 
    458                         uploadWavFile4 = new File(tempdir + this.promptID4 + ".wav"); 
    459                         uploadWavFile4.deleteOnExit(); 
    460                         uploadWavFile5 = new File(tempdir + this.promptID5 + ".wav"); 
    461                         uploadWavFile5.deleteOnExit(); 
    462                         uploadWavFile6 = new File(tempdir + this.promptID6 + ".wav"); 
    463                         uploadWavFile6.deleteOnExit(); 
    464                         uploadWavFile7 = new File(tempdir + this.promptID7 + ".wav"); 
    465                         uploadWavFile7.deleteOnExit(); 
    466                         uploadWavFile8 = new File(tempdir + this.promptID8 + ".wav"); 
    467                         uploadWavFile8.deleteOnExit(); 
    468                         uploadWavFile9 = new File(tempdir + this.promptID9 + ".wav"); 
    469                         uploadWavFile9.deleteOnExit(); 
    470                         uploadWavFile10 = new File(tempdir + this.promptID10 + ".wav"); 
    471                         uploadWavFile10.deleteOnExit(); 
    472                         */                       
    473                         promptsFile = new File(tempdir + "prompts.txt");                         
    474                         promptsFile.deleteOnExit();              
    475                         readmeFile = new File(tempdir + "readme.txt");                   
    476                         readmeFile.deleteOnExit();               
    477                         licenseFile = new File(tempdir + "GPL_license.txt");                     
    478                         licenseFile.deleteOnExit();                      
    479                         licenseNoticeFile = new File(tempdir + "license.txt");   
    480                         licenseFile.deleteOnExit();      
    481                 } catch (Exception e) { 
    482                         System.err.println("Unable to create WAV cache file for storing audio\n" + e); 
    483                         return; 
    484                 } 
    485                 // !!!!!! 
    486         for (int i = 0; i < numberofPrompts; i++) {                      
    487                 System.err.println("CapturePlayback's WAV file for recording uploadWavFile" + i + "is:" + uploadWavFileA[i]); 
    488         } 
    489                 /* 
    490                 System.err.println("CapturePlayback's WAV file for recording uploadWavFile1 is:" + uploadWavFile1); 
    491                 System.err.println("CapturePlayback's WAV file for recording uploadWavFile2 is:" + uploadWavFile2); 
    492                 System.err.println("CapturePlayback's WAV file for recording uploadWavFile3 is:" + uploadWavFile3); 
    493                 System.err.println("CapturePlayback's WAV file for recording uploadWavFile4 is:" + uploadWavFile4); 
    494                 System.err.println("CapturePlayback's WAV file for recording uploadWavFile5 is:" + uploadWavFile5); 
    495                 System.err.println("CapturePlayback's WAV file for recording uploadWavFile6 is:" + uploadWavFile6); 
    496                 System.err.println("CapturePlayback's WAV file for recording uploadWavFile7 is:" + uploadWavFile7); 
    497                 System.err.println("CapturePlayback's WAV file for recording uploadWavFile8 is:" + uploadWavFile8); 
    498                 System.err.println("CapturePlayback's WAV file for recording uploadWavFile9 is:" + uploadWavFile9); 
    499                 System.err.println("CapturePlayback's WAV file for recording uploadWavFile10 is:" + uploadWavFile10);            
    500                 System.err.println("---------------------------------------------------------------------------");               
    501                 !!!!!! */ 
     283                wavFileA [i] = new File(tempdir + "wavFile" + i + ".wav"); 
     284                wavFileA[i].deleteOnExit(); 
     285        } 
     286        for (int i = 0; i < numberofPrompts; i++) { 
     287                        uploadWavFileA[i] = new File(tempdir + this.promptidA [i] + ".wav"); 
     288                        uploadWavFileA[i].deleteOnExit(); 
     289        } 
     290                promptsFile = new File(tempdir + "prompts.txt");                         
     291                promptsFile.deleteOnExit();              
     292                readmeFile = new File(tempdir + "readme.txt");                   
     293                readmeFile.deleteOnExit();               
     294                licenseFile = new File(tempdir + "GPL_license.txt");                     
     295                licenseFile.deleteOnExit();                      
     296                licenseNoticeFile = new File(tempdir + "license.txt");   
     297                licenseFile.deleteOnExit();      
     298        } catch (Exception e) { 
     299                System.err.println("Unable to create WAV cache file for storing audio\n" + e); 
     300                return; 
     301        } 
     302    for (int i = 0; i < numberofPrompts; i++) {                  
     303                System.err.println("CapturePlayback's WAV file for recording uploadWavFile" + i + "is:" + uploadWavFileA[i]); 
     304    } 
     305 
     306//  ############ GUI Display ####################################    
    502307                setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); 
    503308        EmptyBorder eb = new EmptyBorder(5,5,5,5); 
     
    524329                     gender = (String)genderChooser.getSelectedItem(); 
    525330                 } 
    526                  }); 
     331               }); 
    527332        p2.add(genderPanel); 
    528333// ############ Age Range ####################################              
     
    536341                     ageRange = (String)ageRangeChooser.getSelectedItem(); 
    537342                 } 
    538                  }); 
     343               }); 
    539344        p2.add(ageRangePanel); 
    540345//      ############ Pronunciation Dialect: ####################################        
     
    545350        dialectChooser.setSelectedIndex(0);   
    546351        dialectChooser.addActionListener(new ActionListener(){ 
    547             public void actionPerformed(ActionEvent e){ 
    548                 dialect = (String)dialectChooser.getSelectedItem(); 
    549             } 
     352                   public void actionPerformed(ActionEvent e){ 
     353                       dialect = (String)dialectChooser.getSelectedItem(); 
     354                   } 
    550355            }); 
    551356        p2.add(dialectPanel); 
     
    561366                     microphone = (String)microphoneChooser.getSelectedItem(); 
    562367                 } 
    563                  }); 
     368               }); 
    564369        p2.add(microphonePanel); 
    565 //      ############ Prompts container ####################################    
     370       //############ Prompt container ####################################    
    566371        JPanel promptsContainer = new JPanel();  
    567372        promptsContainer.setLayout(new FlowLayout(FlowLayout.CENTER)); 
     373        Color voxforgeColour    = new Color(197, 216, 234); 
     374        // assume 40 prompts 
     375        int startPromptCount = 0; 
     376        int promptsPerPane = 10; 
    568377//      ############ Prompts panel ####################################          
    569378        JPanel prompts = new JPanel();  
    570379        prompts.setLayout(new BoxLayout(prompts, BoxLayout.Y_AXIS)); 
    571         Color voxforgeColour  = new Color(197, 216, 234); 
     380        //Color voxforgeColour        = new Color(197, 216, 234); 
    572381        prompts.setBorder(BorderFactory.createLineBorder (voxforgeColour, 3)); 
    573382     
    574383        int maxWidth = 40; 
    575384 
    576         JPanel promptPanelA[] = new JPanel[numberofPrompts];  
    577         JPanel promptInnerPanelA[] = new JPanel[numberofPrompts];    
    578          
    579         for (int i = 0; i < numberofPrompts; i++) { 
     385        //JPanel promptPanelA[] = new JPanel[numberofPrompts];  
     386        //JPanel promptInnerPanelA[] = new JPanel[numberofPrompts];    
     387        JPanel promptPanelA[] = new JPanel[promptsPerPane];  
     388        JPanel promptInnerPanelA[] = new JPanel[promptsPerPane];  
     389        for (int i = startPromptCount; i < promptsPerPane; i++) { 
    580390                promptPanelA[i] = new JPanel(); 
    581391                promptPanelA[i].setLayout(new FlowLayout(FlowLayout.LEFT));     
     
    593403                prompts.add(promptPanelA[i]);   
    594404        } 
    595 //      ############ Prompts container ####################################           
     405        //############ Prompt container ####################################     
    596406        promptsContainer.add(prompts); 
    597407        p2.add(promptsContainer); 
    598         /* 
    599 //              ############ Prompt1 ####################################      
    600         JPanel prompt1Panel = new JPanel();  
    601         prompt1Panel.setLayout(new FlowLayout(FlowLayout.LEFT));        
    602         JPanel prompt1InnerPanel = new JPanel();  
    603         prompt1InnerPanel.setBorder(BorderFactory.createLineBorder (voxforgeColour, 1)); 
    604         prompt1InnerPanel.add(new MultiLineLabel(prompt1Panel, this.prompt1, maxWidth)); 
    605         prompt1Panel.add(prompt1InnerPanel); 
    606         play1 = addButton(playButton, prompt1Panel, false); 
    607         capt1 = addButton(recordButton, prompt1Panel, false); 
    608         prompts.add(prompt1Panel);     
    609 //              ############ Prompt2 ####################################             
    610         JPanel prompt2Panel = new JPanel();  
    611         prompt2Panel.setLayout(new FlowLayout(FlowLayout.LEFT));        
    612         JPanel prompt2InnerPanel = new JPanel();  
    613         prompt2InnerPanel.setBorder(BorderFactory.createLineBorder (voxforgeColour, 1)); 
    614         prompt2InnerPanel.add(new MultiLineLabel(prompt2Panel, this.prompt2, maxWidth)); 
    615         prompt2Panel.add(prompt2InnerPanel); 
    616         play2 = addButton(playButton, prompt2Panel, false); 
    617         capt2 = addButton(recordButton, prompt2Panel, false); 
    618         prompts.add(prompt2Panel);         
    619 //      ############ Prompt3 ####################################             
    620         JPanel prompt3Panel = new JPanel();  
    621         prompt3Panel.setLayout(new FlowLayout(FlowLayout.LEFT));       
    622         JPanel prompt3InnerPanel = new JPanel();  
    623         prompt3InnerPanel.setBorder(BorderFactory.createLineBorder (voxforgeColour, 1)); 
    624         prompt3InnerPanel.add(new MultiLineLabel(prompt3Panel, this.prompt3, maxWidth)); 
    625         prompt3Panel.add(prompt3InnerPanel); 
    626         play3 = addButton(playButton, prompt3Panel, false); 
    627         capt3 = addButton(recordButton, prompt3Panel, false); 
    628         prompts.add(prompt3Panel);      
    629 //      ############ Prompt4 ####################################             
    630         JPanel prompt4Panel = new JPanel();  
    631         prompt4Panel.setLayout(new FlowLayout(FlowLayout.LEFT));  
    632         JPanel prompt4InnerPanel = new JPanel();  
    633         prompt4InnerPanel.setBorder(BorderFactory.createLineBorder (voxforgeColour, 1)); 
    634         prompt4InnerPanel.add(new MultiLineLabel(prompt4Panel, this.prompt4, maxWidth)); 
    635         prompt4Panel.add(prompt4InnerPanel);      
    636         play4 = addButton(playButton, prompt4Panel, false); 
    637         capt4 = addButton(recordButton, prompt4Panel, false); 
    638         prompts.add(prompt4Panel);      
    639 //      ############ Prompt5 ####################################             
    640         JPanel prompt5Panel = new JPanel();  
    641         prompt5Panel.setLayout(new FlowLayout(FlowLayout.LEFT));      
    642         JPanel prompt5InnerPanel = new JPanel();  
    643         prompt5InnerPanel.setBorder(BorderFactory.createLineBorder (voxforgeColour, 1)); 
    644         prompt5InnerPanel.add(new MultiLineLabel(prompt5Panel, this.prompt5, maxWidth)); 
    645         prompt5Panel.add(prompt5InnerPanel); 
    646         play5 = addButton(playButton, prompt5Panel, false); 
    647         capt5 = addButton(recordButton, prompt5Panel, false); 
    648         prompts.add(prompt5Panel);  
    649 //      ############ Prompt6 ####################################         
    650         JPanel prompt6Panel = new JPanel();  
    651         prompt6Panel.setLayout(new FlowLayout(FlowLayout.LEFT));  
    652         JPanel prompt6InnerPanel = new JPanel(); 
    653         prompt6InnerPanel.setBorder(BorderFactory.createLineBorder (voxforgeColour, 1)); 
    654         prompt6InnerPanel.add(new MultiLineLabel(prompt6Panel, this.prompt6, maxWidth)); 
    655         prompt6Panel.add(prompt6InnerPanel); 
    656         play6 = addButton(playButton, prompt6Panel, false); 
    657         play6.setSize(10,10); 
    658         capt6 = addButton(recordButton, prompt6Panel, false); 
    659         prompts.add(prompt6Panel); 
    660 //              ############ prompt7 ####################################             
    661         JPanel prompt7Panel = new JPanel();  
    662         prompt7Panel.setLayout(new FlowLayout(FlowLayout.LEFT));        
    663         JPanel prompt7InnerPanel = new JPanel();  
    664         prompt7InnerPanel.setBorder(BorderFactory.createLineBorder (voxforgeColour, 1)); 
    665         prompt7InnerPanel.add(new MultiLineLabel(prompt7Panel, this.prompt7, maxWidth)); 
    666         prompt7Panel.add(prompt7InnerPanel); 
    667         play7 = addButton(playButton, prompt7Panel, false); 
    668         capt7 = addButton(recordButton, prompt7Panel, false); 
    669         prompts.add(prompt7Panel);         
    670 //      ############ prompt8 ####################################             
    671         JPanel prompt8Panel = new JPanel();  
    672         prompt8Panel.setLayout(new FlowLayout(FlowLayout.LEFT));       
    673         JPanel prompt8InnerPanel = new JPanel();  
    674         prompt8InnerPanel.setBorder(BorderFactory.createLineBorder (voxforgeColour, 1)); 
    675         prompt8InnerPanel.add(new MultiLineLabel(prompt8Panel, this.prompt8, maxWidth)); 
    676         prompt8Panel.add(prompt8InnerPanel); 
    677         play8 = addButton(playButton, prompt8Panel, false); 
    678         capt8 = addButton(recordButton, prompt8Panel, false); 
    679         prompts.add(prompt8Panel);      
    680 //      ############ prompt9 ####################################             
    681         JPanel prompt9Panel = new JPanel();  
    682         prompt9Panel.setLayout(new FlowLayout(FlowLayout.LEFT));  
    683         JPanel prompt9InnerPanel = new JPanel();  
    684         prompt9InnerPanel.setBorder(BorderFactory.createLineBorder (voxforgeColour, 1)); 
    685         prompt9InnerPanel.add(new MultiLineLabel(prompt9Panel, this.prompt9, maxWidth)); 
    686         prompt9Panel.add(prompt9InnerPanel);      
    687         play9 = addButton(playButton, prompt9Panel, false); 
    688         capt9 = addButton(recordButton, prompt9Panel, false); 
    689         prompts.add(prompt9Panel);      
    690 //      ############ prompt10 ####################################             
    691         JPanel prompt10Panel = new JPanel();  
    692         prompt10Panel.setLayout(new FlowLayout(FlowLayout.LEFT));      
    693         JPanel prompt10InnerPanel = new JPanel();  
    694         prompt10InnerPanel.setBorder(BorderFactory.createLineBorder (voxforgeColour, 1)); 
    695         prompt10InnerPanel.add(new MultiLineLabel(prompt10Panel, this.prompt10, maxWidth)); 
    696         prompt10Panel.add(prompt10InnerPanel); 
    697         play10 = addButton(playButton, prompt10Panel, false); 
    698         capt10 = addButton(recordButton, prompt10Panel, false); 
    699         prompts.add(prompt10Panel);  
    700         promptsContainer.add(prompts); 
    701         p2.add(promptsContainer); 
    702 //      ############ Prompts container ####################################           
    703         promptsContainer.add(prompts); 
    704         p2.add(promptsContainer); 
    705         */ 
     408 
     409         
     410 
    706411//      ############ Sampling Graph ####################################           
    707412        JPanel samplingPanel = new JPanel(new BorderLayout()); 
     
    741446//#########################################################################    
    742447         add(p2); 
     448 
    743449    } 
    744450 
  • Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/LabelLocalizer.java

    r2466 r2515  
    8585         
    8686             dialectPanelLabel = "Pronunciation Dialect:"; 
    87              dialectSelection = new String [10]; 
     87             dialectSelection = new String [11]; 
    8888             dialectSelection[0] = pleaseSelect;     
    8989             dialectSelection[1] = "Australian English";     
     
    9292             dialectSelection[4] = "Canadian English";       
    9393             dialectSelection[5] = "European English";  
    94              dialectSelection[6] = "Indian English";  
    95              dialectSelection[7] = "New Zealand English";  
    96              dialectSelection[8] = "South African English";      
    97              dialectSelection[9] = "Other"; 
     94             dialectSelection[6] = "Indian English"; 
     95             dialectSelection[7] = "Irish English";  
     96             dialectSelection[8] = "New Zealand English";  
     97             dialectSelection[9] = "South African English";   
     98             dialectSelection[10] = "Other"; 
    9899             
    99100             microphonePanelLabel = "Microphone Type:"; 
  • Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/englishPromptList.txt

    r2466 r2515  
    993993b0309 Nor was Elam Harnish an exception. 
    994994b0310 A little treatment, massage, with some help from the doctor. 
    995 b0311 The 29th very foggy. 
     995b0311 The twenty ninth very foggy. 
    996996b0312 Dig in; you're sure good, was Daylight's answer. 
    997997b0313 The apron string loomed near and he shied like an unbroken colt.