Emscripten: Package presets, display preset name in window title, increase preset duration.

Also removed some debug preset name output that increased startup time drastically.

src/projectM-emscripten/CMakeLists.txt

@@ -13,3 +13,8 @@ target_link_libraries(projectM_SDL_emscripten
         PRIVATE
         projectM::libprojectM
         )
+
+target_link_options(projectM_SDL_emscripten
+        PRIVATE
+        "SHELL:--preload-file ${CMAKE_SOURCE_DIR}/presets@/presets"
+        )

src/projectM-emscripten/README.md

@@ -2,7 +2,7 @@
 
 This application is a sample entry point for the emscripten-built version of projectM.
 
-It's a very basic application, only displaying the "idle" preset. No presets are currently packaged into the virtual file system.
+It's a very basic application without many features.
 
 ## Limitations
 
@@ -35,5 +35,6 @@ emcmake ..
 emmake
 ```
 
-If the build was successful, you will find the projectM_SDL_emscripten.html, .js and .wasm files in
-the `cmake-build-emscripten/src/projectM-emscripten`directory.
+If the build was successful, you will find the projectM_SDL_emscripten.html, .data, .js and .wasm files in
+the `cmake-build-emscripten/src/projectM-emscripten`directory. The .data file includes all presets as a virtual
+filesystem.

src/projectM-emscripten/projectM_SDL_emscripten.cpp

@@ -14,8 +14,6 @@
 
 #include <string>
 
-#include <dirent.h>
-
 const float FPS = 60;
 
 struct projectMApp
@@ -144,6 +142,17 @@ void keyHandler(const SDL_Event& sdl_evt)
     projectm_key_handler(app.pm, evt, key, mod);
 }
 
+void presetSwitchedEvent(bool isHardCut, unsigned int index, void* context)
+{
+    auto presetName = projectm_get_preset_name(app.pm, index);
+    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Displaying preset: %s\n", presetName);
+
+    std::string newTitle = "projectM ➫ " + std::string(presetName);
+    projectm_free_string(presetName);
+
+    SDL_SetWindowTitle(app.win, newTitle.c_str());
+}
+
 void renderFrame()
 {
     SDL_Event evt;
@@ -220,28 +229,27 @@ int main(int argc, char* argv[])
     }
 
     app.settings.mesh_x = 48;
-    app.settings.mesh_y = 32;
+    app.settings.mesh_y = 48;
     app.settings.fps = FPS;
     app.settings.texture_size = 1024;
     app.settings.window_width = width;
     app.settings.window_height = height;
     app.settings.soft_cut_duration = 3; // seconds
-    app.settings.preset_duration = 5; // seconds
-    app.settings.beat_sensitivity = 0.8;
+    app.settings.preset_duration = 30; //seconds
+    app.settings.beat_sensitivity = 0.9;
     app.settings.aspect_correction = 1;
     app.settings.easter_egg = 0; // ???
     app.settings.shuffle_enabled = 1;
     app.settings.soft_cut_ratings_enabled = 1; // ???
     app.settings.preset_url = projectm_alloc_string(8);
-    strncpy(app.settings.preset_url, "presets", 8);
+    strncpy(app.settings.preset_url, "/presets", 8);
 
     // init projectM
     app.pm = projectm_create_settings(&(app.settings), PROJECTM_FLAG_NONE);
-    printf("init projectM\n");
     projectm_select_random_preset(app.pm, true);
-    printf("select random\n");
     projectm_set_window_size(app.pm, width, height);
-    printf("resetGL\n");
+    projectm_set_preset_switched_event_callback(app.pm, &presetSwitchedEvent, nullptr);
+    printf("projectM initialized.\n");
 
     // get an audio input device
     if (!selectAudioInput(&app))
@@ -250,29 +258,6 @@ int main(int argc, char* argv[])
         return 1;
     }
 
-    // Allocate a new a stream given the current directory name
-    DIR* m_dir;
-    if ((m_dir = opendir("/")) == nullptr)
-    {
-        printf("error opening /\n");
-    }
-    else
-    {
-        struct dirent* dir_entry;
-        while ((dir_entry = readdir(m_dir)) != nullptr)
-        {
-            printf("%s\n", dir_entry->d_name);
-        }
-    }
-
-    auto playlistSize = projectm_get_playlist_size(app.pm);
-    for (unsigned int i = 0; i < playlistSize; i++)
-    {
-        auto presetName = projectm_get_preset_name(app.pm, i);
-        printf("%u\t%s\n", i, presetName);
-        projectm_free_string(presetName);
-    }
-
     emscripten_set_main_loop(renderFrame, 0, 0);
 
     return 0;