Changeset 1102 for trunk/src/org/apollo/meldex

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

Location:

trunk/src/org/apollo/meldex

Files:

• PitchTracker.java (modified) (4 diffs)
• PitchValue.java (modified) (1 diff)
• RogTrack.java (modified) (7 diffs)
• StandardisedMelody.java (modified) (1 diff)
• Transcriber.java (modified) (7 diffs)
• WavSample.java (modified) (14 diffs)

trunk/src/org/apollo/meldex/PitchTracker.java

@@ -3 +3 @@
 import java.util.ArrayList;
 
-@SuppressWarnings("unchecked") // code in java 1.4
 public class PitchTracker
 {
@@ -14 +13 @@
 
     // The pitch data
-    ArrayList pitchData;
+    ArrayList<PitchValue> pitchData;
 
     // Our lovely Pitch Period Estimators
@@ -26 +25 @@
 
 
-    public ArrayList process(byte[] rawData, int rawLength, int rawSampleRate)
+    public ArrayList<PitchValue> process(byte[] rawData, int rawLength, int rawSampleRate)
     {
         // Save the sample rate of the loaded sample
@@ -32 +31 @@
 
         // Allocate a new pitch data array to store our pitch values
-        pitchData = new ArrayList();
+        pitchData = new ArrayList<PitchValue>();
 
         // Reset our 6 pitch period estimators

trunk/src/org/apollo/meldex/PitchValue.java

@@ -11 +11 @@
     public PitchValue(double per, int pos)
     {
-        period = per;
-        position = pos;
+                period = per;
+                position = pos;
     }
 }

trunk/src/org/apollo/meldex/RogTrack.java

@@ -1 +1 @@
 package org.apollo.meldex;
-
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.util.ArrayList;
-import javax.swing.JOptionPane;
-
-@SuppressWarnings("unchecked") // code in java 1.4
+
+import org.expeditee.gio.EcosystemManager;
+
 public class RogTrack
 {
@@ -20 +20 @@
 
     // Data representing the track events
-    ArrayList trackData = new ArrayList();
+    ArrayList<RogTrackEvent> trackData = new ArrayList<RogTrackEvent>();
 
 
@@ -217 +217 @@
         int track_len = trackData.size();
 
-        ArrayList filtered_td = new ArrayList();
+        ArrayList<RogTrackEvent> filtered_td = new ArrayList<RogTrackEvent>();
 
         for (int i = 0; i < track_len; i++) {
@@ -235 +235 @@
         }
 
-        ArrayList me_list = new ArrayList();
+        ArrayList<MelodyEvent> me_list = new ArrayList<MelodyEvent>();
 
         for (int i = 0; i < filtered_track_len-1; i++) {
@@ -283 +283 @@
     public boolean loadFromFile(File rogFile)
     {
-        try {
-            // Open the file with a FileInputStream, ready for parsing
-            FileInputStream fileIn = new FileInputStream(rogFile);
-
-            // Get the number of bytes in the file
-            int rogLength = fileIn.available();
-
-            // Create a buffer to store the file, and read the file into it
-            byte[] rogData = new byte[rogLength];
-            fileIn.read(rogData, 0, rogLength);
-
-            // Parse the .rog file
-            parseFile(rogData, rogLength);
-        }
-        catch (Exception ex) {
-            JOptionPane.showMessageDialog(null, "Exception occurred reading file.\n\n" + ex);
-            return false;
-        }
-
-        // File loaded successfully
-        return true;
+        boolean success = true;
+        FileInputStream fileIn = null;
+                try {
+                    // Open the file with a FileInputStream, ready for parsing
+                    fileIn = new FileInputStream(rogFile);
+        
+                    // Get the number of bytes in the file
+                    int rogLength = fileIn.available();
+        
+                    // Create a buffer to store the file, and read the file into it
+                    byte[] rogData = new byte[rogLength];
+                    fileIn.read(rogData, 0, rogLength);
+        
+                    // Parse the .rog file
+                    parseFile(rogData, rogLength);
+                } catch (Exception ex) {
+                        EcosystemManager.getGraphicsManager().showDialog("Exception", "Exception occurred reading file.\n\n" + ex);
+                        success = false;
+                } finally {
+                        if (fileIn != null) {
+                                try {
+                                        fileIn.close();
+                                } catch (IOException e) {
+                                        // If an IO exception occurs when closing the file, just sweep it under the rug
+                                }
+                        }
+                }
+        
+                // File loaded successfully
+                return success;
     }
 
@@ -406 +415 @@
             // Check that the noteName is valid
             if (noteName < 'A' || noteName > 'G') {
-                JOptionPane.showMessageDialog(null, "Parsing error - check that the Rog file is valid.");
+                EcosystemManager.getGraphicsManager().showDialog("Exception", "Parsing error - check that the Rog file is valid.");
                 return;
             }
@@ -497 +506 @@
         }
         catch (Exception ex) {
-            JOptionPane.showMessageDialog(null, "Exception occurred writing to file.\n\n" + ex);
+            EcosystemManager.getGraphicsManager().showDialog("Exception", "Exception occurred writing to file.\n\n" + ex);
             return false;
         }

trunk/src/org/apollo/meldex/StandardisedMelody.java

@@ -93 +93 @@
 
             // Read the melody from the melody file
-            return (StandardisedMelody) melodyFileStream.readObject();
+            StandardisedMelody standardisedMelody = (StandardisedMelody) melodyFileStream.readObject();
+            
+            melodyFileStream.close();
+            
+            return standardisedMelody;
 
     }

trunk/src/org/apollo/meldex/Transcriber.java

@@ -4 +4 @@
 import java.util.ArrayList;
 
-@SuppressWarnings("unchecked") // code in java 1.4
 public class Transcriber
 {
@@ -255 +254 @@
     {
         // Pitch track the note
-        ArrayList pitchData = pitchTracker.process(data, length, sampleRate);
+        ArrayList<PitchValue> pitchData = pitchTracker.process(data, length, sampleRate);
 
         // Average the pitch data
@@ -265 +264 @@
 
 
-    private int averagePitchData(ArrayList pitchData)
+    private int averagePitchData(ArrayList<PitchValue> pitchData)
     {
         // Loop through the pitch values...
         int i = 0, k = 0;
         while (i < (pitchData.size() - 1)) {
-            int startPos = ((PitchValue) pitchData.get(i)).position;
-            double period = ((PitchValue) pitchData.get(i)).period;
+            int startPos = pitchData.get(i).position;
+            double period = pitchData.get(i).period;
             double averagePeriod = period;
-            double runningPeriod = ((PitchValue) pitchData.get(i+1)).position - startPos;
+            double runningPeriod = pitchData.get(i+1).position - startPos;
             double numPeriods = runningPeriod / period;
 
@@ -280 +279 @@
             while ((i+j) < (pitchData.size() - 1)) {
                 // Get the next pitch estimate
-                period = ((PitchValue) pitchData.get(i+j)).period;
-                int position = ((PitchValue) pitchData.get(i+j)).position;
+                period = pitchData.get(i+j).period;
+                int position = pitchData.get(i+j).position;
 
                 // Make sure that this period is covered by the average so far
@@ -289 +288 @@
 
                 // Stop if we have covered more than 20 msec
-                int nextPos = ((PitchValue) pitchData.get(i+j+1)).position;
+                int nextPos = pitchData.get(i+j+1).position;
                 // if ((nextPos - startPos) >= 445) {  // !! PURE-ROG !!
                 if ((nextPos - startPos) >= (sampleRate * 0.02)) {
@@ -315 +314 @@
 
 
-    private int calculateHistogram(ArrayList data, int length)
+    private int calculateHistogram(ArrayList<PitchValue> data, int length)
     {
         // This probably shouldn't be a constant
@@ -328 +327 @@
         // Calculate the histogram data
         for (int i = 0; i < (length - 1); i++) {
-            double period = ((PitchValue) data.get(i)).period;
-            double position = ((PitchValue) data.get(i)).position;
-            double periodLength = ((PitchValue) data.get(i+1)).position - position;
+            double period = data.get(i).period;
+            double position = data.get(i).position;
+            double periodLength = data.get(i+1).position - position;
 
             // We only need to do this if the pitch does not equal zero

trunk/src/org/apollo/meldex/WavSample.java

@@ -8 +8 @@
 import javax.sound.sampled.AudioInputStream;
 import javax.sound.sampled.AudioSystem;
-import javax.swing.JOptionPane;
-
-@SuppressWarnings("unchecked") // code in java 1.4
+
+import org.expeditee.gio.EcosystemManager;
+
 public class WavSample
 {
@@ -68 +68 @@
         }
         catch (Exception ex) {
-            JOptionPane.showMessageDialog(null, "Exception occurred creating sample.\n\n" + ex);
+            EcosystemManager.getGraphicsManager().showDialog("Exception", "Exception occurred creating sample.\n\n" + ex);
             return false;
         }
@@ -90 +90 @@
             }
             catch (Exception ex) {
-                JOptionPane.showMessageDialog(null, "Exception occurred reloading sample.\n\n" + ex);
+            EcosystemManager.getGraphicsManager().showDialog("Exception", "Exception occurred reloading sample.\n\n" + ex);
                 return false;
             }
@@ -101 +101 @@
             }
             catch (Exception ex) {
-                JOptionPane.showMessageDialog(null, "Exception occurred resetting audio stream.\n\n" + ex);
+            EcosystemManager.getGraphicsManager().showDialog("Exception", "Exception occurred resetting audio stream.\n\n" + ex);
                 return false;
             }
@@ -172 +172 @@
         if (format.getSampleSizeInBits() == 8) {
             if (format.getEncoding().equals(AudioFormat.Encoding.PCM_SIGNED)) {
-                JOptionPane.showMessageDialog(null, "Oops! Internal Error: Unexpected audio format (signed 8-bit).");
+            EcosystemManager.getGraphicsManager().showDialog("Exception", "Oops! Internal Error: Unexpected audio format (signed 8-bit).");
                 return null;
             }
@@ -178 +178 @@
         if (format.getSampleSizeInBits() == 16) {
             if (format.getEncoding().equals(AudioFormat.Encoding.PCM_UNSIGNED)) {
-                JOptionPane.showMessageDialog(null, "Oops! Internal Error: Unexpected audio format (unsigned 16-bit).");
+            EcosystemManager.getGraphicsManager().showDialog("Exception", "Oops! Internal Error: Unexpected audio format (unsigned 16-bit).");
                 return null;
             }
@@ -188 +188 @@
 
         // Create a new list to store the standardised sample values
-        ArrayList stdTemp = new ArrayList();
+        ArrayList<Integer> stdTemp = new ArrayList<Integer>();
 
         // Simply pick values from the sample at the frequency specified
@@ -218 +218 @@
 
 
-    private static ArrayList toStandardEndian(AudioFormat format, ArrayList inData)
-    {
-        // Endian details do not apply to 8-bit samples, so no conversion needed
-        if (format.getSampleSizeInBits() == 8) {
-            return inData;
-        }
-
-        // Create a new list to store the results
-        ArrayList outData = new ArrayList();
-
-        // Simply convert each number in the sample to the endian form for the current system
-        for (int i = 0; i < inData.size(); i += 2) {
-
-            int MSB, LSB;
-            if (format.isBigEndian()) {
-                MSB = ((Integer) inData.get(i)).intValue();    // First byte is MSB (high order)
-                LSB = ((Integer) inData.get(i+1)).intValue();  // Second byte is LSB (low order)
-            }
-            else {
-                LSB = ((Integer) inData.get(i)).intValue();    // First byte is LSB (low order)
-                MSB = ((Integer) inData.get(i+1)).intValue();  // Second byte is MSB (high order)
-            }
-
-            int val = (MSB << 8) + (LSB & 255);
-            outData.add(new Integer(val));
-        }
-
-        return outData;
-    }
-
-
-    private static ArrayList toUnsignedValues(AudioFormat format, ArrayList inData)
+    private static ArrayList<Integer> toStandardEndian(AudioFormat format, ArrayList<Integer> inData)
+    {
+                // Endian details do not apply to 8-bit samples, so no conversion needed
+                if (format.getSampleSizeInBits() == 8) {
+                    return inData;
+                }
+        
+                // Create a new list to store the results
+                ArrayList<Integer> outData = new ArrayList<Integer>();
+        
+                // Simply convert each number in the sample to the endian form for the current system
+                for (int i = 0; i < inData.size(); i += 2) {
+        
+                    int MSB, LSB;
+                    if (format.isBigEndian()) {
+                        MSB = ((Integer) inData.get(i)).intValue();    // First byte is MSB (high order)
+                        LSB = ((Integer) inData.get(i+1)).intValue();  // Second byte is LSB (low order)
+                    }
+                    else {
+                        LSB = ((Integer) inData.get(i)).intValue();    // First byte is LSB (low order)
+                        MSB = ((Integer) inData.get(i+1)).intValue();  // Second byte is MSB (high order)
+                    }
+        
+                    int val = (MSB << 8) + (LSB & 255);
+                    outData.add(new Integer(val));
+                }
+        
+                return outData;
+    }
+
+
+    private static ArrayList<Integer> toUnsignedValues(AudioFormat format, ArrayList<Integer> inData)
     {
         // PCM_UNSIGNED samples are what we want, so no conversion needed
@@ -257 +257 @@
 
         // Create a new list to store the results
-        ArrayList outData = new ArrayList();
+        ArrayList<Integer> outData = new ArrayList<Integer>();
 
         // Simply convert each signed number in the sample to an unsigned value
@@ -275 +275 @@
 
 
-    private static ArrayList to8bit(AudioFormat format, ArrayList inData)
+    private static ArrayList<Integer> to8bit(AudioFormat format, ArrayList<Integer> inData)
     {
         // 8-bit data is what we want, so no conversion necessary
@@ -283 +283 @@
 
         // Create a new list to store the results
-        ArrayList outData = new ArrayList();
+        ArrayList<Integer> outData = new ArrayList<Integer>();
 
         // Simply reduce each value in the sample to an 8-bit value
@@ -298 +298 @@
 
 
-    private static ArrayList toMono(AudioFormat format, ArrayList inData)
+    private static ArrayList<Integer> toMono(AudioFormat format, ArrayList<Integer> inData)
     {
         // Mono-channel data is what we want, so no conversion necessary
@@ -306 +306 @@
 
         // Create a new list to store the results
-        ArrayList outData = new ArrayList();
+        ArrayList<Integer> outData = new ArrayList<Integer>();
 
         // Simply average all of the channels for each frame
@@ -362 +362 @@
         try {
             if (AudioSystem.write(audioData, AudioFileFormat.Type.WAVE, outFile) == -1) {
-                JOptionPane.showMessageDialog(null, "Problem occurred writing to file.");
+            EcosystemManager.getGraphicsManager().showDialog("Exception", "Problem occurred writing to file.");
                 return false;
             }
         }
         catch (Exception ex) {
-            JOptionPane.showMessageDialog(null, "Exception occurred saving file.\n\n" + ex);
+            EcosystemManager.getGraphicsManager().showDialog("Exception", "Exception occurred saving file.\n\n" + ex);
             return false;
         }