diff --git a/CMakeLists.txt b/CMakeLists.txt index ed58f54..e184e92 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -143,14 +143,9 @@ target_compile_definitions(MStarPlayer PRIVATE JUCE_APPLICATION_VERSION_STRING="$" ) -if (ASIO_PATH) target_compile_definitions(MStarPlayer PRIVATE JUCE_ASIO=1 ) -target_include_directories(MStarPlayer PRIVATE - ${ASIO_PATH} -) -endif() juce_add_binary_data(BinaryData SOURCES Icons/oxygen/media-eject.png diff --git a/Changelog.md b/Changelog.md index a80e130..9b40104 100644 --- a/Changelog.md +++ b/Changelog.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed * **Breaking Change**: Respect `XDG_CONFIG_HOME` on Linux. +* Official version built with ASIO support. ## [1.2.0] - 2025-04-15 diff --git a/JUCE b/JUCE index 10a5896..c352e24 160000 --- a/JUCE +++ b/JUCE @@ -1 +1 @@ -Subproject commit 10a589619b452c261b2940767eb253171eb5a823 +Subproject commit c352e2489000ffeb9e397051377d75eef2efe641 diff --git a/README.md b/README.md index 1cfac71..8117375 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,10 @@ Multi-*channel*, multi-*track*, multi-*player* player for audio files. ## Features * Supports basic audio file types like WAV and MP3 -* Output to ASIO devices\* +* Output to ASIO devices * Freely configure output channels * Play multi-track recordings consisting of one file per track -\* Requires a custom build, see [below](#how-to-compile). - ## Download Precompiled binaries are available for download: * [Windows](http://serviushack.space/MStarPlayer/MStarPlayer.zip) @@ -25,9 +23,8 @@ Pull requests are always welcome to improve the current code or add new features 1. Get [CMake](https://cmake.org/). 2. Get [Visual Studio 2022](https://www.visualstudio.com/downloads/). 3. Clone this repository, including its submodule. -4. Download the [ASIO SDK](https://www.steinberg.net/de/company/developer.html) and extract it. -5. Call cmake like this: `cmake -S . -B build_dir -DASIO_PATH=path/to/asio/sdk/common` -6. Build: `cmake --build build_dir` +4. Call cmake like this: `cmake -S . -B build_dir` +5. Build: `cmake --build build_dir` ### Format Source Code @@ -37,7 +34,8 @@ The format the source code according to the .clang-format file: ## License -M\*Player's own code is dual-licensed. This makes licensing a bit complicated but allows building it with ASIO. +M\*Player's own code is historically dual-licensed for ASIO support. +This makes licensing a bit complicated but keeps the flexibility that was beneficial in the past. Component | License ---------------|-------- @@ -45,20 +43,5 @@ Icons | LGPL JUCE | see https://github.com/WeAreROLI/JUCE M\*Player code | GPL and ISC -The ISC version of the code can be used together with a JUCE license and an ASIO SDK license to build M\*Player with ASIO support. - - -### Why is there no ASIO support anymore? - -The ASIO SDK and open source code are not compatible. To make it short this would have been the options: - -M\*Player license | ASIO SDK | JUCE restriction -------------------|----------|----------------- -GPL | no | none -proprietary | yes | forced splashscreen - -The dual-licensing still allows everyone to build M\*Player with ASIO support given they have a proper license for the ASIO SDK and JUCE. - - ## Notes Unnecessary binary data and the ASIO framework have been removed from the commit history. This means older revisions might not compile. diff --git a/Source/MainComponent.cpp b/Source/MainComponent.cpp index 8c1b9ce..5bd6f75 100644 --- a/Source/MainComponent.cpp +++ b/Source/MainComponent.cpp @@ -510,7 +510,7 @@ bool MainContentComponent::perform(const juce::ApplicationCommandTarget::Invocat juce::AlertWindow::showMessageBoxAsync(juce::MessageBoxIconType::InfoIcon, "M*Player", TRANS("Multi-channel, multi-track, multi-player") + "\n" + TRANS("player for audio files") + "\n\n" - + TRANS("Version: ") + JUCE_APPLICATION_VERSION_STRING); + + TRANS("Version: ") + JUCE_APPLICATION_VERSION_STRING + "\n" + juce::SystemStats::getJUCEVersion()); break; default: if (info.commandID >= basePlugin)