From b3d6e7156979af1b937798bf1713b05a36a8a194 Mon Sep 17 00:00:00 2001
From: Rik Veenboer <rik.veenboer@gmail.com>
Date: Sun, 24 Jul 2011 13:41:02 +0000
Subject: [PATCH] Speaker functionaliteit verbeterd. Commentaar toegevoegd bij
 mogelijke verbeterpunten.

---
 lib/wiiuse.lib          | Bin 27590 -> 27590 bytes
 src/wiiuse.h            |   2 +-
 src/wiiusej_WiiUseApi.c |   6 +++---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/wiiuse.lib b/lib/wiiuse.lib
index 40b27b9ea2f6ec186d641df42c47fca3510a5ea4..c89e86eef25f8b08df7eb9a9e55c2ad92ea2dd8f 100644
GIT binary patch
delta 674
zcmX?ho$=Up#tE`4#-=8Q8x?Cf!HmrdIn5ZstjP;G#W#QAN`&$b+DdHB=P_V{$bopf
z`Ly6X$<0iHmQdcuXvxX%Tz+j1646BHo%~+>_vT4rjtG&>@5OBp`X|qk`L)?e+7>P^
zxp|I^Ib2?1^LsgjY6-AuPD;q8%~y6pQvFxe1J08Kn;oNxFdL$OgEo@>$@>j|Z|2bR
zgxJ6Npsg_D<_rUCxN{^n?>BUT8!53_-Xs8t*KL-8#N)S2L*h-e)`9SVhWa7IC;wIb
zy;;rC7s-ZxCzuz2LAd#yi!ws>W?gqZBwo2EvPmGP-|>MueKIg=CYO8u-fZI^3^f}T
zA<F_`5dsr=77P;s>C$xvx+u&T8U!Dsfk99Zp^9)IIMmlfK|^ix$7l<LlfarC;!!kr
iB_cFSZa$NQ9G&v1$Vn+X9g&nIChz9^y?ITR6e9o-&fP))

delta 674
zcmX?ho$=Up#tE`4MwSMa8x?Cf!HmrdIn5ZstjP;G#W#QAN`&$b+DdHB=P_V{$bopf
z`Ly6X$<0iHmQdcuXvxX%Tz+j1646BHo%~+>_vT4rjtG&>@5OBp`X|qk`L)?e+7>P^
zxp|I^Ib2?1^LsgjY6-AuPD;q8%~y6pQvFxe1J08Kn;oNxFdL$OgEo@>$@>j|Z|2bR
zgxJ6Npsg_D<_rUCxN{^n?>BUT8!53_-Xs8t*KL-8#N)S2L*h-e)`9SVhWa7IC;wIb
zy;;rC7s-ZxCzuz2LAd#yi!ws>W?gqZBwo2EvPmGP-|>MueKIg=CYO8u-fZI^3^f}T
zA<F_`5dsr=77P;s>C$xvx+u&T8U!Dsfk99Zp^9)IIMmlfK|^ix$7l<LlfarC;!!kr
iB_cFSZa$NQ9G&v1$Vn+X9g&nIChz9^y?ITR6e9qxPu_L_

diff --git a/src/wiiuse.h b/src/wiiuse.h
index 7caecfa..469142d 100644
--- a/src/wiiuse.h
+++ b/src/wiiuse.h
@@ -665,7 +665,7 @@ WIIUSE_EXPORT extern void wiiuse_speaker_format(struct wiimote_t* wm, byte forma
 WIIUSE_EXPORT extern void wiiuse_speaker_volume(struct wiimote_t* wm, double vol);
 WIIUSE_EXPORT extern void wiiuse_speaker_rate(struct wiimote_t* wm, double freq);
 WIIUSE_EXPORT extern void wiiuse_speaker_config(struct wiimote_t* wm);
-WIIUSE_EXPORT extern void wiiuse_speaker_data(struct wiimote_t* wm, byte* data);
+WIIUSE_EXPORT extern void wiiuse_speaker_data(struct wiimote_t* wm, byte* data, int len);
 
 #ifdef __cplusplus
 }
diff --git a/src/wiiusej_WiiUseApi.c b/src/wiiusej_WiiUseApi.c
index 83b48e0..e4a213a 100644
--- a/src/wiiusej_WiiUseApi.c
+++ b/src/wiiusej_WiiUseApi.c
@@ -738,13 +738,13 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setSpeakerConfig(JNIEnv *env, jobj
 JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_streamSpeakerData(JNIEnv *env, jobject obj, jint id, jbyteArray jbArray) {
 	jbyte *jbData = (*env)->GetByteArrayElements(env, jbArray, JNI_FALSE);
 	/* Todo: Check for data loss by using signed vs unsigned bytes */
-	/*int length = (int) (*env)->GetArrayLength(env, jbArray);
-	byte data[length];
+	int len = (int) (*env)->GetArrayLength(env, jbArray);
+	/*byte data[length];
 	int i = 0;
 	for (i = 0; i < length; ++i) {
 		data[i] = (byte) jbData[i];
 	}*/
-	wiiuse_speaker_data(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), (byte*) jbData);
+	wiiuse_speaker_data(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), (byte*) jbData, len);
 	(*env)->ReleaseByteArrayElements(env, jbArray, jbData, JNI_FALSE);
 
 }