From bd8c575826319b6535999ac14115a08e98641400 Mon Sep 17 00:00:00 2001
From: Rik Veenboer <rik.veenboer@gmail.com>
Date: Sat, 23 Jul 2011 13:57:30 +0000
Subject: [PATCH] Project settings gecorrigeerd en basis voor wiimote speaker
 functionaliteit toegevoegd.

---
 cpp/wiiuse/.cproject                          |  24 +++-
 .../org.eclipse.cdt.managedbuilder.core.prefs |   2 +-
 cpp/wiiuse/Debug/copy.bat                     |   3 +-
 cpp/wiiuse/Release/copy.bat                   |   3 +-
 cpp/wiiuse/src/definitions.h                  |   3 +-
 cpp/wiiuse/src/events.c                       |   7 +-
 cpp/wiiuse/src/speaker.c                      |  55 ++++----
 cpp/wiiuse/src/speaker.h                      |  17 +--
 cpp/wiiuse/src/wiiuse.c                       |  14 ++-
 cpp/wiiuse/src/wiiuse.h                       |  23 ++++
 cpp/wiiusej/.cproject                         |   7 +-
 cpp/wiiusej/.project                          |   2 +-
 cpp/wiiusej/lib/wiiuse.dll                    | Bin 55364 -> 0 bytes
 cpp/wiiusej/lib/wiiuse.lib                    | Bin 0 -> 27590 bytes
 cpp/wiiusej/src/speaker.h                     |  23 ----
 cpp/wiiusej/src/wiiuse.h                      |  23 ++++
 cpp/wiiusej/src/wiiusej_Speaker.h             |  53 --------
 cpp/wiiusej/src/wiiusej_WiiUseApi.c           | 117 +++++++++---------
 cpp/wiiusej/src/wiiusej_WiiUseApi.h           |  86 ++++++++++++-
 19 files changed, 260 insertions(+), 202 deletions(-)
 delete mode 100644 cpp/wiiusej/lib/wiiuse.dll
 create mode 100644 cpp/wiiusej/lib/wiiuse.lib
 delete mode 100644 cpp/wiiusej/src/speaker.h
 delete mode 100644 cpp/wiiusej/src/wiiusej_Speaker.h

diff --git a/cpp/wiiuse/.cproject b/cpp/wiiuse/.cproject
index 8cc7d25..68c763a 100644
--- a/cpp/wiiuse/.cproject
+++ b/cpp/wiiuse/.cproject
@@ -6,6 +6,7 @@
 		<cconfiguration id="cdt.managedbuild.config.gnu.mingw.so.debug.1116435574">
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.so.debug.1116435574" moduleId="org.eclipse.cdt.core.settings" name="Debug">
 				<macros>
+					<stringMacro name="target" type="VALUE_TEXT" value="wiiuse"/>
 					<stringMacro name="jdk" type="VALUE_PATH_DIR" value="C:\Program Files (x86)\Java\jdk1.6.0_26"/>
 				</macros>
 				<externalSettings>
@@ -23,24 +24,26 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="dll" artifactName="wiiuse" 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.so.debug.1116435574" name="Debug" parent="cdt.managedbuild.config.gnu.mingw.so.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.so.debug.1116435574" name="Debug" parent="cdt.managedbuild.config.gnu.mingw.so.debug" postbuildStep="./copy.bat">
 					<folderInfo id="cdt.managedbuild.config.gnu.mingw.so.debug.1116435574." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.so.debug.540248766" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.so.debug">
 							<targetPlatform id="cdt.managedbuild.target.gnu.platform.mingw.so.debug.763602244" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.so.debug"/>
 							<builder buildPath="${workspace_loc:/Wiiuse/Debug}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.1458906080" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>
