Commit: 8b17d76093edd26a38692ac2295fba9e379b9a9a - MikuMikuStudio (git)

Main repository of MikuMikuStudio

Commit MetaInfo

• Revisión: 8b17d76093edd26a38692ac2295fba9e379b9a9a (tree)
• Tiempo: 2003-11-02 08:34:00
• Autor: Anakan <Anakan@75d0...>
• Commiter: Anakan

Log Message

sound system sharing buffers

git-svn-id: http://jmonkeyengine.googlecode.com/svn/trunk@145 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

Cambiar Resumen

• add: data/sound/laser.mp3
• add: data/sound/laser.wav
• add: data/sound/tech_idle_loop.wav
• add: data/sound/turn.mp3
• delete: data/sound/walk.wav
• add: src/com/jme/sound/IEffectPlayer.java
• add: src/com/jme/sound/IMusic.java
• add: src/com/jme/sound/ISound.java
• add: src/com/jme/sound/ISoundBuffer.java
• add: src/com/jme/sound/ISource.java
• add: src/com/jme/sound/LWJGLEffectPlayer.java
• add: src/com/jme/sound/LWJGLMP3Buffer.java
• modified: src/com/jme/sound/LWJGLMP3Stream.java
• modified: src/com/jme/sound/LWJGLSoundRenderer.java
• modified: src/com/jme/sound/LWJGLSoundSystem.java
• modified: src/com/jme/sound/LWJGLSource.java
• add: src/com/jme/sound/LWJGLWaveBuffer.java
• modified: src/com/jme/sound/LWJGLWaveStream.java
• add: src/com/jme/sound/MP3Buffer.java
• add: src/com/jme/sound/SoundEffect.java
• modified: src/com/jme/sound/SoundSystem.java
• add: src/com/jme/sound/WaveBuffer.java
• modified: src/com/jme/sound/action/SoundBackwardAction.java
• modified: src/com/jme/sound/action/SoundForwardAction.java
• modified: src/com/jme/sound/action/SoundLookDownAction.java
• modified: src/com/jme/sound/action/SoundLookUpAction.java
• modified: src/com/jme/sound/action/SoundRotateLeftAction.java
• modified: src/com/jme/sound/action/SoundRotateRightAction.java
• modified: src/com/jme/sound/action/SoundStrafeLeftAction.java
• modified: src/com/jme/sound/action/SoundStrafeRightAction.java
• add: src/com/jme/sound/utils/EffectRepository.java
• delete: src/com/jme/sound/utils/{SourceRepository.java => EffectPlayerRepository.java}
• delete: src/com/jme/sound/{LWJGLPlaylist.java => utils/OnDemandSoundLoader.java}
• delete: src/com/jme/sound/{Playlist.java => IEffect.java}
• delete: src/com/jme/sound/{SoundRenderer.java => IRenderer.java}
• delete: src/com/jme/sound/{SoundSource.java => IMusicPlayer.java}
• modified: src/com/jme/test/sound/TestSound.java
• modified: src/com/jme/test/sound/TestSoundLoop.java
• modified: src/com/jme/test/sound/TestSoundMove.java

Diferencia incremental

Binary files /dev/null and b/data/sound/laser.mp3 differ

Binary files /dev/null and b/data/sound/laser.wav differ

Binary files /dev/null and b/data/sound/tech_idle_loop.wav differ

Binary files /dev/null and b/data/sound/turn.mp3 differ

Binary files a/data/sound/walk.wav and /dev/null differ

--- a/src/com/jme/sound/Playlist.java
+++ b/src/com/jme/sound/IEffect.java
@@ -31,24 +31,20 @@
  */
 
 /*
- * Created on 27 oct. 2003
+ * Created on 31 oct. 2003
  *
  */
 package com.jme.sound;
 
+
+
 /**
  * @author Arman Ozcelik
  *
  */
