diff --git a/cpp/wiiuse/src/speaker.c b/cpp/wiiuse/src/speaker.c
index b7c1328..4aa589f 100644
--- a/cpp/wiiuse/src/speaker.c
+++ b/cpp/wiiuse/src/speaker.c
@@ -56,14 +56,13 @@ void wiiuse_speaker_volume(struct wiimote_t* wm, double vol) {
 }
 
 void wiiuse_speaker_config(struct wiimote_t* wm) {
-	byte cfg[7] = {wm->speaker.format, 0x00, 0x00, wm->speaker.rate, wm->speaker.vol, 0x00, 0x00};
+	byte cfg[7] = {0x00, wm->speaker.format, 15, 25, wm->speaker.vol, 0x00, 0x00};
 	wiiuse_write_data(wm, WM_REG_SPEAKER, cfg, 7);
 }
 
-void wiiuse_speaker_data(struct wiimote_t* wm, byte* data) {
-	/* Todo: add data length dynamically */
-	//byte buf[21];
-	//WIIUSE_DEBUG("data length %d", sizeof(buf) / sizeof(byte));
-	//memcpy(buf, data, 21);
-	wiiuse_send(wm, WM_CMD_STREAM_DATA, data, 21);
+void wiiuse_speaker_data(struct wiimote_t* wm, byte* data, int len) {
+	byte buf[21] = {0x00};
+	buf[0] = len << 3;
+	memcpy(buf + 1, data, len);
+	wiiuse_send(wm, WM_CMD_STREAM_DATA, buf, 21);
 }
diff --git a/cpp/wiiuse/src/speaker.h b/cpp/wiiuse/src/speaker.h
index ee77b1a..a8bed66 100644
--- a/cpp/wiiuse/src/speaker.h
+++ b/cpp/wiiuse/src/speaker.h
@@ -1,5 +1,7 @@
 #include "wiiuse.h"
 
+#define MIN(x,y) ((x) < (y) ? (x) : (y))
+
 #define WIIMOTE_GET_RUMBLE(wm) 				(WIIMOTE_IS_SET(wm, WIIMOTE_STATE_RUMBLE) ? 0x01 : 0x00)
 #define WIIMOTE_GET_SPEAKER_MAX_VOLUME(wm)	(wm->speaker.format == 0x00 ? 0x40 : 0xff)
 
diff --git a/cpp/wiiuse/src/wiiuse.h b/cpp/wiiuse/src/wiiuse.h
index 7caecfa..469142d 100644
--- a/cpp/wiiuse/src/wiiuse.h
+++ b/cpp/wiiuse/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/cpp/wiiusej/lib/wiiuse.lib b/cpp/wiiusej/lib/wiiuse.lib
index 40b27b9..c89e86e 100644
Binary files a/cpp/wiiusej/lib/wiiuse.lib and b/cpp/wiiusej/lib/wiiuse.lib differ
diff --git a/cpp/wiiusej/src/wiiuse.h b/cpp/wiiusej/src/wiiuse.h
index 7caecfa..469142d 100644
--- a/cpp/wiiusej/src/wiiuse.h
+++ b/cpp/wiiusej/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/cpp/wiiusej/src/wiiusej_WiiUseApi.c b/cpp/wiiusej/src/wiiusej_WiiUseApi.c
index 83b48e0..e4a213a 100644
--- a/cpp/wiiusej/src/wiiusej_WiiUseApi.c
+++ b/cpp/wiiusej/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);
 
 }