Changeset 1007 for trunk/src/org/apollo/audio/SampledAudioManager.java

Timestamp:

03/08/16 23:22:09 (8 years ago)

Author:

davidb

Message:

Generalization of audio support to allow playback/mixer to be stereo, plus some edits to comments

File:

• trunk/src/org/apollo/audio/SampledAudioManager.java (modified) (6 diffs)

trunk/src/org/apollo/audio/SampledAudioManager.java

@@ -14 +14 @@
 import org.apollo.mvc.SubjectChangedEvent;
 import org.apollo.util.ApolloSystemLog;
+
 
 /**
@@ -27 +28 @@
         
         /** All internal formats have the same sample rate. */
-        public static final float PLAYBACK_SAMPLE_RATE = 44100.0f; // Audacitys default
-        
-        //public static final float PLAYBACK_SAMPLE_RATE = 22050.0f; // Meldexes internal rate .. todo: fix conversions to use better rate
-
-        // Used for describing the ideal default format for recorded audio and converting un-supported 
+        // The following is based on Audacity's defaults for playback
+        public static final float PLAYBACK_SAMPLE_RATE      = 44100.0f;
+        public static final int   PLAYBACK_BITS_PER_SAMPLE  = 16;      
+        public static final int   PLAYBACK_NUM_CHANNELS     = 2; // stereo
+        
+        //public static final float PLAYBACK_SAMPLE_RATE = 22050.0f; // Meldexe's internal rate .. todo: fix conversions to use better rate
+
+        // Used for describing the ideal default format for recorded audio and converting unsupported 
         // imported audio to... The actual formats may differ depending on the data lines used
         
-        // note: Must be PCM, Mono, 16 bit.
+        // note: Must be PCM, with values as defined for PLAYBACK_... above
         private static final AudioFormat DESIRED_FORMAT = new AudioFormat( // Linear PCM Encoding
-                        PLAYBACK_SAMPLE_RATE, // Always conform to PLAYBACK_SAMPLE_RATE
-                        16, // bits per sample. Must be 16. Audacitys default
-                        1, // Always use mono. Audacitys default
+                        PLAYBACK_SAMPLE_RATE, // Always conform to PLAYBACK_SAMPLE_RATE etc
+                        PLAYBACK_BITS_PER_SAMPLE, 
+                        PLAYBACK_NUM_CHANNELS, 
                         false, // ALWAYS USED SIGNED FOR BEST PERFORMACE - JAVA DOES NOT HAVE UNSIGNED TYPES
                         true // Byte order
@@ -231 +235 @@
                         // Not cadidate if not in appollos format.
                         if (!candiate.getEncoding().toString().startsWith("PCM") 
-                                        || candiate.getChannels() != 1
-                                        || candiate.getSampleSizeInBits() != 16
+                                        || candiate.getChannels() != PLAYBACK_NUM_CHANNELS
+                                        || candiate.getSampleSizeInBits() != PLAYBACK_BITS_PER_SAMPLE
                                         || (candiate.getSampleRate() != AudioSystem.NOT_SPECIFIED &&
                                                         candiate.getSampleRate() != PLAYBACK_SAMPLE_RATE))
@@ -285 +289 @@
         /**
          * Determines if an audio format requires conversion in order to be used 
-         * in Apollos. 
-         * 
-         * Audio formats must be in PCM, mono, 16-bit sample-size,
+         * in Apollo's. 
+         * 
+         * Audio formats must be in PCM, SampledAudioManager#PLAYBACK_NUM_CHANNELS, 
+         * SampledAudioManager#PLAYBACK_BITS_PER_SAMPLE sample-size,
          * SampledAudioManager#PLAYBACK_SAMPLE_RATE sample-rate and be supported
          * by the output mixer.
@@ -304 +309 @@
                 if (format == null) throw new NullPointerException("format");
                 
-                if(!format.getEncoding().toString().startsWith("PCM") || format.getChannels() != 1
-                                || format.getSampleSizeInBits() != 16
+                if(!format.getEncoding().toString().startsWith("PCM") || format.getChannels() != PLAYBACK_NUM_CHANNELS
+                                || format.getSampleSizeInBits() != PLAYBACK_BITS_PER_SAMPLE
                                 || (format.getSampleRate() != AudioSystem.NOT_SPECIFIED &&
                                                 format.getSampleRate() != PLAYBACK_SAMPLE_RATE)) {
@@ -313 +318 @@
                 // Check that the format is supported by the output mixer
                 for (AudioFormat supported : supportedPlaybackFormats) {
-                        if (supported.getChannels() != 1) continue;
+                        if (supported.getChannels() != PLAYBACK_NUM_CHANNELS) continue;
                         if (
                                         format.getEncoding() == supported.getEncoding()