diff --git a/.cproject b/.cproject
index e87ebf0..75d42b3 100644
--- a/.cproject
+++ b/.cproject
@@ -6,6 +6,7 @@
 		<cconfiguration id="cdt.managedbuild.config.gnu.mingw.exe.debug.1519811348">
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.exe.debug.1519811348" moduleId="org.eclipse.cdt.core.settings" name="Debug">
 				<macros>
+					<stringMacro name="target" type="VALUE_TEXT" value="wiiusej"/>
 					<stringMacro name="jdk" type="VALUE_PATH_DIR" value="C:\Program Files (x86)\Java\jdk1.6.0_26"/>
 				</macros>
 				<externalSettings>
@@ -23,7 +24,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="dll" artifactName="wiiusej" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.mingw.exe.debug.1519811348" name="Debug" parent="cdt.managedbuild.config.gnu.mingw.exe.debug" postbuildStep="./copy.bat">
+				<configuration artifactExtension="dll" artifactName="${target}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.mingw.exe.debug.1519811348" name="Debug" parent="cdt.managedbuild.config.gnu.mingw.exe.debug" postbuildStep="./copy.bat">
 					<folderInfo id="cdt.managedbuild.config.gnu.mingw.exe.debug.1519811348." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.exe.debug.895681267" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.exe.debug">
 							<targetPlatform id="cdt.managedbuild.target.gnu.platform.mingw.exe.debug.1030487368" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.exe.debug"/>
@@ -323,6 +324,7 @@
 		<cconfiguration id="cdt.managedbuild.config.gnu.mingw.exe.release.905874158">
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.exe.release.905874158" moduleId="org.eclipse.cdt.core.settings" name="Release">
 				<macros>
+					<stringMacro name="target" type="VALUE_TEXT" value="wiiusej"/>
 					<stringMacro name="jdk" type="VALUE_PATH_DIR" value="C:\Program Files (x86)\Java\jdk1.6.0_26"/>
 				</macros>
 				<externalSettings>
@@ -340,7 +342,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="dll" artifactName="wiiusej" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.mingw.exe.release.905874158" name="Release" parent="cdt.managedbuild.config.gnu.mingw.exe.release" postbuildStep="./copy.bat">
+				<configuration artifactExtension="dll" artifactName="${target}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.mingw.exe.release.905874158" name="Release" parent="cdt.managedbuild.config.gnu.mingw.exe.release" postbuildStep="./copy.bat">
 					<folderInfo id="cdt.managedbuild.config.gnu.mingw.exe.release.905874158." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.exe.release.1641725860" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.exe.release">
 							<targetPlatform id="cdt.managedbuild.target.gnu.platform.mingw.exe.release.209964646" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.exe.release"/>
@@ -371,6 +373,7 @@
 									<listOptionValue builtIn="false" value="wiiuse"/>
 								</option>
 								<option id="gnu.c.link.option.ldflags.1604848740" name="Linker flags" superClass="gnu.c.link.option.ldflags" value="-Wl,--kill-at" valueType="string"/>
+								<option id="gnu.c.link.option.soname.2103161002" name="Shared object name (-Wl,-soname=)" superClass="gnu.c.link.option.soname" value="" valueType="string"/>
 								<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.657886763" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