-							<tool id="cdt.managedbuild.tool.gnu.assembler.mingw.so.debug.1226602461" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.so.debug">
+							<tool command="as" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG}${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" id="cdt.managedbuild.tool.gnu.assembler.mingw.so.debug.1226602461" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.so.debug">
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.131768531" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.archiver.mingw.base.1802027" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.mingw.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.c.compiler.mingw.so.debug.1760584596" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.so.debug">
-								<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.mingw.so.debug.option.optimization.level.655662583" name="Optimization Level" superClass="gnu.c.compiler.mingw.so.debug.option.optimization.level" valueType="enumerated"/>
+								<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.mingw.so.debug.option.optimization.level.655662583" name="Optimization Level" superClass="gnu.c.compiler.mingw.so.debug.option.optimization.level" value="gnu.c.optimization.level.most" valueType="enumerated"/>
 								<option id="gnu.c.compiler.mingw.so.debug.option.debugging.level.277209318" name="Debug Level" superClass="gnu.c.compiler.mingw.so.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
 								<option id="gnu.c.compiler.option.include.paths.203394821" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
 								</option>
-								<option id="gnu.c.compiler.option.preprocessor.def.symbols.993291047" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols">
+								<option id="gnu.c.compiler.option.preprocessor.def.symbols.993291047" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="WIIUSE_COMPILE_LIB"/>
+									<listOptionValue builtIn="false" value="WITH_WIIUSE_DEBUG"/>
 								</option>
+								<option id="gnu.c.compiler.option.misc.other.650784187" name="Other flags" superClass="gnu.c.compiler.option.misc.other" value="-c -fmessage-length=0" valueType="string"/>
 								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.2123798748" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.c.linker.mingw.so.debug.2136680964" name="MinGW C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.so.debug">
@@ -50,10 +53,13 @@
 									<listOptionValue builtIn="false" value="Ws2_32"/>
 									<listOptionValue builtIn="false" value="Setupapi"/>
 								</option>
+								<option id="gnu.c.link.option.ldflags.1119328813" name="Linker flags" superClass="gnu.c.link.option.ldflags" value="" valueType="string"/>
+								<option id="gnu.c.link.option.implname.339020882" name="Import Library name (-Wl,--out-implib=)" superClass="gnu.c.link.option.implname" value="${target}.lib" valueType="string"/>
 								<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.119816846" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
+								<outputType id="cdt.managedbuild.tool.gnu.c.linker.mingw.so.debug.output.556110947" outputPrefix="" superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.so.debug.output"/>
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.so.debug.1884243654" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.so.debug">
 								<option id="gnu.cpp.compiler.mingw.so.debug.option.optimization.level.1243107261" name="Optimization Level" superClass="gnu.cpp.compiler.mingw.so.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
@@ -820,6 +826,10 @@
 		</cconfiguration>
 		<cconfiguration id="cdt.managedbuild.config.gnu.mingw.so.release.1074641339">
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.so.release.1074641339" moduleId="org.eclipse.cdt.core.settings" name="Release">
+				<macros>
+					<stringMacro name="target" type="VALUE_TEXT" value="wiiusegrapje"/>
+					<stringMacro name="jdk" type="VALUE_PATH_DIR" value="C:\Program Files (x86)\Java\jdk1.6.0_26"/>
+				</macros>
 				<externalSettings>
 					<externalSetting>
 						<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/Wiiuse"/>
@@ -835,7 +845,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="dll" artifactName="wiiuse" 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.so.release.1074641339" name="Release" parent="cdt.managedbuild.config.gnu.mingw.so.release" postbuildStep="./copy.bat" prebuildStep="">
+				<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.so.release.1074641339" name="Release" parent="cdt.managedbuild.config.gnu.mingw.so.release" postbuildStep="./copy.bat" prebuildStep="">
 					<folderInfo id="cdt.managedbuild.config.gnu.mingw.so.release.1074641339." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.so.release.1012515545" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.so.release">
 							<targetPlatform id="cdt.managedbuild.target.gnu.platform.mingw.so.release.834409978" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.so.release"/>
@@ -847,7 +857,7 @@
 								<outputType id="cdt.managedbuild.tool.gnu.archiver.output.1238104425" outputPrefix="" superClass="cdt.managedbuild.tool.gnu.archiver.output"/>
 							</tool>
 							<tool command="gcc" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG}${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" id="cdt.managedbuild.tool.gnu.c.compiler.mingw.so.release.982483224" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.so.release">
-								<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.mingw.so.release.option.optimization.level.508635058" name="Optimization Level" superClass="gnu.c.compiler.mingw.so.release.option.optimization.level" valueType="enumerated"/>
+								<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.mingw.so.release.option.optimization.level.508635058" name="Optimization Level" superClass="gnu.c.compiler.mingw.so.release.option.optimization.level" value="gnu.c.optimization.level.most" valueType="enumerated"/>
 								<option id="gnu.c.compiler.mingw.so.release.option.debugging.level.818549324" name="Debug Level" superClass="gnu.c.compiler.mingw.so.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
 								<option id="gnu.c.compiler.option.include.paths.489733690" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
@@ -865,6 +875,8 @@
 									<listOptionValue builtIn="false" value="Ws2_32"/>
 									<listOptionValue builtIn="false" value="Setupapi"/>
 								</option>
+								<option id="gnu.c.link.option.ldflags.1077843674" name="Linker flags" superClass="gnu.c.link.option.ldflags" value="" valueType="string"/>
+								<option id="gnu.c.link.option.implname.1912270887" name="Import Library name (-Wl,--out-implib=)" superClass="gnu.c.link.option.implname" value="${target}.lib" valueType="string"/>
 								<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.1240500014" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
diff --git a/cpp/wiiuse/.settings/org.eclipse.cdt.managedbuilder.core.prefs b/cpp/wiiuse/.settings/org.eclipse.cdt.managedbuilder.core.prefs
index 18012c8..c7c1e64 100644
--- a/cpp/wiiuse/.settings/org.eclipse.cdt.managedbuilder.core.prefs
+++ b/cpp/wiiuse/.settings/org.eclipse.cdt.managedbuilder.core.prefs
@@ -1,4 +1,4 @@
-#Wed Jul 20 20:10:42 CEST 2011
+#Wed Jul 20 23:54:48 CEST 2011
 eclipse.preferences.version=1
 environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.so.debug.1116435574/CPATH/delimiter=;
 environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.so.debug.1116435574/CPATH/operation=remove
diff --git a/cpp/wiiuse/Debug/copy.bat b/cpp/wiiuse/Debug/copy.bat
index 16132fa..bb541cd 100644
--- a/cpp/wiiuse/Debug/copy.bat
+++ b/cpp/wiiuse/Debug/copy.bat
@@ -1,4 +1,3 @@
 copy ..\src\wiiuse.h ..\..\WiiuseJ\src\wiiuse.h
-copy ..\src\speaker.h ..\..\WiiuseJ\src\speaker.h
-copy wiiuse.dll ..\..\WiiuseJ\lib\wiiuse.dll
+copy wiiuse.lib ..\..\WiiuseJ\lib\wiiuse.lib
 copy wiiuse.dll ..\..\Mimis\wiiuse.dll
\ No newline at end of file
diff --git a/cpp/wiiuse/Release/copy.bat b/cpp/wiiuse/Release/copy.bat
index 16132fa..bb541cd 100644
--- a/cpp/wiiuse/Release/copy.bat
+++ b/cpp/wiiuse/Release/copy.bat
@@ -1,4 +1,3 @@
 copy ..\src\wiiuse.h ..\..\WiiuseJ\src\wiiuse.h
-copy ..\src\speaker.h ..\..\WiiuseJ\src\speaker.h
-copy wiiuse.dll ..\..\WiiuseJ\lib\wiiuse.dll
+copy wiiuse.lib ..\..\WiiuseJ\lib\wiiuse.lib
 copy wiiuse.dll ..\..\Mimis\wiiuse.dll
\ No newline at end of file
diff --git a/cpp/wiiuse/src/definitions.h b/cpp/wiiuse/src/definitions.h
index 9de1158..8e23ed7 100644
--- a/cpp/wiiuse/src/definitions.h
+++ b/cpp/wiiuse/src/definitions.h
@@ -39,8 +39,6 @@
 
 #define WIIMOTE_PI			3.14159265f
 
-//#define WITH_WIIUSE_DEBUG
-
 /* Error output macros */
 #define WIIUSE_ERROR(fmt, ...)		//fprintf(stderr, "[ERROR] " fmt "\n", ##__VA_ARGS__)
 
@@ -57,6 +55,7 @@
 												int i = strlen(file) - 1;														\
 												for (; i && (file[i] != '\\'); --i);											\
 												fprintf(stderr, "[DEBUG] %s:%i: " fmt "\n", file+i+1, __LINE__, ##__VA_ARGS__);	\
+												fflush(stderr);																	\
 											} while (0)
 	#else
 		#define WIIUSE_DEBUG(fmt, ...)	fprintf(stderr, "[DEBUG] " __FILE__ ":%i: " fmt "\n", __LINE__, ##__VA_ARGS__)
diff --git a/cpp/wiiuse/src/events.c b/cpp/wiiuse/src/events.c
index 6668eda..01d8a6a 100644
--- a/cpp/wiiuse/src/events.c
+++ b/cpp/wiiuse/src/events.c
@@ -480,10 +480,11 @@ static void event_data_read(struct wiimote_t* wm, byte* msg) {
 	#ifdef WITH_WIIUSE_DEBUG
 	{
 		int i = 0;
-		printf("Read: ");
+		fprintf(stderr, "[DEBUG] Read: ");
 		for (; i < req->size - req->wait; ++i)
-			printf("%x ", req->buf[i]);
-		printf("\n");
+			fprintf(stderr, "%x ", req->buf[i]);
+		fprintf(stderr, "\n");
+		fflush(stderr);
 	}
 	#endif
 
diff --git a/cpp/wiiuse/src/speaker.c b/cpp/wiiuse/src/speaker.c
index 513392e..b7c1328 100644
--- a/cpp/wiiuse/src/speaker.c
+++ b/cpp/wiiuse/src/speaker.c
@@ -24,30 +24,17 @@ void wiiuse_speaker_unmute(struct wiimote_t* wm) {
 	wiiuse_send(wm, WM_CMD_SPEAKER_MUTE, &buf, 1);
 }
 
-void wiiuse_speaker_config(struct wiimote_t* wm, unsigned short freq, byte vol) {
-	if (freq > 0x0000) {
-		cfg[2] = freq & 0x00ff;
-		cfg[3] = (freq & 0xff00) >> 8;
-	}
-	printf("speaker 0x%02x%02x\n", cfg[2], cfg[3]);
-	fflush(stdout);
-	if (vol > 0x00) {
-		cfg[4] = vol;
-	}
-	wiiuse_write_data(wm, WM_REG_SPEAKER, cfg, 9);
-}
-
-void wiiuse_speaker_data(struct wiimote_t* wm, byte* data) {
-	byte buf[21];
-	buf[0] = sizeof(data) << 3;
-	memcpy(buf + 1, data, 20);
-	wiiuse_send(wm, WM_CMD_STREAM_DATA, buf, 21);
-}
-
 void wiiuse_speaker_activate(struct wiimote_t* wm) {
 	wiiuse_speaker_enable(wm);
+	wiiuse_speaker_mute(wm);
+	byte buf = 0x01;
+	wiiuse_write_data(wm, WM_REG_SPEAKER + 8, &buf, 1);
+	buf = 0x08;
+	wiiuse_write_data(wm, WM_REG_SPEAKER, &buf, 1);
+	wiiuse_speaker_config(wm);
+	buf = 0x01;
+	wiiuse_write_data(wm, WM_REG_SPEAKER + 7, &buf, 1);
 	wiiuse_speaker_unmute(wm);
-	wiiuse_speaker_config(wm, 0x00, 0x00);
 }
 
 void wiiuse_speaker_deactivate(struct wiimote_t* wm) {
@@ -55,10 +42,28 @@ void wiiuse_speaker_deactivate(struct wiimote_t* wm) {
 	wiiuse_speaker_disable(wm);
 }
 
-void wiiuse_speaker_frequency(struct wiimote_t* wm, unsigned short freq) {
-	wiiuse_speaker_config(wm, freq, 0x00);
+void wiiuse_speaker_format(struct wiimote_t* wm, byte format) {
+	wm->speaker.format = format;
 }
 
-void wiiuse_speaker_volume(struct wiimote_t* wm, byte vol) {
-	wiiuse_speaker_config(wm, 0x0000, vol);
+void wiiuse_speaker_rate(struct wiimote_t* wm, double rate) {
+	// Check: pcm_sample_rate = 12000000 / rate_value adpcm_sample_rate = 6000000 / rate_value
+	wm->speaker.rate = 48000 / rate;
+}
+
+void wiiuse_speaker_volume(struct wiimote_t* wm, double vol) {
+	wm->speaker.vol = vol * WIIMOTE_GET_SPEAKER_MAX_VOLUME(wm);
+}
+
+void wiiuse_speaker_config(struct wiimote_t* wm) {
+	byte cfg[7] = {wm->speaker.format, 0x00, 0x00, wm->speaker.rate, 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);
 }
diff --git a/cpp/wiiuse/src/speaker.h b/cpp/wiiuse/src/speaker.h
index 8b8267d..ee77b1a 100644
--- a/cpp/wiiuse/src/speaker.h
+++ b/cpp/wiiuse/src/speaker.h
@@ -1,6 +1,7 @@
 #include "wiiuse.h"
 
-#define WIIMOTE_GET_RUMBLE(wm) (WIIMOTE_IS_SET(wm, WIIMOTE_STATE_RUMBLE) ? 0x01 : 0x00)
+#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)
 
 #define WM_CMD_SPEAKER_ENABLE 0x14
 #define WM_CMD_STREAM_DATA    0x18
@@ -8,16 +9,4 @@
 
 #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
+#define WM_REG_SPEAKER 0x04a20001
diff --git a/cpp/wiiuse/src/wiiuse.c b/cpp/wiiuse/src/wiiuse.c
index 4dae02f..583733c 100644
--- a/cpp/wiiuse/src/wiiuse.c
+++ b/cpp/wiiuse/src/wiiuse.c
@@ -538,10 +538,11 @@ int wiiuse_write_data(struct wiimote_t* wm, unsigned int addr, byte* data, byte
 	#ifdef WITH_WIIUSE_DEBUG
 	{
 		int i = 0;
-		printf("Write data is: ");
+		fprintf(stderr, "[DEBUG} Write data is: ");
 		for (; i < len; ++i)
-			printf("%x ", data[i]);
-		printf("\n");
+			fprintf(stderr, "%x ", data[i]);
+		fprintf(stderr, "\n");
+		fflush(stderr);
 	}
 	#endif
 
@@ -607,14 +608,15 @@ int wiiuse_send(struct wiimote_t* wm, byte report_type, byte* msg, int len) {
 	#ifdef WITH_WIIUSE_DEBUG
 	{
 		int x = 2;
-		printf("[DEBUG] (id %i) SEND: (%x) %.2x ", wm->unid, buf[0], buf[1]);
+		fprintf(stderr, "[DEBUG] (id %i) SEND: (%x) %.2x ", wm->unid, buf[0], buf[1]);
 		#ifndef WIN32
 		for (; x < len+2; ++x)
 		#else
 		for (; x < len+1; ++x)
 		#endif
-			printf("%.2x ", buf[x]);
-		printf("\n");
+			fprintf(stderr, "%.2x ", buf[x]);
+		fprintf(stderr, "\n");
+		fflush(stderr);
 	}
 	#endif
 
diff --git a/cpp/wiiuse/src/wiiuse.h b/cpp/wiiuse/src/wiiuse.h
index 9dff81c..7caecfa 100644
--- a/cpp/wiiuse/src/wiiuse.h
+++ b/cpp/wiiuse/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/cpp/wiiusej/.cproject b/cpp/wiiusej/.cproject
index e87ebf0..75d42b3 100644
--- a/cpp/wiiusej/.cproject
+++ b/cpp/wiiusej/.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/cpp/wiiusej/.project b/cpp/wiiusej/.project
index 90c222a..13c977a 100644
--- a/cpp/wiiusej/.project
+++ b/cpp/wiiusej/.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/cpp/wiiusej/lib/wiiuse.dll b/cpp/wiiusej/lib/wiiuse.dll
deleted file mode 100644
index d2a452861d4ae3456255f314ea7f511b2a37d665..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 55364
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
HR^I+Udaap!

diff --git a/cpp/wiiusej/lib/wiiuse.lib b/cpp/wiiusej/lib/wiiuse.lib
new file mode 100644
index 0000000000000000000000000000000000000000..40b27b9ea2f6ec186d641df42c47fca3510a5ea4
GIT binary patch
literal 27590
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

literal 0
HcmV?d00001

diff --git a/cpp/wiiusej/src/speaker.h b/cpp/wiiusej/src/speaker.h
deleted file mode 100644
index 8b8267d..0000000
--- a/cpp/wiiusej/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/cpp/wiiusej/src/wiiuse.h b/cpp/wiiusej/src/wiiuse.h
index 9dff81c..7caecfa 100644
--- a/cpp/wiiusej/src/wiiuse.h
+++ b/cpp/wiiusej/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/cpp/wiiusej/src/wiiusej_Speaker.h b/cpp/wiiusej/src/wiiusej_Speaker.h
deleted file mode 100644
index 0da6686..0000000
--- a/cpp/wiiusej/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/cpp/wiiusej/src/wiiusej_WiiUseApi.c b/cpp/wiiusej/src/wiiusej_WiiUseApi.c
index a13e4e2..83b48e0 100644
--- a/cpp/wiiusej/src/wiiusej_WiiUseApi.c
+++ b/cpp/wiiusej/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/cpp/wiiusej/src/wiiusej_WiiUseApi.h b/cpp/wiiusej/src/wiiusej_WiiUseApi.h
index 29dde3f..e003a5a 100644
--- a/cpp/wiiusej/src/wiiusej_WiiUseApi.h
+++ b/cpp/wiiusej/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