sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fix some dependencies for AudioNode

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10418 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2013-02-20 19:18:45 +00:00
parent 7b4f4b8678
commit 5746d0be4d
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engine/src/core/com/jme3/cinematic/events/SoundEvent.java
View File

@ -34,6 +34,7 @@ package com.jme3.cinematic.events;
import com.jme3.animation.LoopMode; import com.jme3.animation.LoopMode;
import com.jme3.app.Application; import com.jme3.app.Application;
import com.jme3.audio.AudioNode; import com.jme3.audio.AudioNode;
import com.jme3.audio.AudioSource;
import com.jme3.cinematic.Cinematic; import com.jme3.cinematic.Cinematic;
import com.jme3.export.InputCapsule; import com.jme3.export.InputCapsule;
import com.jme3.export.JmeExporter; import com.jme3.export.JmeExporter;
@ -185,7 +186,7 @@ public class SoundEvent extends AbstractCinematicEvent {
@Override @Override
public void onUpdate(float tpf) { public void onUpdate(float tpf) {
if (audioNode.getStatus() == AudioNode.Status.Stopped) { if (audioNode.getStatus() == AudioSource.Status.Stopped) {
stop(); stop();
} }
} }

2
engine/src/test/jme3test/audio/TestMusicPlayer.form
View File

@ -1,4 +1,4 @@
<?xml version="1.1" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.3" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JFrameFormInfo"> <Form version="1.3" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
<Properties> <Properties>

2
engine/src/test/jme3test/audio/TestMusicPlayer.java
View File

@ -35,7 +35,7 @@ package jme3test.audio;
import com.jme3.asset.AssetInfo; import com.jme3.asset.AssetInfo;
import com.jme3.asset.AssetLoader; import com.jme3.asset.AssetLoader;
import com.jme3.audio.*; import com.jme3.audio.*;
import com.jme3.audio.AudioNode.Status; import com.jme3.audio.AudioSource.Status;
import com.jme3.audio.plugins.OGGLoader; import com.jme3.audio.plugins.OGGLoader;
import com.jme3.audio.plugins.WAVLoader; import com.jme3.audio.plugins.WAVLoader;
import com.jme3.system.AppSettings; import com.jme3.system.AppSettings;

3
engine/src/test/jme3test/audio/TestOgg.java
View File

@ -34,6 +34,7 @@ package jme3test.audio;
import com.jme3.app.SimpleApplication; import com.jme3.app.SimpleApplication;
import com.jme3.audio.AudioNode; import com.jme3.audio.AudioNode;
import com.jme3.audio.AudioSource;
import com.jme3.audio.LowPassFilter; import com.jme3.audio.LowPassFilter;
public class TestOgg extends SimpleApplication { public class TestOgg extends SimpleApplication {
@ -54,7 +55,7 @@ public class TestOgg extends SimpleApplication {
@Override @Override
public void simpleUpdate(float tpf){ public void simpleUpdate(float tpf){
if (audioSource.getStatus() != AudioNode.Status.Playing){ if (audioSource.getStatus() != AudioSource.Status.Playing){
audioRenderer.deleteAudioData(audioSource.getAudioData()); audioRenderer.deleteAudioData(audioSource.getAudioData());
System.out.println("Playing with low pass filter"); System.out.println("Playing with low pass filter");