Audio: ported magnum-al-info to Emscripten.

9 years ago · c77782c3f4
10 changed files with 41 additions and 2 deletions
--- a/doc/changelog.dox
+++ b/doc/changelog.dox
@ -151,7 +151,8 @@ namespace Magnum {
 -   Floating-point audio support in @ref Audio::Buffer
 -   @ref Audio::WavImporter "WavAudioImporter" plugin now supports more
    formats, is more flexible and gives better errors
-   New @ref magnum-al-info "magnum-al-info" utility
+-   New @ref magnum-al-info "magnum-al-info" utility, available for all desktop
+    platforms and Emscripten

 ### DebugTools library

--- a/package/archlinux/PKGBUILD-emscripten
+++ b/package/archlinux/PKGBUILD-emscripten
@ -38,6 +38,7 @@ build() {
        -DWITH_TGAIMPORTER=ON \
        -DWITH_WAVAUDIOIMPORTER=ON \
        -DWITH_MAGNUMINFO=ON \
+        -DWITH_AL_INFO=ON \
        -DBUILD_TESTS=ON
    ninja
 }
--- a/package/archlinux/PKGBUILD-emscripten-noopt
+++ b/package/archlinux/PKGBUILD-emscripten-noopt
@ -40,6 +40,7 @@ build() {
        -DWITH_TGAIMPORTER=ON \
        -DWITH_WAVAUDIOIMPORTER=ON \
        -DWITH_MAGNUMINFO=ON \
+        -DWITH_AL_INFO=ON \
        -DBUILD_TESTS=ON
    ninja
 }
--- a/package/archlinux/PKGBUILD-emscripten-noopt-webgl2
+++ b/package/archlinux/PKGBUILD-emscripten-noopt-webgl2
@ -41,6 +41,7 @@ build() {
        -DWITH_TGAIMPORTER=ON \
        -DWITH_WAVAUDIOIMPORTER=ON \
        -DWITH_MAGNUMINFO=ON \
+        -DWITH_AL_INFO=ON \
        -DBUILD_TESTS=ON
    ninja
 }
--- a/package/archlinux/PKGBUILD-emscripten-wasm
+++ b/package/archlinux/PKGBUILD-emscripten-wasm
@ -38,6 +38,7 @@ build() {
        -DWITH_TGAIMPORTER=ON \
        -DWITH_WAVAUDIOIMPORTER=ON \
        -DWITH_MAGNUMINFO=ON \
+        -DWITH_AL_INFO=ON \
        -DBUILD_TESTS=ON
    ninja
 }
--- a/package/archlinux/PKGBUILD-emscripten-wasm-webgl2
+++ b/package/archlinux/PKGBUILD-emscripten-wasm-webgl2
@ -39,6 +39,7 @@ build() {
        -DWITH_TGAIMPORTER=ON \
        -DWITH_WAVAUDIOIMPORTER=ON \
        -DWITH_MAGNUMINFO=ON \
+        -DWITH_AL_INFO=ON \
        -DBUILD_TESTS=ON
    ninja
 }
--- a/package/archlinux/PKGBUILD-emscripten-webgl2
+++ b/package/archlinux/PKGBUILD-emscripten-webgl2
@ -39,6 +39,7 @@ build() {
        -DWITH_TGAIMPORTER=ON \
        -DWITH_WAVAUDIOIMPORTER=ON \
        -DWITH_MAGNUMINFO=ON \
+        -DWITH_AL_INFO=ON \
        -DBUILD_TESTS=ON
    ninja
 }
--- a/package/ci/travis-emscripten.sh
+++ b/package/ci/travis-emscripten.sh
@ -56,6 +56,7 @@ cmake .. \
    -DWITH_TGAIMPORTER=ON \
    -DWITH_WAVAUDIOIMPORTER=ON \
    -DWITH_MAGNUMINFO=ON \
+    -DWITH_AL_INFO=ON \
    -DBUILD_TESTS=ON \
    -DTARGET_GLES2=$TARGET_GLES2
 # Otherwise the job gets killed (probably because using too much memory)
--- a/src/Magnum/Audio/CMakeLists.txt
+++ b/src/Magnum/Audio/CMakeLists.txt
@ -84,13 +84,26 @@ if(WITH_AL_INFO)
    target_link_libraries(magnum-al-info MagnumAudio)
    set_target_properties(magnum-al-info PROPERTIES FOLDER "Magnum/Audio")

-    install(TARGETS magnum-al-info DESTINATION ${MAGNUM_BINARY_INSTALL_DIR})
+    if(NOT MAGNUM_TARGET_EMSCRIPTEN)
+        install(TARGETS magnum-al-info DESTINATION ${MAGNUM_BINARY_INSTALL_DIR})
+    endif()

    if(CORRADE_TARGET_IOS)
        set_target_properties(magnum-al-info PROPERTIES
            MACOSX_BUNDLE ON
            MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/MacOSXBundleInfo.plist.in
            XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "YES")
+    elseif(CORRADE_TARGET_EMSCRIPTEN)
+        install(FILES magnum-al-info.html DESTINATION ${MAGNUM_DEPLOY_PREFIX}/magnum-al-info RENAME index.html)
+        install(TARGETS magnum-al-info DESTINATION ${MAGNUM_DEPLOY_PREFIX}/magnum-al-info)
+        install(FILES
+            ${CMAKE_SOURCE_DIR}/src/Magnum/Platform/WebApplication.css
+            ${CMAKE_SOURCE_DIR}/src/Magnum/Platform/WindowlessEmscriptenApplication.js
+            DESTINATION ${MAGNUM_DEPLOY_PREFIX}/magnum-al-info)
+        install(FILES
+            ${CMAKE_CURRENT_BINARY_DIR}/magnum-al-info.js.mem
+            ${CMAKE_CURRENT_BINARY_DIR}/magnum-al-info.wasm
+            DESTINATION ${MAGNUM_DEPLOY_PREFIX}/magnum-al-info OPTIONAL)
    endif()

    # Magnum AL info target alias for superprojects
--- a/src/Magnum/Audio/magnum-al-info.html
+++ b/src/Magnum/Audio/magnum-al-info.html
@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>Magnum AL Info</title>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="WebApplication.css" />
+  </head>
+  <body>
+    <h1>Magnum AL Info</h1>
+    <div id="listener">
+      <pre id="log"></pre>
+      <div id="status">Initialization...</div>
+      <div id="statusDescription"></div>
+      <script src="WindowlessEmscriptenApplication.js"></script>
+      <script async="async" src="magnum-al-info.js"></script>
+    </div>
+  </body>
+</html>