PCM : fix audio slicing

exch-bms2 · Mar 6, 2018 · 77a6385 · 77a6385
1 parent fa67604
commit 77a6385
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/bms/player/beatoraja/audio/AbstractAudioDriver.java b/src/bms/player/beatoraja/audio/AbstractAudioDriver.java
@@ -484,7 +484,7 @@ protected T load(AudioKey key) {
 					path = key.path;
 					try {
 						final PCM slicewav = wav.slice(key.start, key.duration);
-						return getKeySound(slicewav);
+						return slicewav != null ? getKeySound(slicewav) : null;
 						// System.out.println("WAV slicing - Name:"
 						// + name + " ID:" + note.getWav() +
 						// " start:" + note.getStarttime() +

diff --git a/src/bms/player/beatoraja/audio/PCM.java b/src/bms/player/beatoraja/audio/PCM.java
@@ -334,8 +334,12 @@ public PCM slice(long starttime, long duration) {
 //		}
 
 		pcm.sample = new short[length];
-		System.arraycopy(this.sample, start, pcm.sample, 0, length);
-		return pcm;
+//		System.out.println(this.sample.length + " , " + start + ", " + pcm.sample.length + " , 0, " + length);
+		if(length > 0) {
+			System.arraycopy(this.sample, start, pcm.sample, 0, length);			
+			return pcm;
+		}
+		return null;
 	}
 
 	public InputStream getInputStream() {