splitting into PSound/PSound2

processing/core/PSound.java

@@ -1,7 +1,7 @@
 /* -*- mode: jde; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 
 /*
-  PSound - audio loader and player
+  PSound - java 1.1 audio loader and player
   Part of the Processing project - http://processing.org
 
   Copyright (c) 2004 Ben Fry and Casey Reas
@@ -25,79 +25,34 @@
 package processing.core;
 
 import java.io.*;
-import javax.sound.sampled.*;
+import sun.audio.*;
 
 // add check for reflection in host applet for sound completion
-
 // also needs to register for stop events with applet
 
-// http://javaalmanac.com/egs/javax.sound.sampled/pkg.html
-
-
 
+/**
+ * This is the crappy 8 khz ulaw version that's compatible
+ * with Java 1.1 and 1.2. For Java 1.3 and higher, PSound2 is used.
+ */
 public class PSound {
-  static final boolean JDK13 = PApplet.jdkVersion >= 1.3;
-
   PApplet applet;
 
-  Clip clip;
-
 
   public PSound(PApplet applet, InputStream input) {
     this.applet = applet;
 
+    /*
     try {
-      if (JDK13) {
-        AudioInputStream stream =
-          AudioSystem.getAudioInputStream(input);
 
-        // At present, ALAW and ULAW encodings must be converted
-        // to PCM_SIGNED before it can be played
-        AudioFormat format = stream.getFormat();
-        if (format.getEncoding() != AudioFormat.Encoding.PCM_SIGNED) {
-          format = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED,
-                                   format.getSampleRate(),
-                                   format.getSampleSizeInBits()*2,
-                                   format.getChannels(),
-                                   format.getFrameSize()*2,
-                                   format.getFrameRate(),
-                                   true);  // big endian
-          stream = AudioSystem.getAudioInputStream(format, stream);
-        }
-
-        int frameLength = (int) stream.getFrameLength();
-        int frameSize = format.getFrameSize();
-        DataLine.Info info =
-          new DataLine.Info(Clip.class, stream.getFormat(),
-                            frameLength * frameSize);
-
-        Clip clip = (Clip) AudioSystem.getLine(info);
-
-        // This method does not return until completely loaded
-        clip.open(stream);
-
-        // determining when a sample is done
-        // Add a listener for line events
-        /*
-        clip.addLineListener(new LineListener() {
-            public void update(LineEvent evt) {
-              if (evt.getType() == LineEvent.Type.STOP) {
-              }
-            }
-          });
-        */
-
-      } else {  // JDK11
-        // do something here to load a lameass .au file
-      }
     } catch (Exception e) {
       error("<init>", e);
     }
+    */
   }
 
 
   public void play() {
-    clip.start();
   }
 
 
@@ -105,7 +60,6 @@ public class PSound {
    * either sets repeat flag, or begins playing (and sets)
    */
   public void loop() {
-    clip.loop(Clip.LOOP_CONTINUOUSLY);
   }
 
 
@@ -115,17 +69,10 @@ public class PSound {
    * continue to the end of the clip."
    */
   public void noLoop() {
-    clip.loop(0);
   }
 
 
-  // Play and repeat for a certain number of times
-  //int numberOfPlays = 3;
-  //clip.loop(numberOfPlays-1);
-
-
   public void pause() {
-    clip.stop();
   }
 
 
@@ -133,17 +80,14 @@ public class PSound {
    * Stops the audio and rewinds to the beginning.
    */
   public void stop() {
-    clip.stop();
-    clip.setFramePosition(0);
   }
 
 
   /**
-   * current position inside the clip
-   * like video, in seconds
+   * current position inside the clip (in seconds, just like video)
    */
   public float time() {
-    return (float) (clip.getMicrosecondPosition()/1000000.0d);
+    return 0;
   }
 
 
@@ -151,38 +95,13 @@ public class PSound {
    * duration of the clip in seconds
    */
   public float duration() {
-    return (float) (clip.getBufferSize() /
-                    (clip.getFormat().getFrameSize() *
-                     clip.getFormat().getFrameRate()));
+    return 0;
   }
 
 
   public void volume(float v) {  // ranges 0..1
-    if (JDK13) {
-      FloatControl gainControl =
-        (FloatControl)clip.getControl(FloatControl.Type.MASTER_GAIN);
-      double gain = .5D;    // number between 0 and 1 (loudest)
-      float dB = (float)(Math.log(gain)/Math.log(10.0)*20.0);
-      gainControl.setValue(dB);
-    }
   }
 
-  /** mute */
-  /*
-  public void noVolume() {
-    BooleanControl muteControl =
-      (BooleanControl)clip.getControl(BooleanControl.Type.MUTE);
-    muteControl.setValue(true);
-  }
-  */
-
-  /** disable mute */
-  /*
-  public void volume() {
-    muteControl.setValue(false);
-  }
-  */
-
 
   /**
    * General error reporting, all corraled here just in case