diff --git a/.project b/.project
index 90c222a..13c977a 100644
--- a/.project
+++ b/.project
@@ -27,7 +27,7 @@
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.buildLocation</key>
-					<value>${workspace_loc:/WiiuseJ/Debug}</value>
+					<value>${workspace_loc:/WiiuseJ/Release}</value>
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.contents</key>
diff --git a/lib/wiiuse.dll b/lib/wiiuse.dll
deleted file mode 100644
index d2a4528..0000000
Binary files a/lib/wiiuse.dll and /dev/null differ
diff --git a/lib/wiiuse.lib b/lib/wiiuse.lib
new file mode 100644
index 0000000..40b27b9
Binary files /dev/null and b/lib/wiiuse.lib differ
diff --git a/src/speaker.h b/src/speaker.h
deleted file mode 100644
index 8b8267d..0000000
--- a/src/speaker.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "wiiuse.h"
-
-#define WIIMOTE_GET_RUMBLE(wm) (WIIMOTE_IS_SET(wm, WIIMOTE_STATE_RUMBLE) ? 0x01 : 0x00)
-
-#define WM_CMD_SPEAKER_ENABLE 0x14
-#define WM_CMD_STREAM_DATA    0x18
-#define WM_CMD_SPEAKER_MUTE   0x19
-
-#define WM_CTRL_STATUS_BYTE1_SPEAKER_MUTE 0x04
-
-#define WM_REG_SPEAKER 0x04a20001
-
-static byte cfg[9] = {0x00, 0x00, 0x00, 0xdd, 0x40, 0x00, 0x00, 0x01, 0x01};
-
-WIIUSE_EXPORT extern void wiiuse_speaker_enable(struct wiimote_t* wm);
-WIIUSE_EXPORT extern void wiiuse_speaker_disable(struct wiimote_t* wm);
-WIIUSE_EXPORT extern void wiiuse_speaker_mute(struct wiimote_t* wm);
-WIIUSE_EXPORT extern void wiiuse_speaker_unmute(struct wiimote_t* wm);
-WIIUSE_EXPORT extern void wiiuse_speaker_activate(struct wiimote_t* wm);
-WIIUSE_EXPORT extern void wiiuse_speaker_deactivate(struct wiimote_t* wm);
-WIIUSE_EXPORT extern void wiiuse_speaker_volume(struct wiimote_t* wm, byte vol);
-WIIUSE_EXPORT extern void wiiuse_speaker_frequency(struct wiimote_t* wm, unsigned short freq);
-WIIUSE_EXPORT extern void wiiuse_speaker_data(struct wiimote_t* wm, byte* data);
\ No newline at end of file
diff --git a/src/wiiuse.h b/src/wiiuse.h
index 9dff81c..7caecfa 100644
--- a/src/wiiuse.h
+++ b/src/wiiuse.h
@@ -371,6 +371,16 @@ typedef struct ir_t {
 } ir_t;
 
 
+/**
+ *	@struct speaker_t
+ */
+typedef struct speaker_t {
+	byte format;
+	byte vol;
+	byte rate;
+} speaker_t;
+
+
 /**
  *	@struct joystick_t
  *	@brief Joystick calibration structure.
@@ -563,6 +573,7 @@ typedef struct wiimote_t {
 	WCONST struct gforce_t gforce;			/**< current gravity forces on each axis	*/
 
 	WCONST struct ir_t ir;					/**< IR data								*/
+	WCONST struct speaker_t speaker;		/**< speaker								*/
 
 	WCONST unsigned short btns;				/**< what buttons have just been pressed	*/
 	WCONST unsigned short btns_held;		/**< what buttons are being held down		*/
@@ -643,6 +654,18 @@ WIIUSE_EXPORT extern void wiiuse_set_ir_sensitivity(struct wiimote_t* wm, int le
 WIIUSE_EXPORT extern void wiiuse_set_nunchuk_orient_threshold(struct wiimote_t* wm, float threshold);
 WIIUSE_EXPORT extern void wiiuse_set_nunchuk_accel_threshold(struct wiimote_t* wm, int threshold);
 
+/* speaker.c */
+WIIUSE_EXPORT extern void wiiuse_speaker_enable(struct wiimote_t* wm);
+WIIUSE_EXPORT extern void wiiuse_speaker_disable(struct wiimote_t* wm);
+WIIUSE_EXPORT extern void wiiuse_speaker_mute(struct wiimote_t* wm);
+WIIUSE_EXPORT extern void wiiuse_speaker_unmute(struct wiimote_t* wm);
+WIIUSE_EXPORT extern void wiiuse_speaker_activate(struct wiimote_t* wm);
+WIIUSE_EXPORT extern void wiiuse_speaker_deactivate(struct wiimote_t* wm);
+WIIUSE_EXPORT extern void wiiuse_speaker_format(struct wiimote_t* wm, byte format);
+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);
 
 #ifdef __cplusplus
 }
