Changeset 2327

Timestamp:

10/10/07 15:04:48 (1 year ago)

Author:

kmaclean

Message:

Fix to upload bar - not in synch with rate of upload of file to server (ticket #261)
Fix License notice

Files:

• Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/CapturePlayback.java (modified) (4 diffs)
• Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/License.java (modified) (3 diffs)

Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/CapturePlayback.java

@@ -100 +100 @@
-    
-    AudioFormat format = new AudioFormat(samplingRate, samplingRateFormat, numberChannels, true, false);
-
+
-// !!!!!!    
-    Capture capture = new Capture();
@@ -2130 +2130 @@
-//            progBar.setMaximum((int)spxFile.length());
-//            totalBytes = ((int)spxFile.length());
-
+//
- //           totalBytes = ((int)wavFile.length());            
-// !!!!!!            
@@ -2241 +2241 @@
-        String licenseNotice = "Copyright " + cal.get(Calendar.YEAR) + " " + copyrightName + System.getProperty("line.separator") 
-                + System.getProperty("line.separator") 
-
+Blank
-        out_licenseNoticeFile.write(licenseNotice);
-        out_licenseNoticeFile.close();  
@@ -2295 +2295 @@
-//!!!!!!
-totalBytes = ((int)archiveFile.length()) ; 
+progBar.setMaximum((int)archiveFile.length());
-// !!!!!!
-//############ Upload #################################### 

Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/License.java

@@ -31 +31 @@
-                        + System.getProperty("line.separator");
-                
-
-
-
+
+
-                        + "them under the terms of the GNU General Public License as published by" + System.getProperty("line.separator")
-                        + "the Free Software Foundation, either version 3 of the License, or" + System.getProperty("line.separator")
@@ -758 +757 @@
-    }
-        public String getlicenseNotice() {
-
+
+
+
+
+
+
-    }
-        public String getGPLLicense() {
@@ -766 +770 @@
-                return  licenseFAQ + 
-                "E. GPL License Notice which will be included with your submission:" + System.getProperty("line.separator")+ System.getProperty("line.separator") + 
-
+
+
+
-                "F. Full GPL License: (will also be included with your submission)" + System.getProperty("line.separator") + System.getProperty("line.separator")  + 
-                gplLicense;