General Code Cleanup and bin size fix for getPitch() method.v1.10

8 files changed, 17 insertions, 14 deletions

diff --git a/CREDITS.markdown b/CREDITS.markdown
index 899cf54..17c20a7 100644
--- a/CREDITS.markdown
+++ b/CREDITS.markdown
@@ -18,5 +18,6 @@ The following people/organizations have helped provide functionality for the API
 * Princeton University
 	* The implemented FFT algorithm is derived from one on the university's website.
 	* Homepage: http://www.princeton.edu
+
 We would like to thank the above so much for your work, this wrapper/API could not have been
 created without it.
\ No newline at end of file
diff --git a/README.markdown b/README.markdown
index 93c33a6..e59afa2 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,6 +1,6 @@
 #J.A.R.V.I.S. (Java-Speech-API)
 
-J.A.R.V.I.S. Speech API: Just A Reliable Vocal Interpreter & Synthesizer. 
+J.A.R.V.I.S. Java Speech API: Just A Reliable Vocal Interpreter & Synthesizer. 
 This is a project for the Java Speech API. The program interprets vocal inputs into text and synthesizes voices from text input.
 The program supports dozens of languages and even has the ability to auto-detect languages! 
 
diff --git a/src/com/darkprograms/speech/microphone/Microphone.java b/src/com/darkprograms/speech/microphone/Microphone.java
index c674a3e..485d35f 100644
--- a/src/com/darkprograms/speech/microphone/Microphone.java
+++ b/src/com/darkprograms/speech/microphone/Microphone.java
@@ -4,11 +4,11 @@ import javax.sound.sampled.*;
 
 import java.io.File;
 
-/**
+/***************************************************************************
  * Microphone class that contains methods to capture audio from microphone
  *
  * @author Luke Kuza, Aaron Gokaslan
- */
+ ***************************************************************************/
 public class Microphone {
 	
     /**
diff --git a/src/com/darkprograms/speech/microphone/MicrophoneAnalyzer.java b/src/com/darkprograms/speech/microphone/MicrophoneAnalyzer.java
index a9130b8..c4887c7 100644
--- a/src/com/darkprograms/speech/microphone/MicrophoneAnalyzer.java
+++ b/src/com/darkprograms/speech/microphone/MicrophoneAnalyzer.java
@@ -3,12 +3,13 @@ package com.darkprograms.speech.microphone;
 import javax.sound.sampled.AudioFileFormat;

 import com.darkprograms.speech.utility.*;

 

-/**

+/********************************************************************************************

  * Microphone Analyzer class, detects pitch and volume while extending the microphone class.

  * Implemented as a precursor to a Voice Activity Detection (VAD) algorithm.

  * Currently can be used for audio data analysis.

  * Dependencies: FFT.java & Complex.java. Both found in the utility package.

- */

+ * @author Aaron Gokaslan

+ ********************************************************************************************/

 

 public class MicrophoneAnalyzer extends Microphone {

 

@@ -111,7 +112,7 @@ public class MicrophoneAnalyzer extends Microphone {
 	 */

 	public int getFrequency(){

 		try {

-			return getFrequency(1024);

+			return getFrequency(2048);

 		} catch (Exception e) {

 			//This will never happen. Ever...

 			return -666;

diff --git a/src/com/darkprograms/speech/recognizer/FlacEncoder.java b/src/com/darkprograms/speech/recognizer/FlacEncoder.java
index 83027bd..d9b24a4 100644
--- a/src/com/darkprograms/speech/recognizer/FlacEncoder.java
+++ b/src/com/darkprograms/speech/recognizer/FlacEncoder.java
@@ -11,10 +11,10 @@ import java.io.File;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
-/**
+/*************************************************************************************************************
  * Class that contains methods to encode Wave files to FLAC files
  * THIS IS THANKS TO THE javaFlacEncoder Project created here: http://sourceforge.net/projects/javaflacencoder/
- */
+ ************************************************************************************************************/
 public class FlacEncoder {
 
     /**
diff --git a/src/com/darkprograms/speech/recognizer/GoogleResponse.java b/src/com/darkprograms/speech/recognizer/GoogleResponse.java
index da8b750..695141d 100644
--- a/src/com/darkprograms/speech/recognizer/GoogleResponse.java
+++ b/src/com/darkprograms/speech/recognizer/GoogleResponse.java
@@ -3,11 +3,11 @@ package com.darkprograms.speech.recognizer;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
+/******************************************************************************
  * Class that holds the response and confidence of a Google recognizer request
  *
  * @author Luke Kuza, Duncan Jauncey, Aaron Gokaslan
- */
+ ******************************************************************************/
 public class GoogleResponse {
 
     /**
diff --git a/src/com/darkprograms/speech/recognizer/Recognizer.java b/src/com/darkprograms/speech/recognizer/Recognizer.java
index 6c24d3b..c22f667 100644
--- a/src/com/darkprograms/speech/recognizer/Recognizer.java
+++ b/src/com/darkprograms/speech/recognizer/Recognizer.java
@@ -4,11 +4,11 @@ import java.io.*;
 import java.net.URL;
 import java.net.URLConnection;
 
-/**
+/***************************************************************
  * Class that submits FLAC audio and retrieves recognized text
  *
  * @author Luke Kuza, Duncan Jauncey, Aaron Gokaslan
- */
+ **************************************************************/
 public class Recognizer {
 
     public enum Languages{
diff --git a/src/com/darkprograms/speech/synthesiser/Synthesiser.java b/src/com/darkprograms/speech/synthesiser/Synthesiser.java
index 31de7e1..a85d726 100644
--- a/src/com/darkprograms/speech/synthesiser/Synthesiser.java
+++ b/src/com/darkprograms/speech/synthesiser/Synthesiser.java
@@ -9,11 +9,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 
-/**
+
+/*******************************************************************************
  * Synthesiser class that connects to Google's unoffical API to retrieve data
  *
  * @author Luke Kuza, Aaron Gokaslan (Skylion)
- */
+ *******************************************************************************/
 public class Synthesiser {
 
 	/**