diff --git a/src/wiiusej_Speaker.h b/src/wiiusej_Speaker.h
deleted file mode 100644
index 0da6686..0000000
--- a/src/wiiusej_Speaker.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class wiiusej_WiiUseApi */
-
-#ifndef _Included_wiiusej_WiiUseApi
-#define _Included_wiiusej_WiiUseApi
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     wiiusej_WiiUseApi
- * Method:    activateSpeaker
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_activateSpeaker
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     wiiusej_WiiUseApi
- * Method:    deactivateSpeaker
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_deactivateSpeaker
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     wiiusej_WiiUseApi
- * Method:    setSpeakerVolume
- * Signature: (IS)V
- */
-JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setSpeakerVolume
-  (JNIEnv *, jobject, jint, jshort);
-
-/*
- * Class:     wiiusej_WiiUseApi
- * Method:    setSpeakerFrequency
- * Signature: (II)V
- */
-JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setSpeakerFrequency
-  (JNIEnv *, jobject, jint, jint);
-
-/*
- * Class:     wiiusej_WiiUseApi
- * Method:    streamSpeakerData
- * Signature: (I[S)V
- */
-JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_streamSpeakerData
-  (JNIEnv *, jobject, jint, jshortArray);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/wiiusej_WiiUseApi.c b/src/wiiusej_WiiUseApi.c
index a13e4e2..83b48e0 100644
--- a/src/wiiusej_WiiUseApi.c
+++ b/src/wiiusej_WiiUseApi.c
@@ -16,8 +16,6 @@
  */
 #ifndef WIN32
 #include <unistd.h>
-#else
-
 #endif
 
 #include "wiiusej_WiiUseApi.h"
@@ -32,14 +30,14 @@
 #define WIIMOTE_STATE_CONNECTED			0x0008
 #define WIIMOTE_IS_SET(wm, s)			((wm->state & (s)) == (s))
 #define WIIMOTE_IS_FLAG_SET(wm, s)		((wm->flags & (s)) == (s))
-#define WIIUSE_GET_IR_SENSITIVITY_CORRECTED(wm, lvl)									\
+#define WIIUSE_GET_IR_SENSITIVITY_CORRECTED(wm, lvl)					\
 			do {														\
 				if ((wm->state & 0x0200) == 0x0200) 		*lvl = 1;	\
 				else if ((wm->state & 0x0400) == 0x0400) 	*lvl = 2;	\
 				else if ((wm->state & 0x0800) == 0x0800) 	*lvl = 3;	\
 				else if ((wm->state & 0x1000) == 0x1000) 	*lvl = 4;	\
 				else if ((wm->state & 0x2000) == 0x2000) 	*lvl = 5;	\
-				else									*lvl = 0;		\
+				else										*lvl = 0;	\
 			} while (0)
 
 /********************* VARIABLES DECLARATIONS *****************************/
@@ -407,9 +405,6 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_specialPoll
 	short leds = 0;
 	jclass cls = (*env)->GetObjectClass(env, gath);
 	jmethodID mid;