-public interface Playlist {
-
-	public void queueSound(String name);
-	
-	public boolean hasNext();
-	
-	public SoundStream next();
+public interface IEffect extends ISound{
 	
-	public int length();
+	public int getName();
 	
 	
 }

--- /dev/null
+++ b/src/com/jme/sound/IEffectPlayer.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2003, jMonkeyEngine - Mojo Monkey Coding
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this 
+ * list of conditions and the following disclaimer. 
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * 
+ * Neither the name of the Mojo Monkey Coding, jME, jMonkey Engine, nor the 
+ * names of its contributors may be used to endorse or promote products derived 
+ * from this software without specific prior written permission. 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+/*
+ * Created on 31 oct. 2003
+ *
+ */
+package com.jme.sound;
+
+import com.jme.math.Vector3f;
+
+/**
+ * @author Arman Ozcelik
+ *
+ */
+public interface IEffectPlayer extends ISource {
+
+	public static final int PLAYING = 1;
+	public static final int LOOPING = 2;
+	public static final int PAUSED = 3;
+	public static final int STOPPED = 4;
+
+	public void play(IEffect effect);
+
+	public void loop(IEffect effect);
+
+	public void pause();
+
+	public void stop();
+
+	public int getStatus();
+
+	public Vector3f getPosition();
+	
+	public void setPosition(Vector3f pos);
+	
+	public Vector3f getVelocity();
+	
+	public void setVelocity(Vector3f vel);
+
+	public float getPitch();
+	
+	public void setPitch(float pitch);
+
+	public void setVolume(float volume);
+	
+	public void setPlayersVolume(float volume);
+	
+	public void setMaxDistance(float maxDistance);
+	
+	public float getVolume();
+
+}

--- /dev/null
+++ b/src/com/jme/sound/IMusic.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2003, jMonkeyEngine - Mojo Monkey Coding
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this 
+ * list of conditions and the following disclaimer. 
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * 
+ * Neither the name of the Mojo Monkey Coding, jME, jMonkey Engine, nor the 
+ * names of its contributors may be used to endorse or promote products derived 
+ * from this software without specific prior written permission. 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+/*
+ * Created on 31 oct. 2003
+ *
+ */
+package com.jme.sound;
+
+/**
+ * @author Arman Ozcelik
+ *
+ */
+public interface IMusic extends ISound{
+	
+	public void setStream(SoundStream stream);
+	
+
+}

--- a/src/com/jme/sound/SoundSource.java
+++ b/src/com/jme/sound/IMusicPlayer.java
@@ -31,51 +31,34 @@
  */
 
 /*
- * Created on 23 oct. 2003
+ * Created on 31 oct. 2003
  *
  */
 package com.jme.sound;
 
-import com.jme.math.Vector3f;
-
 /**
  * @author Arman Ozcelik
  *
  */
-public interface SoundSource {
-
-	public int getSourceNumber();
-	
-	public void setStream(SoundStream stream);
+public interface IMusicPlayer extends ISource{
 	
-	public SoundStream getStream();
+	public static final int PLAYING=1;
+	public static final int PAUSED=3;
+	public static final int STOPPED=4;
+
+	public void setNumberOfBuffers(int numBuffers);
 	
-	public void play(String name);
+	public int getNumberOfBuffers();
 	
-	public void stop();
+	public void play(String song);
 	
 	public void pause();
 	
-	public void updatePosition(float x, float y, float z);
-	
-	public void updateVelocity(float x, float y, float z);
+	public void stop();
 	
 	public boolean isPlaying();
 	
-	public boolean isPaused();
-	
 	public boolean isStopped();
 	
-	public void setNumberOfBuffers(int buffers);
-	
-	public Vector3f getPosition();
-	
-	public void setMaxVolume(float value);
-	
-	public void setVolume(float factor);
-	
-	public void setPlaylist(Playlist p);
-	
-	
-
+	public boolean isPaused();
 }

--- a/src/com/jme/sound/SoundRenderer.java
+++ b/src/com/jme/sound/IRenderer.java
@@ -33,14 +33,20 @@ package com.jme.sound;
 
 /**
  * @author Arman Ozcelik
- * @version $Id: SoundRenderer.java,v 1.3 2003-10-25 02:23:09 Anakan Exp $
+ * @version $Id: IRenderer.java,v 1.1 2003-11-01 23:27:33 Anakan Exp $
  */
-public interface SoundRenderer {
+public interface IRenderer {
 
 	
 	public void addSoundPlayer(Object name);
 	
 	public void loadSoundAs(String name, String file);
 	
-	public SoundSource getSoundPlayer(Object name);
+	public IEffectPlayer getSoundPlayer(Object name);
+	
+	public IMusicPlayer getMusicPlayer();
+	
+	
+	
+	
 }
\ No newline at end of file

--- /dev/null
+++ b/src/com/jme/sound/ISound.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2003, jMonkeyEngine - Mojo Monkey Coding
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this 
+ * list of conditions and the following disclaimer. 
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * 
+ * Neither the name of the Mojo Monkey Coding, jME, jMonkey Engine, nor the 
+ * names of its contributors may be used to endorse or promote products derived 
+ * from this software without specific prior written permission. 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+/*
+ * Created on 31 oct. 2003
+ *
+ */
+package com.jme.sound;
+
+
+
+/**
+ * @author Arman Ozcelik
+ *
+ */
+public interface ISound {
+	
+	public static final int SOUND_TYPE_MUSIC=1;
+	public static final int SOUND_TYPE_EFFECT=2;
+
+	public int getSoundType();		
+	
+
+}

--- /dev/null
+++ b/src/com/jme/sound/ISoundBuffer.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2003, jMonkeyEngine - Mojo Monkey Coding
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this 
+ * list of conditions and the following disclaimer. 
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * 
+ * Neither the name of the Mojo Monkey Coding, jME, jMonkey Engine, nor the 
+ * names of its contributors may be used to endorse or promote products derived 
+ * from this software without specific prior written permission. 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+/*
+ * Created on 31 oct. 2003
+ *
+ */
+package com.jme.sound;
+
+import java.nio.ByteBuffer;
+
+/**
+ * @author Arman Ozcelik
+ *
+ */
+public interface ISoundBuffer {
+	
+	public static final int MONO8=1;
+	public static final int MONO16=2;
+	public static final int STEREO8=3;
+	public static final int STEREO16=4;
+	
+	
+	public void load(String name);
+	
+	public int getBufferNumber();
+	
+	public ByteBuffer getBufferData();
+	
+	public int getChannels();
+	
+	public int getSampleRate();
+	
+	public void release();
+	
+	
+	
+
+}

--- /dev/null
+++ b/src/com/jme/sound/ISource.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2003, jMonkeyEngine - Mojo Monkey Coding
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this 
+ * list of conditions and the following disclaimer. 
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * 
+ * Neither the name of the Mojo Monkey Coding, jME, jMonkey Engine, nor the 
+ * names of its contributors may be used to endorse or promote products derived 
+ * from this software without specific prior written permission. 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+/*
+ * Created on 31 oct. 2003
+ *
+ */
+package com.jme.sound;
+
+/**
+ * @author Arman Ozcelik
+ *
+ */
+public interface ISource {
+	
+	public static final int STREAMING=1;
+	
+	public static final int BUFFERING=2;
+	
+	public int getType();
+	
+	public int getSourceNumber();
+
+}

--- /dev/null
+++ b/src/com/jme/sound/LWJGLEffectPlayer.java
@@ -0,0 +1,207 @@
+/*
+ * Copyright (c) 2003, jMonkeyEngine - Mojo Monkey Coding
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this 
+ * list of conditions and the following disclaimer. 
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * 
+ * Neither the name of the Mojo Monkey Coding, jME, jMonkey Engine, nor the 
+ * names of its contributors may be used to endorse or promote products derived 
+ * from this software without specific prior written permission. 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+/*
+ * Created on 31 oct. 2003
+ *
+ */
+package com.jme.sound;
+
+import org.lwjgl.openal.AL;
+
+import com.jme.math.Vector3f;
+
+/**
+ * @author Arman Ozcelik
+ *
+ */
+public class LWJGLEffectPlayer implements IEffectPlayer {
+
+	private int sourceNumber;
+	private int status;
+	private Vector3f position;
+	private Vector3f velocity;
+	private float gain=1.0f;
+	private float pitch=1.0f;
+	private static float maxVolume=1.0f;
+
+	public LWJGLEffectPlayer(int playerNumber) {
+		sourceNumber = playerNumber;
+		position=new Vector3f(0, 0, 1);
+		velocity=new Vector3f(0,0,.1f);
+	}
+
+	public void play(IEffect effect) {
+		if(effect==null) return;
+		status=PLAYING;
+		AL.alGetError();
+		if (AL.alGetError() != AL.AL_NO_ERROR) {
+			System.err.println("Error generating audio source.");
+		}
+		AL.alSourcei(sourceNumber, AL.AL_BUFFER, effect.getName());
+		AL.alSourcef(sourceNumber, AL.AL_PITCH, getPitch());
+		AL.alSourcef(sourceNumber, AL.AL_GAIN, getVolume());
+		AL.alSource3f(
+			sourceNumber,
+			AL.AL_POSITION,
+			getPosition().x,
+			getPosition().y,
+			getPosition().z);
+		AL.alSource3f(
+			sourceNumber,
+			AL.AL_VELOCITY,
+			getVelocity().x,
+			getVelocity().y,
+			getVelocity().z);
+		AL.alSourcei(sourceNumber, AL.AL_LOOPING, AL.AL_FALSE);
+		
+		AL.alSourcePlay(sourceNumber);	
+		
+
+	}
+
+	/* (non-Javadoc)
+	 * @see com.jme.sound.IEffectPlayer#loop(com.jme.sound.IEffect, int)
+	 */
+	public void loop(IEffect effect) {
+		if(effect==null) return;
+		status=LOOPING;
+		AL.alGetError();
+		if (AL.alGetError() != AL.AL_NO_ERROR) {
+			System.err.println("Error generating audio source.");
+		}
+		AL.alSourcei(sourceNumber, AL.AL_BUFFER, effect.getName());
+		AL.alSourcef(sourceNumber, AL.AL_PITCH, getPitch());
+		AL.alSourcef(sourceNumber, AL.AL_GAIN, getVolume());
+		AL.alSource3f(
+			sourceNumber,
+			AL.AL_POSITION,
+			getPosition().x,
+			getPosition().y,
+			getPosition().z);
+		AL.alSource3f(
+			sourceNumber,
+			AL.AL_VELOCITY,
+			getVelocity().x,
+			getVelocity().y,
+			getVelocity().z);
+		AL.alSourcei(sourceNumber, AL.AL_LOOPING, AL.AL_TRUE);
+		
+		AL.alSourcePlay(sourceNumber);
+
+	}
+
+	
+	public void pause() {
+		AL.alSourcePause(sourceNumber);
+	}
+
+	public void stop() {
+		AL.alSourceStop(sourceNumber);
+		status = STOPPED;
+	}
+
+	public int getStatus() {
+		if(AL.alGetSourcei(sourceNumber, AL.AL_SOURCE_STATE) != AL.AL_PLAYING){
+			status=STOPPED;
+		}
+		return status;
+	}
+
+	public int getType() {
+		return BUFFERING;
+	}
+
+	public int getSourceNumber() {
+		return sourceNumber;
+	}
+
+	
+	public Vector3f getPosition() {
+		return position;
+	}
+
+	
+	public void setPosition(Vector3f pos) {
+		position.x=pos.x;
+		position.y=pos.y;
+		position.z=pos.z;
+		
+	}
+
+	
+	public Vector3f getVelocity() {
+		
+		return velocity;
+	}
+
+	
+	public void setVelocity(Vector3f vel) {
+		velocity.x=vel.x;
+		velocity.y=vel.y;
+		velocity.z=vel.z;		
+	}
+
+	
+	public float getPitch() {		
+		return pitch;
+	}
+
+	
+	
+	public void setPitch(float pitch) {
+		this.pitch=pitch;		
+	}
+
+	
+	public void setVolume(float volume) {
+		gain=volume*maxVolume;		
+	}
+
+	
+	public float getVolume() {		
+		return gain;
+	}
+
+	
+	public void setPlayersVolume(float volume) {
+		maxVolume=volume;		
+	}
+
+	
+	public void setMaxDistance(float maxDistance) {
+		AL.alSourcef(sourceNumber, AL.AL_MAX_DISTANCE, maxDistance);
+	}
+	
+	
+
+}

--- /dev/null
+++ b/src/com/jme/sound/LWJGLMP3Buffer.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2003, jMonkeyEngine - Mojo Monkey Coding
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this 
+ * list of conditions and the following disclaimer. 
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * 
+ * Neither the name of the Mojo Monkey Coding, jME, jMonkey Engine, nor the 
+ * names of its contributors may be used to endorse or promote products derived 
+ * from this software without specific prior written permission. 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+/*
+ * Created on 1 nov. 2003
+ *
+ */
+package com.jme.sound;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.IntBuffer;
+
+import org.lwjgl.openal.AL;
+
+/**
+ * @author Arman Ozcelik
+ *
+ */
+public class LWJGLMP3Buffer extends MP3Buffer {
+
+	IntBuffer buffer;
+
+	public LWJGLMP3Buffer() {
+		buffer= ByteBuffer.allocateDirect(4).order(ByteOrder.nativeOrder()).asIntBuffer();
+		AL.alGenBuffers(buffer);
+	}
+
+	public int getBufferNumber() {
+
+		return buffer.get(0);
+	}
+
+	public int getChannels() {
+		switch (channels) {
+			case MONO8 :
+				return AL.AL_FORMAT_MONO8;
+			case MONO16 :
+				return AL.AL_FORMAT_MONO16;
+			case STEREO8 :
+				return AL.AL_FORMAT_STEREO8;
+			case STEREO16 :
+				return AL.AL_FORMAT_STEREO16;
+		}
+		return 0;
+	}
+}

--- a/src/com/jme/sound/LWJGLMP3Stream.java
+++ b/src/com/jme/sound/LWJGLMP3Stream.java
@@ -1,24 +1,3 @@
-package com.jme.sound;
-import java.io.BufferedInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.IntBuffer;
-
-import javax.sound.sampled.AudioFormat;
-
-import org.lwjgl.openal.AL;
-
-import javazoom.jl.decoder.Bitstream;
-import javazoom.jl.decoder.BitstreamException;
-import javazoom.jl.decoder.Decoder;
-import javazoom.jl.decoder.DecoderException;
-import javazoom.jl.decoder.Header;
-import javazoom.jl.decoder.SampleBuffer;
-
 /*
  * Copyright (c) 2003, jMonkeyEngine - Mojo Monkey Coding
  * All rights reserved.
@@ -60,6 +39,25 @@ import javazoom.jl.decoder.SampleBuffer;
  * @author Arman Ozcelik
  *
  */
+package com.jme.sound;
+import java.io.BufferedInputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.IntBuffer;
+
+import javax.sound.sampled.AudioFormat;
+
+import org.lwjgl.openal.AL;
+
+import javazoom.jl.decoder.Bitstream;
+import javazoom.jl.decoder.BitstreamException;
+import javazoom.jl.decoder.Decoder;
+import javazoom.jl.decoder.DecoderException;
+import javazoom.jl.decoder.Header;
+import javazoom.jl.decoder.SampleBuffer;
 public class LWJGLMP3Stream implements SoundStream {
 
 	private AudioFormat format;
@@ -140,8 +138,6 @@ public class LWJGLMP3Stream implements SoundStream {
 
 	public ByteBuffer read() throws IOException {
 		try {
-
-			ByteArrayOutputStream buffer = new ByteArrayOutputStream();
 			Header header = stream.readFrame();
 			if (header == null) {
 				//TODO reload?
@@ -149,25 +145,24 @@ public class LWJGLMP3Stream implements SoundStream {
 			}
 			if (sampleBuf == null) {
 				sampleBuf =
-					new SampleBuffer(
-						header.frequency(),
-						(header.mode() == Header.SINGLE_CHANNEL) ? 1 : 2);
+					new SampleBuffer(header.frequency(), (header.mode() == Header.SINGLE_CHANNEL) ? 1 : 2);
 				decoder.setOutputBuffer(sampleBuf);
 			}
-			channels =
-				(header.mode() == Header.SINGLE_CHANNEL)
-					? AL.AL_FORMAT_MONO16
-					: AL.AL_FORMAT_STEREO16;
-			sampleRate = header.frequency();
-			sampleBuf = (SampleBuffer) decoder.decodeFrame(header, stream);
+			if (channels == 0) {
+				channels =
+					(header.mode() == Header.SINGLE_CHANNEL) ? AL.AL_FORMAT_MONO8 : AL.AL_FORMAT_STEREO16;
+			}
+			if (sampleRate == 0) {
+				sampleRate = header.frequency();
+			}
+			//sampleBuf = (SampleBuffer) decoder.decodeFrame(header, stream);
+			decoder.decodeFrame(header, stream);
 			stream.closeFrame();
-
-			buffer.write(toByteArray(sampleBuf.getBuffer(), 0, sampleBuf.getBufferLength()));
-			ByteBuffer obuf = ByteBuffer.allocateDirect(buffer.size());
-			obuf.put(buffer.toByteArray());
-			obuf.rewind();
-			return obuf;
-
+			byte[] obuf = toByteArray(sampleBuf.getBuffer(), 0, sampleBuf.getBufferLength());
+			ByteBuffer buf = ByteBuffer.allocateDirect(obuf.length);
+			buf.put(obuf);
+			buf.rewind();
+			return buf;
 		} catch (BitstreamException bs) {
 			bs.printStackTrace();
 		} catch (DecoderException e) {
@@ -188,11 +183,9 @@ public class LWJGLMP3Stream implements SoundStream {
 	protected byte[] toByteArray(short[] samples, int offs, int len) {
 		byte[] b = new byte[len * 2];
 		int idx = 0;
-		short s;
 		while (len-- > 0) {
-			s = samples[offs++];
-			b[idx++] = (byte) (s & 0x00FF);
-			b[idx++] = (byte) ((s >>> 8) & 0x00FF);
+			b[idx++] = (byte) (samples[offs++] & 0x00FF);
+			b[idx++] = (byte) ((samples[offs] >>> 8) & 0x00FF);
 		}
 		return b;
 	}

--- a/src/com/jme/sound/LWJGLSoundRenderer.java
+++ b/src/com/jme/sound/LWJGLSoundRenderer.java
@@ -37,26 +37,29 @@ import java.nio.IntBuffer;
 
 import org.lwjgl.openal.AL;
 
-
-import com.jme.sound.utils.StreamRepository;
-import com.jme.sound.utils.SourceRepository;
-
-
+import com.jme.sound.utils.EffectPlayerRepository;
+import com.jme.sound.utils.EffectRepository;
 
 /**
  * @author Arman Ozcelik
- * @version $Id: LWJGLSoundRenderer.java,v 1.3 2003-10-25 02:23:09 Anakan Exp $
+ * @version $Id: LWJGLSoundRenderer.java,v 1.4 2003-11-01 23:28:10 Anakan Exp $
  */
-public class LWJGLSoundRenderer implements SoundRenderer {
-	
-	private float[] listenerPos = { 0.0f, 0.0f, 0.0f };
+public class LWJGLSoundRenderer implements IRenderer {
+
+	private float[] listenerPos= { 0.0f, 0.0f, 0.0f };
 	//Velocity of the listener.
-	private float[] listenerVel = { 0.0f, 0.0f, 0.0f };
+	private float[] listenerVel= { 0.0f, 0.0f, 0.0f };
 	//Orientation of the listener. (first 3 elements are "at", second 3 are "up")
-	private float[] listenerOri = { 0.0f, 0.0f, -1.0f, 0.0f, 1.0f, 0.0f };
+	private float[] listenerOri= { 0.0f, 0.0f, -1.0f, 0.0f, 1.0f, 0.0f };
+
+	private IMusicPlayer player;
 
 	public LWJGLSoundRenderer() {
+		IntBuffer source= ByteBuffer.allocateDirect(4).order(ByteOrder.nativeOrder()).asIntBuffer();
+		AL.alGenSources(source);
+		player= new LWJGLSource(source.get(0));
 		setListenerValues();
+
 	}
 
 	private void setListenerValues() {
@@ -65,24 +68,46 @@ public class LWJGLSoundRenderer implements SoundRenderer {
 		AL.alListener3f(AL.AL_ORIENTATION, listenerOri[0], listenerOri[1], listenerOri[2]);
 	}
 
-	
-
-	public void addSoundPlayer(Object name){
-		IntBuffer source=ByteBuffer.allocateDirect(4 ).order(ByteOrder.nativeOrder()).asIntBuffer();
+	public void addSoundPlayer(Object name) {
+		IntBuffer source= ByteBuffer.allocateDirect(4).order(ByteOrder.nativeOrder()).asIntBuffer();
 		AL.alGenSources(source);
-		SourceRepository.getRepository().bind(name, new LWJGLSource(source.get(0)));
+		EffectPlayerRepository.getRepository().bind(name, new LWJGLEffectPlayer(source.get(0)));
+	}
+
+	public void loadSoundAs(String name, String file) {
+		ISoundBuffer buffer= null;
+		if (file.endsWith(".wav")) {
+			System.out.println("Loading " + file + " as " + name);
+			buffer= new LWJGLWaveBuffer();
+			buffer.load(file);
+		}
+		if (file.endsWith(".mp3")) {
+			System.out.println("Loading " + file + " as " + name);
+			buffer= new LWJGLMP3Buffer();
+			buffer.load(file);
+		}
+
+		AL.alBufferData(
+			buffer.getBufferNumber(),
+			buffer.getChannels(),
+			buffer.getBufferData(),
+			buffer.getBufferData().capacity(),
+			buffer.getSampleRate());
+		if (AL.alGetError() != AL.AL_NO_ERROR) {
+			System.err.println("Error generating audio buffer");
+		}
+		SoundEffect effect= new SoundEffect(buffer.getBufferNumber(), IEffect.SOUND_TYPE_EFFECT);
+		EffectRepository.getRepository().bind(name, effect);
+		buffer.release();
 	}
-		
-	
-	
-	public void loadSoundAs(String name, String file){
-		StreamRepository.getInstance().bind(name, file);
+
+	public IEffectPlayer getSoundPlayer(Object name) {
+		return EffectPlayerRepository.getRepository().getSource(name);
 	}
 
-	
-	public SoundSource getSoundPlayer(Object name) {
-		return SourceRepository.getRepository().getSource(name);
+	public IMusicPlayer getMusicPlayer() {
+
+		return player;
 	}
-	
 
 }

--- a/src/com/jme/sound/LWJGLSoundSystem.java
+++ b/src/com/jme/sound/LWJGLSoundSystem.java
@@ -36,15 +36,16 @@ import org.lwjgl.openal.AL;
 
 /**
  * @author Arman Ozcelik
- * @version $Id: LWJGLSoundSystem.java,v 1.4 2003-10-28 16:33:26 Anakan Exp $
+ * @version $Id: LWJGLSoundSystem.java,v 1.5 2003-11-01 23:28:10 Anakan Exp $
  */
 public class LWJGLSoundSystem extends SoundSystem {
 
-	private LWJGLSoundRenderer renderer;
-	private boolean created;
+	private LWJGLSoundRenderer renderer;	
 	
 	public LWJGLSoundSystem(){
-		initOpenAL();
+		if(!created){
+			initOpenAL();
+		}
 		renderer=new LWJGLSoundRenderer();
 		created = true;
 		
@@ -53,7 +54,7 @@ public class LWJGLSoundSystem extends SoundSystem {
 	/**
 	 * TODO Comment
 	 */
-	public SoundRenderer getRenderer() {
+	public IRenderer getRenderer() {
 		return renderer;
 	}
 
@@ -71,7 +72,6 @@ public class LWJGLSoundSystem extends SoundSystem {
 	private void initOpenAL() {
 		try {
 			AL.create();
-			Thread.sleep(1000);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

--- a/src/com/jme/sound/LWJGLSource.java
+++ b/src/com/jme/sound/LWJGLSource.java
@@ -40,30 +40,32 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.IntBuffer;
+import java.util.logging.Level;
 
 import org.lwjgl.openal.AL;
 
 import com.jme.math.Vector3f;
-import com.jme.sound.utils.StreamRepository;
+import com.jme.util.LoggingSystem;
 
 /**
  * @author Arman Ozcelik
  *
  */
-public class LWJGLSource implements SoundSource {
+public class LWJGLSource implements IMusicPlayer {
 
 	private int sourceNumber;
 	private SoundStream stream;
 	private boolean paused, playing;
 	private BufferedPlayer player;
-	private int numberOfBuffers = 1;
+	private int numberOfBuffers= 1;
 	private Vector3f position;
-	private Playlist playList;
 
 	public LWJGLSource(int sourceNum) {
-		this.sourceNumber = sourceNum;
-		position = new Vector3f();
-		player = new BufferedPlayer();
+		this.sourceNumber= sourceNum;
+		position= new Vector3f();
+		player= new BufferedPlayer();
+		player.start();
+		LoggingSystem.getLogger().log(Level.INFO, "LWJGLSoundSource created. SourceNumber:  " + sourceNum);
 	}
 
 	/**
@@ -82,7 +84,7 @@ public class LWJGLSource implements SoundSource {
 			stop();
 		}
 		stream.close();
-		this.stream = stream;
+		this.stream= stream;
 	}
 
 	/**
@@ -99,24 +101,20 @@ public class LWJGLSource implements SoundSource {
 	 * If the sound type is wave then the number of buffers is set to 1.
 	 * @param name the sound name.
 	 */
-	public void play(String name) {
-		
-		if (playList != null && playList.hasNext()){
-	
-		}else {
-			String file = StreamRepository.getInstance().getStream(name);
-			if (file.endsWith(".mp3")) {
-				if (numberOfBuffers < 8)
-					numberOfBuffers = 8;
-				setStream(new LWJGLMP3Stream(file));
-			}
-			if (file.endsWith(".wav")) {
-				setNumberOfBuffers(1);
-				setStream(new LWJGLWaveStream(file));
-			}
+	public void play(String file) {
+		playing= true;
+		paused= false;
+		//String file= StreamRepository.getInstance().getStream(name);
+		if (file.endsWith(".mp3")) {
+			if (numberOfBuffers < 8)
+				numberOfBuffers= 128;
+			setStream(new LWJGLMP3Stream(file));
 		}
-		player = new BufferedPlayer();
-		player.start();
+		if (file.endsWith(".wav")) {
+			setNumberOfBuffers(1);
+			setStream(new LWJGLWaveStream(file));
+		}
+		
 
 	}
 
@@ -129,7 +127,7 @@ public class LWJGLSource implements SoundSource {
 	 * @param z the z position of the source
 	 */
 	public void updatePosition(float x, float y, float z) {
-		Vector3f newPos = new Vector3f(x, y, z);
+		Vector3f newPos= new Vector3f(x, y, z);
 		updatePosition(newPos);
 	}
 
@@ -140,10 +138,10 @@ public class LWJGLSource implements SoundSource {
 	* @param pos the new position of the source
 	*/
 	public void updatePosition(Vector3f pos) {
-		position.x = pos.x;
-		position.y = pos.y;
-		position.z = pos.z;
-		float length = position.length();
+		position.x= pos.x;
+		position.y= pos.y;
+		position.z= pos.z;
+		float length= position.length();
 		if (isPlaying() && !isPaused()) {
 			AL.alSource3f(
 				sourceNumber,
@@ -182,19 +180,19 @@ public class LWJGLSource implements SoundSource {
 
 	public void stop() {
 		AL.alSourceStop(sourceNumber);
-		playing = false;
-		paused = false;
+		playing= false;
+		paused= false;
 	}
 
 	public void pause() {
 		if (isPlaying()) {
 			AL.alSourcePause(sourceNumber);
-			paused = true;
+			paused= true;
 		}
 	}
 
 	public void setNumberOfBuffers(int buffs) {
-		numberOfBuffers = buffs;
+		numberOfBuffers= buffs;
 
 	}
 
@@ -212,11 +210,9 @@ public class LWJGLSource implements SoundSource {
 		private IntBuffer buffers;
 		private IntBuffer temp;
 		protected BufferedPlayer() {
-			buffers =
-				ByteBuffer
-					.allocateDirect(4 * numberOfBuffers)
-					.order(ByteOrder.nativeOrder())
-					.asIntBuffer();
+			buffers=
+				ByteBuffer.allocateDirect(4 * numberOfBuffers).order(ByteOrder.nativeOrder()).asIntBuffer();
+			temp= ByteBuffer.allocateDirect(4).order(ByteOrder.nativeOrder()).asIntBuffer();
 			AL.alGenBuffers(buffers);
 		}
 
@@ -225,14 +221,12 @@ public class LWJGLSource implements SoundSource {
 		}
 
 		public boolean streamBuffer(int bufferNumber) {
-			ByteBuffer data = null;
+			ByteBuffer data= null;
 			try {
-				data = stream.read();
-
+				data= stream.read();
 				if (data.capacity() == 0) {
 					return false;
 				}
-
 			} catch (IOException e) {
 				e.printStackTrace();
 			}
@@ -242,6 +236,8 @@ public class LWJGLSource implements SoundSource {
 				data,
 				data.capacity(),
 				stream.getSampleRate());
+				data.clear();
+				data=null;
 			return true;
 		}
 
@@ -249,7 +245,7 @@ public class LWJGLSource implements SoundSource {
 
 			if (plays())
 				return true;
-			for (int a = 0; a < buffers.capacity(); a++) {
+			for (int a= 0; a < buffers.capacity(); a++) {
 				if (!streamBuffer(buffers.get(a)))
 					return false;
 			}
@@ -259,16 +255,13 @@ public class LWJGLSource implements SoundSource {
 		}
 
 		public boolean update() {
-			boolean active = true;
-			int processed = AL.alGetSourcei(sourceNumber, AL.AL_BUFFERS_PROCESSED);
+			boolean active= true;
+			int processed= AL.alGetSourcei(sourceNumber, AL.AL_BUFFERS_PROCESSED);
 			while ((processed > 0)) {
-
 				processed--;
-				temp = ByteBuffer.allocateDirect(4).order(ByteOrder.nativeOrder()).asIntBuffer();
-
 				AL.alSourceUnqueueBuffers(sourceNumber, temp);
+				active= streamBuffer(temp.get(0));
 
-				active = streamBuffer(temp.get(0));
 				AL.alSourceQueueBuffers(sourceNumber, temp);
 			}
 
@@ -276,22 +269,16 @@ public class LWJGLSource implements SoundSource {
 		}
 
 		public void run() {
-			if (playList != null && playList.hasNext()) {
-				setStream(playList.next());
-				if(stream.getStreamType()==SoundStream.MP3_SOUND_STREAM){
-					if(numberOfBuffers<8){
-						numberOfBuffers=8;
-					}
-				}
-				if(stream.getStreamType()==SoundStream.WAV_SOUND_STREAM){
-					numberOfBuffers=1;
+
+			while (stream == null) {
+				try {
+					Thread.sleep(10);
+				} catch (InterruptedException e) {
+					e.printStackTrace();
 				}
 			}
-			if (stream == null)
-				return; //DISPLAY ERROR?
+			LoggingSystem.getLogger().log(Level.INFO, "New Stream " + stream);
 
-			playing = true;
-			paused = false;
 			playback();
 			while (update()) {
 				if (!plays()) {
@@ -300,16 +287,26 @@ public class LWJGLSource implements SoundSource {
 					}
 				}
 			}
+
 			AL.alSourceStop(sourceNumber);
-			if(playList !=null && playList.hasNext()) run();//argh recursive call
-			playing = false;
-			paused = false;
+			AL.alSourceUnqueueBuffers(sourceNumber, buffers);
+			playing= false;
+			paused= false;
+			stream= null;
+			run();
+
 		}
 
 	}
+	/* (non-Javadoc)
+	 * @see com.jme.sound.IMusicPlayer#getNumberOfBuffers()
+	 */
+	public int getNumberOfBuffers() {
+		return numberOfBuffers;
+	}
 
-	public void setPlaylist(Playlist p) {
-		playList = p;
+	public int getType() {
+		return STREAMING;
 	}
 
 }

--- /dev/null
+++ b/src/com/jme/sound/LWJGLWaveBuffer.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2003, jMonkeyEngine - Mojo Monkey Coding
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this 
+ * list of conditions and the following disclaimer. 
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * 
+ * Neither the name of the Mojo Monkey Coding, jME, jMonkey Engine, nor the 
+ * names of its contributors may be used to endorse or promote products derived 
+ * from this software without specific prior written permission. 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+/*
+ * Created on 31 oct. 2003
+ *
+ */
+package com.jme.sound;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.IntBuffer;
+
+import org.lwjgl.openal.AL;
+
+/**
+ * @author Arman Ozcelik
+ *
+ */
+public class LWJGLWaveBuffer extends WaveBuffer {
+	IntBuffer buffer;
+	
+	public LWJGLWaveBuffer(){
+		buffer=ByteBuffer.allocateDirect(4 ).order(ByteOrder.nativeOrder()).asIntBuffer();
+		AL.alGenBuffers(buffer);
+	}
+	
+	public int getBufferNumber() {
+		
+		return buffer.get(0);
+	}
+
+	
+	public int getChannels() {
+		switch(channels){
+			case MONO8: return AL.AL_FORMAT_MONO8;
+			case MONO16: return AL.AL_FORMAT_MONO16;
+			case STEREO8: return AL.AL_FORMAT_STEREO8;
+			case STEREO16:return AL.AL_FORMAT_STEREO16;
+		}
+		return 0;
+	}
+	
+	
+}

--- a/src/com/jme/sound/LWJGLWaveStream.java
+++ b/src/com/jme/sound/LWJGLWaveStream.java
@@ -36,7 +36,6 @@
  */
 package com.jme.sound;
 
-
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -69,7 +68,7 @@ public class LWJGLWaveStream implements SoundStream {
 	private int length;
 
 	private int offset;
-	
+
 	private boolean isRead;
 
 	/**
@@ -85,7 +84,6 @@ public class LWJGLWaveStream implements SoundStream {
 
 	}
 
-	
 	private void initChannels() {
 		//		get channels
 		if (format.getChannels() == 1) {
@@ -111,7 +109,8 @@ public class LWJGLWaveStream implements SoundStream {
 	}
 
 	public ByteBuffer read() throws IOException {
-		if(isRead) return ByteBuffer.allocateDirect(0);
+		if (isRead)
+			return ByteBuffer.allocateDirect(0);
 		try {
 			audioStream = AudioSystem.getAudioInputStream(new File(file));
 		} catch (FileNotFoundException e) {
@@ -121,21 +120,24 @@ public class LWJGLWaveStream implements SoundStream {
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
-		format = audioStream.getFormat();
-		sampleRate = (int) format.getSampleRate();
-		initChannels();
-		length =
-			format.getChannels()
-				* (int) audioStream.getFrameLength()
-				* format.getSampleSizeInBits()
-				/ 8;
+		if (format == null) {
+			format = audioStream.getFormat();
+		}
+		if (sampleRate == 0) {
+			sampleRate = (int) format.getSampleRate();
+		}
+		if(channels==0){
+			initChannels();
+		}
+		
+		length = format.getChannels() * (int) audioStream.getFrameLength() * format.getSampleSizeInBits() / 8;
 		ByteBuffer buffer = null;
 		byte[] temp = new byte[length];
 		audioStream.read(temp);
 		buffer = ByteBuffer.allocateDirect(length);
 		buffer.put(temp);
 		buffer.rewind();
-		isRead=true;
+		isRead = true;
 		return buffer;
 
 	}
@@ -202,9 +204,7 @@ public class LWJGLWaveStream implements SoundStream {
 		return length;
 	}
 
-
-	
-	public int getStreamType() {		
+	public int getStreamType() {
 		return WAV_SOUND_STREAM;
 	}
 

--- /dev/null
+++ b/src/com/jme/sound/MP3Buffer.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2003, jMonkeyEngine - Mojo Monkey Coding
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this 
+ * list of conditions and the following disclaimer. 
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * 
+ * Neither the name of the Mojo Monkey Coding, jME, jMonkey Engine, nor the 
+ * names of its contributors may be used to endorse or promote products derived 
+ * from this software without specific prior written permission. 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+/*
+ * Created on 1 nov. 2003
+ *
+ */
+package com.jme.sound;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+
+import javazoom.jl.decoder.Bitstream;
+import javazoom.jl.decoder.BitstreamException;
+import javazoom.jl.decoder.Decoder;
+import javazoom.jl.decoder.DecoderException;
+import javazoom.jl.decoder.Header;
+import javazoom.jl.decoder.SampleBuffer;
+
+/**
+ * @author Arman Ozcelik
+ *
+ */
+public abstract class MP3Buffer implements ISoundBuffer {
+
+	private Decoder decoder;
+
+	private Bitstream stream;
+
+	private SampleBuffer sampleBuf;
+
+	private int sampleRate;
+
+	protected int channels;
+	
+	protected ByteBuffer data;
+
+	public void load(String file) {
+		try {
+			InputStream in= new FileInputStream(file);
+			BufferedInputStream bin= new BufferedInputStream(in);
+			decoder= new Decoder();
+			stream= new Bitstream(bin);
+		} catch (IOException ioe) {
+			ioe.printStackTrace();
+		}
+		ByteArrayOutputStream out=new ByteArrayOutputStream();
+		try {
+			Header header= null;
+			while ((header= stream.readFrame()) != null) {
+				if (sampleBuf == null) {
+					sampleBuf=
+						new SampleBuffer(
+							header.frequency(),
+							(header.mode() == Header.SINGLE_CHANNEL) ? 1 : 2);
+					decoder.setOutputBuffer(sampleBuf);
+				}
+				if (channels == 0) {
+					channels= (header.mode() == Header.SINGLE_CHANNEL) ? MONO16 : STEREO16;
+				}
+				if (sampleRate == 0) {
+					sampleRate= header.frequency();
+				}
+				//sampleBuf = (SampleBuffer) decoder.decodeFrame(header, stream);
+				decoder.decodeFrame(header, stream);
+				stream.closeFrame();
+				out.write(toByteArray(sampleBuf.getBuffer(), 0, sampleBuf.getBufferLength()));
+				
+			}
+			byte[] obuf= out.toByteArray();
+			data= ByteBuffer.allocateDirect(obuf.length);
+			data.put(obuf);
+			data.rewind();
+
+			
+		} catch (BitstreamException bs) {
+			bs.printStackTrace();
+		} catch (DecoderException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			
+			e.printStackTrace();
+		}
+
+	}
+
+	
+	
+	public ByteBuffer getBufferData() {
+		return data;
+	}
+
+	
+
+	
+	public int getSampleRate() {
+		return sampleRate;
+	}
+
+	
+	public void release() {
+		data.clear();
+		data=null;
+	}
+
+	protected byte[] toByteArray(short[] samples, int offs, int len) {
+		byte[] b= new byte[len * 2];
+		int idx= 0;
+		while (len-- > 0) {
+			b[idx++]= (byte) (samples[offs++] & 0x00FF);
+			b[idx++]= (byte) ((samples[offs] >>> 8) & 0x00FF);
+		}
+		return b;
+	}
+
+}

--- /dev/null
+++ b/src/com/jme/sound/SoundEffect.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2003, jMonkeyEngine - Mojo Monkey Coding
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this 
+ * list of conditions and the following disclaimer. 
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * 
+ * Neither the name of the Mojo Monkey Coding, jME, jMonkey Engine, nor the 
+ * names of its contributors may be used to endorse or promote products derived 
+ * from this software without specific prior written permission. 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+/*
+ * Created on 31 oct. 2003
+ *
+ */
+package com.jme.sound;
+
+/**
+ * @author Arman Ozcelik
+ *
+ */
+public class SoundEffect implements IEffect {
+	
+	private int name;
+	private int type;
+	
+	public SoundEffect(int name, int type){
+		this.name=name;
+		this.type=type;
+	}
+	
+	public int getName() {
+		return name;
+	}
+
+	
+	public int getSoundType() {
+		return type;
+	}
+
+}

--- a/src/com/jme/sound/SoundSystem.java
+++ b/src/com/jme/sound/SoundSystem.java
@@ -31,18 +31,18 @@
  */
 package com.jme.sound;
 
-
-
 /**
  * @author Arman Ozcelik
- * @version $Id: SoundSystem.java,v 1.3 2003-10-25 02:23:09 Anakan Exp $
+ * @version $Id: SoundSystem.java,v 1.4 2003-11-01 23:28:11 Anakan Exp $
  */
 public abstract class SoundSystem {
 	/**
 		* The list of current implemented rendering APIs that subclass SoundSystem.
 		*/
-	public static final String[] rendererNames = { "LWJGL" };
-
+	public static final String[] rendererNames= { "LWJGL" };
+	
+	protected static boolean created;
+	
 	/**
 		 * 
 		 * <code>getSoundSystem</code> is a factory method that creates the
@@ -53,7 +53,7 @@ public abstract class SoundSystem {
 		 * @param key the display system to use.
 		 * @return the appropriate display system specified by the key.
 		 */
-	public static SoundSystem getSoundSystem(String key) {
+	public static SoundSystem getSoundEffectSystem(String key) {
 		if ("LWJGL".equalsIgnoreCase(key)) {
 			return new LWJGLSoundSystem();
 		}
@@ -72,7 +72,7 @@ public abstract class SoundSystem {
 		*      compatible with the used <code>SoundSystem</code>.
 		*/
 
-	public abstract SoundRenderer getRenderer();
+	public abstract IRenderer getRenderer();
 
 	/**
 		* <code>isCreated</code> returns the current status of the sound
@@ -84,9 +84,4 @@ public abstract class SoundSystem {
 
 	public abstract boolean isCreated();
 
-	
-		
-		
-	
-
 }

--- /dev/null
+++ b/src/com/jme/sound/WaveBuffer.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2003, jMonkeyEngine - Mojo Monkey Coding
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this 
+ * list of conditions and the following disclaimer. 
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * 
+ * Neither the name of the Mojo Monkey Coding, jME, jMonkey Engine, nor the 
+ * names of its contributors may be used to endorse or promote products derived 
+ * from this software without specific prior written permission. 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+/*
+ * Created on 31 oct. 2003
+ *
+ */
+package com.jme.sound;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioInputStream;
+import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.UnsupportedAudioFileException;
+
+/**
+ * @author Arman Ozcelik
+ *
+ */
+public abstract class WaveBuffer implements ISoundBuffer {
+
+	protected int bufferNumber;
+	protected int channels;
+	protected int sampleRate;
+	protected ByteBuffer data;
+	private AudioFormat format;
+	private AudioInputStream audioStream;
+
+	public void load(String file) {
+		try {
+			audioStream = AudioSystem.getAudioInputStream(new File(file));
+		} catch (FileNotFoundException e) {
+			e.printStackTrace();
+		} catch (UnsupportedAudioFileException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		format = audioStream.getFormat();
+		sampleRate = (int) format.getSampleRate();
+		System.out.println("Sample Rate "+sampleRate);
+		initChannels();
+		int length =
+			format.getChannels() * (int) audioStream.getFrameLength() * format.getSampleSizeInBits() / 8;
+		byte[] temp = new byte[length];
+		try {
+			audioStream.read(temp, 0, length);
+		} catch (IOException e1) {
+			e1.printStackTrace();
+		}
+		data = ByteBuffer.allocateDirect(length);
+		data.put(temp);
+		data.rewind();
+		System.out.println("Data length "+data.capacity());	
+	}
+
+	public int getSampleRate() {
+		return sampleRate;
+	}
+
+	public ByteBuffer getBufferData() {
+		return data;
+	}
+
+	public void release() {
+		data.clear();
+		data = null;
+	}
+
+	private void initChannels() {
+		//		get channels
+		if (format.getChannels() == 1) {
+			if (format.getSampleSizeInBits() == 8) {
+				channels = MONO8;
+			} else if (format.getSampleSizeInBits() == 16) {
+				channels = MONO16;
+			} else {
+				assert false : "Illegal sample size";
+			}
+		} else if (format.getChannels() == 2) {
+			if (format.getSampleSizeInBits() == 8) {
+				channels = STEREO8;
+			} else if (format.getSampleSizeInBits() == 16) {
+				channels = STEREO16;
+			} else {
+				assert false : "Illegal sample size";
+			}
+		} else {
+			assert false : "Only mono or stereo is supported";
+		}
+		System.out.println("Channels "+ channels);
+
+	}
+
+}

--- a/src/com/jme/sound/action/SoundBackwardAction.java
+++ b/src/com/jme/sound/action/SoundBackwardAction.java
@@ -38,7 +38,9 @@ package com.jme.sound.action;
 
 import com.jme.input.action.KeyBackwardAction;
 import com.jme.renderer.Camera;
-import com.jme.sound.SoundSource;
+import com.jme.sound.IEffectPlayer;
+import com.jme.sound.utils.EffectRepository;
+
 
 /**
  * @author Arman Ozcelik
@@ -47,13 +49,13 @@ import com.jme.sound.SoundSource;
 public class SoundBackwardAction extends KeyBackwardAction {
 
 	private String sound;
-	private SoundSource player;
+	private IEffectPlayer player;
 
 	/**
 	 * @param camera
 	 * @param speed
 	 */
-	public SoundBackwardAction(Camera camera, float speed, SoundSource soundPlayer, String soundName) {
+	public SoundBackwardAction(Camera camera, float speed, IEffectPlayer soundPlayer, String soundName) {
 		super(camera, speed);
 		player = soundPlayer;
 		sound = soundName;
@@ -64,8 +66,8 @@ public class SoundBackwardAction extends KeyBackwardAction {
 	*/
 	public void performAction(float time) {
 		super.performAction(time);
-		if (player != null && !player.isPlaying()) {
-			player.play(sound);
+		if (player != null && player.getStatus() !=IEffectPlayer.PLAYING) {
+			player.play(EffectRepository.getRepository().getSource(sound));
 		}
 	}
 }

--- a/src/com/jme/sound/action/SoundForwardAction.java
+++ b/src/com/jme/sound/action/SoundForwardAction.java
@@ -38,7 +38,9 @@ package com.jme.sound.action;
 
 import com.jme.input.action.KeyForwardAction;
 import com.jme.renderer.Camera;
-import com.jme.sound.SoundSource;
+import com.jme.sound.IEffect;
+import com.jme.sound.IEffectPlayer;
+import com.jme.sound.utils.EffectRepository;
 
 /**
  * @author Arman Ozcelik
@@ -46,27 +48,29 @@ import com.jme.sound.SoundSource;
  */
 public class SoundForwardAction extends KeyForwardAction {
 
-	private SoundSource player;
+	private IEffectPlayer player;
 	private String sound;
 
 	/**
 	 * @param camera
 	 * @param speed
 	 */
-	public SoundForwardAction(Camera camera, float speed, SoundSource soundPlayer, String soundName) {
+	public SoundForwardAction(Camera camera, float speed, IEffectPlayer soundPlayer, String soundName) {
 		super(camera, speed);
-		player = soundPlayer;
-		sound = soundName;
+		player= soundPlayer;
+		sound= soundName;
 	}
 
 	/**
-	 * @see com.jme.input.action.InputAction#performAction(float)
-	 */
+	* @see com.jme.input.action.InputAction#performAction(float)
+	*/
 	public void performAction(float time) {
 		super.performAction(time);
-		if (player != null && !player.isPlaying()) {
-			player.play(sound);
+		if (player != null && player.getStatus() != IEffectPlayer.PLAYING) {
+			IEffect effect=EffectRepository.getRepository().getSource(sound);
+			if(effect !=null){
+				player.play(effect);
+			}
 		}
 	}
-
 }

--- a/src/com/jme/sound/action/SoundLookDownAction.java
+++ b/src/com/jme/sound/action/SoundLookDownAction.java
@@ -38,7 +38,8 @@ package com.jme.sound.action;
 
 import com.jme.input.action.KeyLookDownAction;
 import com.jme.renderer.Camera;
-import com.jme.sound.SoundSource;
+import com.jme.sound.IEffectPlayer;
+import com.jme.sound.utils.EffectRepository;
 
 /**
  * @author Arman Ozcelik
@@ -47,15 +48,15 @@ import com.jme.sound.SoundSource;
 public class SoundLookDownAction extends KeyLookDownAction {
 
 	private String sound;
-	private SoundSource player;
+	private IEffectPlayer player;
 	/**
 	 * @param camera
 	 * @param speed
 	 */
-	public SoundLookDownAction(Camera camera, float speed, SoundSource soundPlayer, String soundName) {
+	public SoundLookDownAction(Camera camera, float speed, IEffectPlayer soundPlayer, String soundName) {
 		super(camera, speed);
-		player = soundPlayer;
-		sound = soundName;
+		player= soundPlayer;
+		sound= soundName;
 	}
 
 	/**
@@ -63,8 +64,8 @@ public class SoundLookDownAction extends KeyLookDownAction {
 	*/
 	public void performAction(float time) {
 		super.performAction(time);
-		if (player != null && !player.isPlaying()) {
-			player.play(sound);
+		if (player != null && player.getStatus() != IEffectPlayer.PLAYING) {
+			player.play(EffectRepository.getRepository().getSource(sound));
 		}
 	}
-}
+}
\ No newline at end of file

--- a/src/com/jme/sound/action/SoundLookUpAction.java
+++ b/src/com/jme/sound/action/SoundLookUpAction.java
@@ -38,7 +38,8 @@ package com.jme.sound.action;
 
 import com.jme.input.action.KeyLookUpAction;
 import com.jme.renderer.Camera;
-import com.jme.sound.SoundSource;
+import com.jme.sound.IEffectPlayer;
+import com.jme.sound.utils.EffectRepository;
 
 /**
  * @author Arman Ozcelik
@@ -47,15 +48,15 @@ import com.jme.sound.SoundSource;
 public class SoundLookUpAction extends KeyLookUpAction {
 
 	private String sound;
-	private SoundSource player;
+	private IEffectPlayer player;
 	/**
 	 * @param camera
 	 * @param speed
 	 */
-	public SoundLookUpAction(Camera camera, float speed, SoundSource soundPlayer, String soundName) {
+	public SoundLookUpAction(Camera camera, float speed, IEffectPlayer soundPlayer, String soundName) {
 		super(camera, speed);
-		player = soundPlayer;
-		sound = soundName;
+		player= soundPlayer;
+		sound= soundName;
 	}
 
 	/**
@@ -63,8 +64,8 @@ public class SoundLookUpAction extends KeyLookUpAction {
 	*/
 	public void performAction(float time) {
 		super.performAction(time);
-		if (player != null && !player.isPlaying()) {
-			player.play(sound);
+		if (player != null && player.getStatus() != IEffectPlayer.PLAYING) {
+			player.play(EffectRepository.getRepository().getSource(sound));
 		}
 	}
-}
+}
\ No newline at end of file

--- a/src/com/jme/sound/action/SoundRotateLeftAction.java
+++ b/src/com/jme/sound/action/SoundRotateLeftAction.java
@@ -38,7 +38,8 @@ package com.jme.sound.action;
 
 import com.jme.input.action.KeyRotateLeftAction;
 import com.jme.renderer.Camera;
-import com.jme.sound.SoundSource;
+import com.jme.sound.IEffectPlayer;
+import com.jme.sound.utils.EffectRepository;
 
 /**
  * @author Arman Ozcelik
@@ -47,15 +48,15 @@ import com.jme.sound.SoundSource;
 public class SoundRotateLeftAction extends KeyRotateLeftAction {
 
 	private String sound;
-	private SoundSource player;
+	private IEffectPlayer player;
 	/**
 	 * @param camera
 	 * @param speed
 	 */
-	public SoundRotateLeftAction(Camera camera, float speed, SoundSource soundPlayer, String soundName) {
+	public SoundRotateLeftAction(Camera camera, float speed, IEffectPlayer soundPlayer, String soundName) {
 		super(camera, speed);
-		player = soundPlayer;
-		sound = soundName;
+		player= soundPlayer;
+		sound= soundName;
 	}
 
 	/**
@@ -63,8 +64,8 @@ public class SoundRotateLeftAction extends KeyRotateLeftAction {
 	*/
 	public void performAction(float time) {
 		super.performAction(time);
-		if (player != null && !player.isPlaying()) {
-			player.play(sound);
+		if (player != null && player.getStatus() != IEffectPlayer.PLAYING) {
+			player.play(EffectRepository.getRepository().getSource(sound));
 		}
 	}
-}
+}
\ No newline at end of file

--- a/src/com/jme/sound/action/SoundRotateRightAction.java
+++ b/src/com/jme/sound/action/SoundRotateRightAction.java
@@ -38,7 +38,8 @@ package com.jme.sound.action;
 
 import com.jme.input.action.KeyRotateRightAction;
 import com.jme.renderer.Camera;
-import com.jme.sound.SoundSource;
+import com.jme.sound.IEffectPlayer;
+import com.jme.sound.utils.EffectRepository;
 
 /**
  * @author Arman Ozcelik
@@ -46,24 +47,24 @@ import com.jme.sound.SoundSource;
  */
 public class SoundRotateRightAction extends KeyRotateRightAction {
 	private String sound;
-		private SoundSource player;
-		/**
-		 * @param camera
-		 * @param speed
-		 */
-		public SoundRotateRightAction(Camera camera, float speed, SoundSource soundPlayer, String soundName) {
-			super(camera, speed);
-			player = soundPlayer;
-			sound = soundName;
-		}
+	private IEffectPlayer player;
+	/**
+	 * @param camera
+	 * @param speed
+	 */
+	public SoundRotateRightAction(Camera camera, float speed, IEffectPlayer soundPlayer, String soundName) {
+		super(camera, speed);
+		player= soundPlayer;
+		sound= soundName;
+	}
 
-		/**
-		* @see com.jme.input.action.InputAction#performAction(float)
-		*/
-		public void performAction(float time) {
-			super.performAction(time);
-			if (player != null && !player.isPlaying()) {
-				player.play(sound);
-			}
+	/**
+	* @see com.jme.input.action.InputAction#performAction(float)
+	*/
+	public void performAction(float time) {
+		super.performAction(time);
+		if (player != null && player.getStatus() != IEffectPlayer.PLAYING) {
+			player.play(EffectRepository.getRepository().getSource(sound));
 		}
 	}
+}
\ No newline at end of file

--- a/src/com/jme/sound/action/SoundStrafeLeftAction.java
+++ b/src/com/jme/sound/action/SoundStrafeLeftAction.java
@@ -38,7 +38,8 @@ package com.jme.sound.action;
 
 import com.jme.input.action.KeyStrafeLeftAction;
 import com.jme.renderer.Camera;
-import com.jme.sound.SoundSource;
+import com.jme.sound.IEffectPlayer;
+import com.jme.sound.utils.EffectRepository;
 
 /**
  * @author Arman Ozcelik
@@ -46,15 +47,15 @@ import com.jme.sound.SoundSource;
  */
 public class SoundStrafeLeftAction extends KeyStrafeLeftAction {
 	private String sound;
-	private SoundSource player;
+	private IEffectPlayer player;
 	/**
 	 * @param camera
 	 * @param speed
 	 */
-	public SoundStrafeLeftAction(Camera camera, float speed, SoundSource soundPlayer, String soundName) {
+	public SoundStrafeLeftAction(Camera camera, float speed, IEffectPlayer soundPlayer, String soundName) {
 		super(camera, speed);
-		player = soundPlayer;
-		sound = soundName;
+		player= soundPlayer;
+		sound= soundName;
 	}
 
 	/**
@@ -62,8 +63,8 @@ public class SoundStrafeLeftAction extends KeyStrafeLeftAction {
 	*/
 	public void performAction(float time) {
 		super.performAction(time);
-		if (player != null && !player.isPlaying()) {
-			player.play(sound);
+		if (player != null && player.getStatus() != IEffectPlayer.PLAYING) {
+			player.play(EffectRepository.getRepository().getSource(sound));
 		}
 	}
-}
+}
\ No newline at end of file

--- a/src/com/jme/sound/action/SoundStrafeRightAction.java
+++ b/src/com/jme/sound/action/SoundStrafeRightAction.java
@@ -38,7 +38,8 @@ package com.jme.sound.action;
 
 import com.jme.input.action.KeyStrafeRightAction;
 import com.jme.renderer.Camera;
-import com.jme.sound.SoundSource;
+import com.jme.sound.IEffectPlayer;
+import com.jme.sound.utils.EffectRepository;
 
 /**
  * @author Arman Ozcelik
@@ -47,15 +48,15 @@ import com.jme.sound.SoundSource;
 public class SoundStrafeRightAction extends KeyStrafeRightAction {
 
 	private String sound;
-	private SoundSource player;
+	private IEffectPlayer player;
 	/**
 	 * @param camera
 	 * @param speed
 	 */
-	public SoundStrafeRightAction(Camera camera, float speed, SoundSource soundPlayer, String soundName) {
+	public SoundStrafeRightAction(Camera camera, float speed, IEffectPlayer soundPlayer, String soundName) {
 		super(camera, speed);
-		player = soundPlayer;
-		sound = soundName;
+		player= soundPlayer;
+		sound= soundName;
 	}
 
 	/**
@@ -63,8 +64,8 @@ public class SoundStrafeRightAction extends KeyStrafeRightAction {
 	*/
 	public void performAction(float time) {
 		super.performAction(time);
-		if (player != null && !player.isPlaying()) {
-			player.play(sound);
+		if (player != null && player.getStatus() != IEffectPlayer.PLAYING) {
+			player.play(EffectRepository.getRepository().getSource(sound));
 		}
 	}
-}
+}
\ No newline at end of file

--- a/src/com/jme/sound/utils/SourceRepository.java
+++ b/src/com/jme/sound/utils/EffectPlayerRepository.java
@@ -31,51 +31,42 @@
  */
 
 /*
- * Created on 23 oct. 2003
+ * Created on 31 oct. 2003
  *
  */
 package com.jme.sound.utils;
 
-
 import java.util.Hashtable;
 
-import com.jme.sound.SoundSource;
-
-
+import com.jme.sound.IEffectPlayer;
 
 /**
  * @author Arman Ozcelik
  *
  */
-public class SourceRepository {
+public class EffectPlayerRepository {
+
+	private Hashtable repository = new Hashtable();
+	private static EffectPlayerRepository instance;
+
+	private EffectPlayerRepository() {
 
-	private Hashtable repository=new Hashtable();
-	private static SourceRepository instance;
-	
-	private SourceRepository() {
-		
 	}
-	
-	public synchronized static SourceRepository getRepository(){
-		if(instance==null){
-			instance=new SourceRepository();
+
+	public synchronized static EffectPlayerRepository getRepository() {
+		if (instance == null) {
+			instance = new EffectPlayerRepository();
 		}
-		return instance;		
+		return instance;
 	}
-	
-	public void bind(Object player, SoundSource source){
+
+	public void bind(Object player, IEffectPlayer source) {
 		repository.put(player, source);
-		
+
 	}
-	
-	public SoundSource getSource(Object player){
-		return (SoundSource)repository.get(player);
+
+	public IEffectPlayer getSource(Object player) {
+		return (IEffectPlayer) repository.get(player);
 	}
-	
-	
-	
-	
-	
-	
 
 }

--- /dev/null
+++ b/src/com/jme/sound/utils/EffectRepository.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2003, jMonkeyEngine - Mojo Monkey Coding
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this 
+ * list of conditions and the following disclaimer. 
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * 
+ * Neither the name of the Mojo Monkey Coding, jME, jMonkey Engine, nor the 
+ * names of its contributors may be used to endorse or promote products derived 
+ * from this software without specific prior written permission. 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+/*
+ * Created on 31 oct. 2003
+ *
+ */
+package com.jme.sound.utils;
+
+import java.util.Hashtable;
+import com.jme.sound.IEffect;
+
+/**
+ * @author Arman Ozcelik
+ *
+ */
+public class EffectRepository {
+
+	private Hashtable repository= new Hashtable();
+	private Hashtable queued= new Hashtable();
+	private static EffectRepository instance;
+
+	private EffectRepository() {
+
+	}
+
+	public synchronized static EffectRepository getRepository() {
+		if (instance == null) {
+			instance= new EffectRepository();
+		}
+		return instance;
+	}
+
+	public void bind(String name, IEffect source) {
+		repository.put(name, source);
+
+	}
+
+	public IEffect getSource(String name) {
+		return (IEffect)repository.get(name);
+		
+		
+	}
+
+}

--- a/src/com/jme/sound/LWJGLPlaylist.java
+++ b/src/com/jme/sound/utils/OnDemandSoundLoader.java
@@ -31,54 +31,84 @@
  */
 
 /*
- * Created on 27 oct. 2003
+ * Created on 1 nov. 2003
  *
  */
-package com.jme.sound;
+package com.jme.sound.utils;
 
 import java.util.ArrayList;
 
-import com.jme.sound.utils.StreamRepository;
+import org.lwjgl.openal.AL;
+
+import com.jme.sound.IEffect;
+import com.jme.sound.ISoundBuffer;
+import com.jme.sound.LWJGLMP3Buffer;
+import com.jme.sound.LWJGLWaveBuffer;
+import com.jme.sound.SoundEffect;
 
 /**
  * @author Arman Ozcelik
- * 
- * This class thread unsafe. A playlist sould be filled once for ever.
  *
  */
-public class LWJGLPlaylist implements Playlist {
+public class OnDemandSoundLoader extends Thread {
+
+	private boolean killed;
+	private ArrayList batchList= new ArrayList();
+	private ArrayList output= new ArrayList();
+	private long waitTime;
 
-	private ArrayList preloaded;
-	/**
-	 * 
-	 */
-	public LWJGLPlaylist() {
-		preloaded = new ArrayList();
+	protected OnDemandSoundLoader() {
 	}
 
-	public void queueSound(String name) {
-		String file = StreamRepository.getInstance().getStream(name);
-		if (file.endsWith(".mp3")) {
-			preloaded.add(new LWJGLMP3Stream(file));
-		}
-		if (file.endsWith(".wav")) {
-			preloaded.add(new LWJGLWaveStream(file));
-		}
+	public OnDemandSoundLoader queueSound(String name, String file) {
+		batchList.add(name);
+		batchList.add(file);
+		return this;
 	}
 
-	public SoundStream next() {
-		if (preloaded.size() > 0) {
-			return (SoundStream) preloaded.remove(0);
+	public void run() {
+		while (!killed) {
+			String name= null;
+			String file= null;
+			if (batchList.size() >= 2) {
+				synchronized (batchList) {
+					name= (String)batchList.remove(0);
+					file= (String)batchList.remove(0);
+
+				}
+				ISoundBuffer buffer= null;
+				if (file.endsWith(".wav")) {
+					System.out.println("Loading " + file + " as " + name);
+					buffer= new LWJGLWaveBuffer();
+					buffer.load(file);
+				}
+				if (file.endsWith(".mp3")) {
+					System.out.println("Loading " + file + " as " + name);
+					buffer= new LWJGLMP3Buffer();
+					buffer.load(file);
+				}
+				AL.alBufferData(
+					buffer.getBufferNumber(),
+					buffer.getChannels(),
+					buffer.getBufferData(),
+					buffer.getBufferData().capacity(),
+					buffer.getSampleRate());
+				if (AL.alGetError() != AL.AL_NO_ERROR) {
+					System.err.println("Error generating audio buffer");
+				}
+				SoundEffect effect= new SoundEffect(buffer.getBufferNumber(), IEffect.SOUND_TYPE_EFFECT);
+				EffectRepository rep=EffectRepository.getRepository();
+				synchronized(rep){
+					rep.bind(name, effect);
+				}
+				buffer.release();
+				
+			}
+
 		}
-		return null;
-	}
 
-	public boolean hasNext() {
-		return preloaded.size() > 0;
 	}
+	
 
-	public int length() {
-		return preloaded.size();
-	}
 
 }

--- a/src/com/jme/test/sound/TestSound.java
+++ b/src/com/jme/test/sound/TestSound.java
@@ -4,8 +4,10 @@
  */
 package com.jme.test.sound;
 
+import com.jme.sound.IEffectPlayer;
+import com.jme.sound.IRenderer;
 import com.jme.sound.SoundSystem;
-import com.jme.sound.SoundRenderer;
+import com.jme.sound.utils.EffectRepository;
 
 
 
@@ -17,28 +19,22 @@ public class TestSound{
 	
 	
 	public static void main(String[] args) throws InterruptedException {
-		SoundSystem system=SoundSystem.getSoundSystem("LWJGL");
-		SoundRenderer renderer=system.getRenderer();
-		renderer.addSoundPlayer("MONSTER");
+		SoundSystem system=SoundSystem.getSoundEffectSystem("LWJGL");
+		IRenderer renderer=system.getRenderer();
+		
 		renderer.addSoundPlayer("NPC");
 		
-		renderer.loadSoundAs("music", "cu.wav");
-		renderer.loadSoundAs("bored", "01.mp3");
+		renderer.loadSoundAs("music", "../data/sound/walk.mp3");
 		
-		renderer.getSoundPlayer("MONSTER").setNumberOfBuffers(1);
-		renderer.getSoundPlayer("NPC").setNumberOfBuffers(128);
 		
-		renderer.getSoundPlayer("MONSTER").updatePosition(1, 0, 0);
-		renderer.getSoundPlayer("NPC").updatePosition(0, 0, 0);
-		renderer.getSoundPlayer("NPC").updateVelocity(0, 0, 0);
 		
 		//renderer.getSoundPlayer("MONSTER").play("music");
-		renderer.getSoundPlayer("NPC").play("bored");
+		renderer.getSoundPlayer("NPC").play(EffectRepository.getRepository().getSource("music"));
 		
 		
-		//while(renderer.getSoundPlayer("MONSTER").isPlaying()){
-		//	Thread.sleep(1000);
-		//}
+		while(renderer.getSoundPlayer("NPC").getStatus()==IEffectPlayer.PLAYING){
+			Thread.sleep(1000);
+		}
 		
 		
 	}

--- a/src/com/jme/test/sound/TestSoundLoop.java
+++ b/src/com/jme/test/sound/TestSoundLoop.java
@@ -32,6 +32,8 @@
 package com.jme.test.sound;
 
 
+
+
 import com.jme.app.AbstractGame;
 import com.jme.image.Texture;
 import com.jme.math.Vector3f;
@@ -47,8 +49,8 @@ import com.jme.system.LWJGLDisplaySystem;
 import com.jme.util.TextureManager;
 
 
+import com.jme.sound.IRenderer;
 import com.jme.sound.SoundSystem;
-import com.jme.sound.SoundRenderer;
 
 /**
  * <code>TestSoundLoop</code>
@@ -60,7 +62,7 @@ public class TestSoundLoop extends AbstractGame {
     private Text text;
     private Camera cam;
     private Node scene;
-    private SoundRenderer soundRenderer;
+    private IRenderer soundRenderer;
     
     public static void main(String[] args) {
         TestSoundLoop app = new TestSoundLoop();
@@ -73,10 +75,7 @@ public class TestSoundLoop extends AbstractGame {
      * @see com.jme.app.AbstractGame#update()
      */
     protected void update() {
-        if(!soundRenderer.getSoundPlayer("NPC").isPlaying()) {
-            soundRenderer.getSoundPlayer("NPC").play("bored");
-        
-        }
+       
     }
 
     /**
@@ -108,7 +107,7 @@ public class TestSoundLoop extends AbstractGame {
             System.exit(1);
         }
         
-        SoundSystem system=SoundSystem.getSoundSystem("LWJGL");
+        SoundSystem system=SoundSystem.getSoundEffectSystem("LWJGL");
         soundRenderer=system.getRenderer();
         
         
@@ -138,7 +137,7 @@ public class TestSoundLoop extends AbstractGame {
         ts.setEnabled(true);
         ts.setTexture(
             TextureManager.loadTexture(
-                "data/Font/font.png",
+                "../data/Font/font.png",
                 Texture.MM_LINEAR,
                 Texture.FM_LINEAR,
                 true));
@@ -158,16 +157,13 @@ public class TestSoundLoop extends AbstractGame {
         
         soundRenderer.addSoundPlayer("MONSTER");
         soundRenderer.addSoundPlayer("NPC");
-
+		
         soundRenderer.loadSoundAs("music", "cu.wav");
-        soundRenderer.loadSoundAs("bored", "data/music/02 Butterfly Wings.mp3");
-
-        soundRenderer.getSoundPlayer("MONSTER").setNumberOfBuffers(1);
-        soundRenderer.getSoundPlayer("NPC").setNumberOfBuffers(128);
+        soundRenderer.loadSoundAs("bored", "../data/sound/03.mp3");
 
-        soundRenderer.getSoundPlayer("MONSTER").updatePosition(1, 0, 0);
-        soundRenderer.getSoundPlayer("NPC").updatePosition(0, 0, 0);
-        soundRenderer.getSoundPlayer("NPC").updateVelocity(0, 0, 0);
+       
+        
+        
 
     }
 

--- a/src/com/jme/test/sound/TestSoundMove.java
+++ b/src/com/jme/test/sound/TestSoundMove.java
@@ -51,8 +51,9 @@ import com.jme.system.JmeException;
 import com.jme.system.LWJGLDisplaySystem;
 import com.jme.util.TextureManager;
 
+import com.jme.sound.IRenderer;
 import com.jme.sound.SoundSystem;
-import com.jme.sound.SoundRenderer;
+
 /**
  * @author Arman Ozcelik
  *
@@ -62,7 +63,7 @@ public class TestSoundMove extends AbstractGame {
 	private Text text;
 	private Camera cam;
 	private Node scene;
-	private SoundRenderer soundRenderer;
+	private IRenderer soundRenderer;
 	private RelativeMouse mouse;
 	float x;
 	float y;
@@ -80,24 +81,7 @@ public class TestSoundMove extends AbstractGame {
 	protected void update() {
 		mouse.update();
 		
-		if (!soundRenderer.getSoundPlayer("NPC").isPlaying()) {
-			soundRenderer.getSoundPlayer("NPC").play("bored");
-
-		} else {
-			if (mouse.getLocalTranslation().x > 0) {
-				x+=0.05f;
-			} else if (mouse.getLocalTranslation().x < 0) {
-				x-= 0.5f;
-			}
-			if (mouse.getLocalTranslation().y > 0) {
-				y+=0.05f;
-			} else if (mouse.getLocalTranslation().y < 0) {
-				y-=0.05f;
-			}
-			soundRenderer.getSoundPlayer("NPC").updatePosition(x, y, 0);
-			text.print("Position: x=" + x + " , y=" +
-							y);
-		}
+		
 	}
 
 	/**
@@ -132,7 +116,7 @@ public class TestSoundMove extends AbstractGame {
 			System.exit(1);
 		}
 		InputSystem.createInputSystem(properties.getRenderer());
-		SoundSystem system = SoundSystem.getSoundSystem("LWJGL");
+		SoundSystem system = SoundSystem.getSoundEffectSystem("LWJGL");
 		soundRenderer = system.getRenderer();
 
 		ColorRGBA blueColor = new ColorRGBA();
@@ -207,12 +191,7 @@ public class TestSoundMove extends AbstractGame {
 		soundRenderer.loadSoundAs("music", "walk.wav");
 		soundRenderer.loadSoundAs("bored", "03.mp3");
 
-		soundRenderer.getSoundPlayer("MONSTER").setNumberOfBuffers(1);
-		soundRenderer.getSoundPlayer("NPC").setNumberOfBuffers(128);
 
-		soundRenderer.getSoundPlayer("MONSTER").updatePosition(0, 0, 0);
-		soundRenderer.getSoundPlayer("NPC").updatePosition(0, 0, 0);
-		soundRenderer.getSoundPlayer("NPC").updateVelocity(0, 0, 0);
 
 	}