Restore basic working condition.

kblaschke · kblaschke · commit 5b78dda7942e · 2022-07-28T22:35:37.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,34 @@
+cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
+
+project(projectM_Emscripten)
+
+message(STATUS "${CMAKE_PREFIX_PATH}")
+
+find_package(libprojectM REQUIRED CONFIG)
+
+# Setting the suffix to .html also creates an HTML file in addition to the .js and .wasm outputs.
+set(CMAKE_EXECUTABLE_SUFFIX ".html")
+
+add_executable(projectM_SDL_emscripten
+        projectM_SDL_emscripten.cpp
+        )
+
+target_link_libraries(projectM_SDL_emscripten
+        PRIVATE
+        libprojectM::static
+        )
+
+target_compile_options(projectM_SDL_emscripten
+        PRIVATE
+        "SHELL:-s USE_SDL=2"
+        )
+
+target_link_options(projectM_SDL_emscripten
+        PRIVATE
+        "SHELL:-s USE_SDL=2"
+        "SHELL:-s MIN_WEBGL_VERSION=2"
+        "SHELL:-s MAX_WEBGL_VERSION=2"
+        "SHELL:-s FULL_ES2=1"
+        "SHELL:-s ALLOW_MEMORY_GROWTH=1"
+        "SHELL:--preload-file ${PRESETS_DIR}@/presets"
+        )
diff --git a/projectM_SDL_emscripten.cpp b/projectM_SDL_emscripten.cpp
@@ -4,14 +4,15 @@
  *
  */
 
-#include <math.h>
-#include <projectM.h>
-#include <sdltoprojectM.h>
+#include <libprojectM/projectM.h>
 
 #include <emscripten.h>
+
 #include <GL/gl.h>
+
 #include <SDL.h>
 
+#include <cmath>
 #include <string>
 
 const int FPS = 60;
@@ -36,11 +37,11 @@ void audioInputCallbackF32(void* userdata, unsigned char* stream, int len)
 {
     if (app.audioChannelsCount == 1)
     {
-        projectm_pcm_add_float_1ch_data(app.pm, reinterpret_cast<float*>(stream), len / sizeof(float));
+        projectm_pcm_add_float(app.pm, reinterpret_cast<float*>(stream), len / sizeof(float), PROJECTM_MONO);
     }
     else if (app.audioChannelsCount == 2)
     {
-        projectm_pcm_add_float_2ch_data(app.pm, reinterpret_cast<float*>(stream), len / sizeof(float));
+        projectm_pcm_add_float(app.pm, reinterpret_cast<float*>(stream), len / sizeof(float), PROJECTM_STEREO);
     }
 }
 
@@ -168,10 +169,12 @@ void keyHandler(const SDL_Event& sdl_evt)
     }
 
     // translate into projectM codes and perform default projectM handler
+    /*
     evt = sdl2pmEvent(&sdl_evt);
     mod = sdl2pmModifier(sdl_mod);
     key = sdl2pmKeycode(sdl_keycode, sdl_mod);
     projectm_key_handler(app.pm, evt, key, mod);
+     */
 }
 
 void presetSwitchedEvent(bool isHardCut, unsigned int index, void* context)
@@ -203,7 +206,7 @@ void generateRandomAudioData()
         }
     }
 
-    projectm_pcm_add_16bit_2ch_512(app.pm, pcm_data);
+    projectm_pcm_add_int16(app.pm, &pcm_data[0][0], 512, PROJECTM_STEREO);
 }
 
 void renderFrame()
diff --git a/src/projectM-emscripten/CMakeLists.txt b/src/projectM-emscripten/CMakeLists.txt

Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,15 @@`
`4`	`4`	`*`
`5`	`5`	`*/`
`6`	`6`
`7`		`-#include <math.h>`
`8`		`-#include <projectM.h>`
`9`		`-#include <sdltoprojectM.h>`
	`7`	`+#include <libprojectM/projectM.h>`
`10`	`8`
`11`	`9`	`#include <emscripten.h>`
	`10`	`+`
`12`	`11`	`#include <GL/gl.h>`
	`12`	`+`
`13`	`13`	`#include <SDL.h>`
`14`	`14`
	`15`	`+#include <cmath>`
`15`	`16`	`#include <string>`
`16`	`17`
`17`	`18`	`const int FPS = 60;`
`@@ -36,11 +37,11 @@ void audioInputCallbackF32(void* userdata, unsigned char* stream, int len)`
`36`	`37`	`{`
`37`	`38`	`if (app.audioChannelsCount == 1)`
`38`	`39`	`{`
`39`		`- projectm_pcm_add_float_1ch_data(app.pm, reinterpret_cast<float*>(stream), len / sizeof(float));`
	`40`	`+ projectm_pcm_add_float(app.pm, reinterpret_cast<float*>(stream), len / sizeof(float), PROJECTM_MONO);`
`40`	`41`	`}`
`41`	`42`	`else if (app.audioChannelsCount == 2)`
`42`	`43`	`{`
`43`		`- projectm_pcm_add_float_2ch_data(app.pm, reinterpret_cast<float*>(stream), len / sizeof(float));`
	`44`	`+ projectm_pcm_add_float(app.pm, reinterpret_cast<float*>(stream), len / sizeof(float), PROJECTM_STEREO);`
`44`	`45`	`}`
`45`	`46`	`}`
`46`	`47`
`@@ -168,10 +169,12 @@ void keyHandler(const SDL_Event& sdl_evt)`
`168`	`169`	`}`
`169`	`170`
`170`	`171`	`// translate into projectM codes and perform default projectM handler`
	`172`	`+ /*`
`171`	`173`	`evt = sdl2pmEvent(&sdl_evt);`
`172`	`174`	`mod = sdl2pmModifier(sdl_mod);`
`173`	`175`	`key = sdl2pmKeycode(sdl_keycode, sdl_mod);`
`174`	`176`	`projectm_key_handler(app.pm, evt, key, mod);`
	`177`	`+ */`
`175`	`178`	`}`
`176`	`179`
`177`	`180`	`void presetSwitchedEvent(bool isHardCut, unsigned int index, void* context)`
`@@ -203,7 +206,7 @@ void generateRandomAudioData()`
`203`	`206`	`}`
`204`	`207`	`}`
`205`	`208`
`206`		`- projectm_pcm_add_16bit_2ch_512(app.pm, pcm_data);`
	`209`	`+ projectm_pcm_add_int16(app.pm, &pcm_data[0][0], 512, PROJECTM_STEREO);`
`207`	`210`	`}`
`208`	`211`
`209`	`212`	`void renderFrame()`