-	struct nunchuk_t* nc;
-	struct guitar_hero_3_t* gh;
-	struct classic_ctrl_t* cl;
 
 	//printf("avant poll, nbMaxwiimotes : %i \n",nbMaxWiimotes);
 	if (wiiuse_poll(wiimotes, nbMaxWiimotes)) {
@@ -499,7 +494,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_specialPoll
 						if (mid == 0) {
 							return;
 						}
-						nc = (nunchuk_t*)&wiimotes[i]->exp.nunchuk;
+						struct nunchuk_t* nc = (nunchuk_t*)&wiimotes[i]->exp.nunchuk;
 
 						(*env)->CallVoidMethod(env, gath, mid,
 								/* buttons */
@@ -524,7 +519,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_specialPoll
 						if (mid == 0) {
 							return;
 						}
-						gh = (guitar_hero_3_t*)&wiimotes[i]->exp.gh3;
+						struct guitar_hero_3_t* gh = (guitar_hero_3_t*)&wiimotes[i]->exp.gh3;
 
 						(*env)->CallVoidMethod(env, gath, mid,
 								/* buttons */
@@ -543,7 +538,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_specialPoll
 						if (mid == 0) {
 							return;
 						}
-						cl = (classic_ctrl_t*)&wiimotes[i]->exp.classic;
+						struct classic_ctrl_t* cl = (classic_ctrl_t*)&wiimotes[i]->exp.classic;
 
 						(*env)->CallVoidMethod(env, gath, mid,
 								/* buttons */
@@ -687,65 +682,69 @@ JNIEXPORT jshortArray JNICALL Java_wiiusej_WiiUseApi_getCalibration
 	return jShorts;
 }*/
 
-/* Speaker */
-#include "speaker.h"
-/*
-void test(struct wiimote_t* wm) {
-	int i;
-	byte data[20] = {
-		0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,
-		0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3};
-	wiiuse_speaker_activate(wm);
-	for (i = 0; i < 50; ++i) {
-		wiiuse_speaker_data(wm, data);
-	}
-	wiiuse_speaker_deactivate(wm);
-}*/
+/**
+ *  Speaker
+ */
+JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_enableSpeaker(JNIEnv *env, jobject obj, jint id) {
+	wiiuse_speaker_enable(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id));
+}
 
-JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_activateSpeaker
-(JNIEnv *env, jobject obj, jint id) {
+JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_disableSpeaker(JNIEnv *env, jobject obj, jint id){
+	wiiuse_speaker_disable(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id));
+}
+
+JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_muteSpeaker(JNIEnv *env, jobject obj, jint id) {
+	wiiuse_speaker_mute(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id));
+}
+
+JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_unmuteSpeaker(JNIEnv *env, jobject obj, jint id) {
+	wiiuse_speaker_unmute(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id));
+}
+
+JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_activateSpeaker(JNIEnv *env, jobject obj, jint id) {
 	wiiuse_speaker_activate(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id));
 }
 
-JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_deactivateSpeaker
-(JNIEnv *env, jobject obj, jint id) {
+JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_deactivateSpeaker(JNIEnv *env, jobject obj, jint id) {
 	wiiuse_speaker_deactivate(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id));
 }
-/*
-void testen(struct wiimote_t* wm, unsigned short freq) {
-	if (freq > 0x0000) {
-		cfg[2] = freq & 0x00ff;
-		cfg[3] = (freq & 0xff00) >> 8;
-	}
-	printf("unaangepast %d\n", freq);
-	printf("speaker 0x%02x%02x\n", cfg[2], cfg[3]);
-	fflush(stdout);
-	wiiuse_write_data(wm, WM_REG_SPEAKER, cfg, 9);
-}*/
 
-
-JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setSpeakerFrequency
-(JNIEnv *env, jobject obj, jint id, jint freq) {
-	wiiuse_speaker_frequency(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), (unsigned short) freq);
-	//short a = ((short) freq) & 0xffff;
-	//printf("jni %d %d\n", freq, a);
-	//fflush(stdout);
-	//testen(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), (unsigned short) freq);
+JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setSpeakerFormat(JNIEnv *env, jobject obj, jint id, jbyte format) {
+	struct wiimote_t* wm = wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id);
+	wiiuse_speaker_config(wm);
+	wiiuse_speaker_format(wm, format);
 }
 
-JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setSpeakerVolume
-(JNIEnv *env, jobject obj, jint id, jshort vol) {
-	wiiuse_speaker_frequency(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), vol);
+JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setSpeakerRate(JNIEnv *env, jobject obj, jint id, jint rate) {
+	struct wiimote_t* wm = wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id);
+	wiiuse_speaker_rate(wm, rate);
+	wiiuse_speaker_config(wm);
 }
 
-JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_streamSpeakerData
-(JNIEnv *env, jobject obj, jint id, jshortArray sArray) {
+JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setSpeakerVolume(JNIEnv *env, jobject obj, jint id, jdouble vol) {
+	struct wiimote_t* wm = wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id);
+	wiiuse_speaker_volume(wm, vol);
+	wiiuse_speaker_config(wm);
+}
+
+JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setSpeakerConfig(JNIEnv *env, jobject obj, jint id, jbyte format, jint rate, jdouble vol) {
+	struct wiimote_t* wm = wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id);
+	wiiuse_speaker_format(wm, format);
+	wiiuse_speaker_rate(wm, rate);
+	wiiuse_speaker_volume(wm, vol);
+	wiiuse_speaker_config(wm);
+}
+
+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 i = 0;
-	jshort *jShorts = (*env)->GetShortArrayElements(env, sArray, JNI_FALSE);
-	byte data[sizeof(jShorts)];
-	for (i = 0; i < sizeof(jShorts); ++i) {
-		data[i] = (byte) jShorts[i];
-	}
-	wiiuse_speaker_data(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), data);
-	(*env)->ReleaseShortArrayElements(env, sArray, jShorts, JNI_FALSE);
+	for (i = 0; i < length; ++i) {
+		data[i] = (byte) jbData[i];
+	}*/
+	wiiuse_speaker_data(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), (byte*) jbData);
+	(*env)->ReleaseByteArrayElements(env, jbArray, jbData, JNI_FALSE);
+
 }
diff --git a/src/wiiusej_WiiUseApi.h b/src/wiiusej_WiiUseApi.h
index 29dde3f..e003a5a 100644
--- a/src/wiiusej_WiiUseApi.h
+++ b/src/wiiusej_WiiUseApi.h
@@ -273,12 +273,92 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_specialPoll
 
 /*
  * Class:     wiiusej_WiiUseApi
- * Method:    getCalibration
- * Signature: (I)[S
+ * Method:    enableSpeaker
+ * Signature: (I)V
  */
-JNIEXPORT jshortArray JNICALL Java_wiiusej_WiiUseApi_getCalibration
+JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_enableSpeaker
   (JNIEnv *, jobject, jint);
 
+/*
+ * Class:     wiiusej_WiiUseApi
+ * Method:    disableSpeaker
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_disableSpeaker
+  (JNIEnv *, jobject, jint);
+
+/*
+ * Class:     wiiusej_WiiUseApi
+ * Method:    muteSpeaker
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_muteSpeaker
+  (JNIEnv *, jobject, jint);
+
+/*
+ * Class:     wiiusej_WiiUseApi
+ * Method:    unmuteSpeaker
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_unmuteSpeaker
+  (JNIEnv *, jobject, jint);
+
+/*
+ * Class:     wiiusej_WiiUseApi
+ * Method:    activateSpeaker
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_activateSpeaker
+  (JNIEnv *, jobject, jint);
+
+/*
+ * Class:     wiiusej_WiiUseApi
+ * Method:    deactivateSpeaker
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_deactivateSpeaker
+  (JNIEnv *, jobject, jint);
+
+/*
+ * Class:     wiiusej_WiiUseApi
+ * Method:    setSpeakerFormat
+ * Signature: (IB)V
+ */
+JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setSpeakerFormat
+  (JNIEnv *, jobject, jint, jbyte);
+
+/*
+ * Class:     wiiusej_WiiUseApi
+ * Method:    setSpeakerRate
+ * Signature: (II)V
+ */
+JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setSpeakerRate
+  (JNIEnv *, jobject, jint, jint);
+
+/*
+ * Class:     wiiusej_WiiUseApi
+ * Method:    setSpeakerVolume
+ * Signature: (ID)V
+ */
+JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setSpeakerVolume
+  (JNIEnv *, jobject, jint, jdouble);
+
+/*
+ * Class:     wiiusej_WiiUseApi
+ * Method:    setSpeakerConfig
+ * Signature: (IBID)V
+ */
+JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setSpeakerConfig
+  (JNIEnv *, jobject, jint, jbyte, jint, jdouble);
+
+/*
+ * Class:     wiiusej_WiiUseApi
+ * Method:    streamSpeakerData
+ * Signature: (I[B)V
+ */
+JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_streamSpeakerData
+  (JNIEnv *, jobject, jint, jbyteArray);
+
 #ifdef __cplusplus
 }
 #endif