diff --git a/CMakeLists.txt b/CMakeLists.txt index 10a564d..64ea76d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/boo AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR} add_subdirectory(athena) endif() -option(AMUSE_BUILD_EDITOR "Build Amuse with editor enabled (includes VST)" OFF) +option(AMUSE_BUILD_EDITOR "Build Amuse with editor enabled (includes VST)" ON) add_library(amuse lib/AudioGroup.cpp diff --git a/Editor/MainWindow.cpp b/Editor/MainWindow.cpp index 2815279..1ed716a 100644 --- a/Editor/MainWindow.cpp +++ b/Editor/MainWindow.cpp @@ -185,7 +185,7 @@ MainWindow::MainWindow(QWidget* parent) connect(qApp, &QApplication::focusChanged, this, &MainWindow::onFocusChanged); connect(QGuiApplication::clipboard(), &QClipboard::dataChanged, this, &MainWindow::onClipboardChanged); - m_voxEngine = boo::NewAudioVoiceEngine(); + m_voxEngine = boo::NewAudioVoiceEngine("amuse-gui", "Amuse Gui"); m_voxAllocator = std::make_unique(*m_voxEngine); m_engine = std::make_unique(*m_voxAllocator); m_engine->setVolume(0.7f); diff --git a/Editor/main.cpp b/Editor/main.cpp index ad94dd7..168f96b 100644 --- a/Editor/main.cpp +++ b/Editor/main.cpp @@ -4,7 +4,6 @@ #include #include "MainWindow.hpp" #include "SongGroupEditor.hpp" -#include "boo/IApplication.hpp" #include #include #include @@ -34,24 +33,6 @@ static QIcon MakeAppIcon() { return ret; } -/* This is for adapting the get*Name methods */ -class BooInterface : public boo::IApplication { - std::vector m_args; - void _deletedWindow(boo::IWindow* window) override {} - -public: - EPlatformType getPlatformType() const override { return EPlatformType::Qt; } - - int run() override { return 0; } - std::string_view getUniqueName() const override { return "amuse-gui"sv; } - std::string_view getFriendlyName() const override { return "Amuse"sv; } - std::string_view getProcessName() const override { return "amuse-gui"sv; } - const std::vector& getArgs() const override { return m_args; } - - /* Constructors/initializers for sub-objects */ - std::shared_ptr newWindow(std::string_view title) override { return {}; } -}; - MainWindow* g_MainWindow = nullptr; int main(int argc, char* argv[]) { @@ -97,9 +78,6 @@ int main(int argc, char* argv[]) { logvisor::RegisterConsoleLogger(); logvisor::RegisterStandardExceptions(); - BooInterface booApp; - boo::APP = &booApp; - Q_INIT_RESOURCE(translation_res); QTranslator translator; if (translator.load(QLocale(), QStringLiteral("lang"), QStringLiteral("_"), QStringLiteral(":/translations"))) { diff --git a/Editor/resources/lang_de.ts b/Editor/resources/lang_de.ts index e43a421..a40d064 100644 --- a/Editor/resources/lang_de.ts +++ b/Editor/resources/lang_de.ts @@ -641,37 +641,37 @@ - + A directory at '%1/%2' could not be created. - + Unable to create directory - + Launching Windows Explorer Failed - + Could not find explorer.exe in path to launch Windows Explorer. - + Show in Explorer - + Show in Finder - + Show in Browser @@ -691,329 +691,329 @@ - + Amuse[*] - + %1/%2/%3[*] - Amuse - + %1[*] - Amuse + + + + The directory at '%1' must not be empty. + + - The directory at '%1' must not be empty. - - - - - Directory empty - + The directory at '%1' must exist for the Amuse editor. - + Directory does not exist - + __amuse_test__ - + The directory at '%1' must be writable for the Amuse editor: %2 - + Unable to write to directory - + No Audio Devices Found - + Virtual MIDI-In - + No MIDI Devices Found - + SUSTAIN - - + + Unsaved Changes - + Save Changes in %1? - + New Project - + The directory at '%1' does not exist. - + Bad Directory - + Opening - - - - - + + + + + Scanning Project - + Opening %1 - + Open Project - + Discard Changes in %1? - + Reloading Samples - + Scanning %1 - + Import Project - + The file at '%1' could not be interpreted as a MusyX container. - + Unsupported MusyX Container - + Sample Import Mode - + Amuse can import samples as WAV files for ease of editing, import original compressed data for lossless repacking, or both. Exporting the project will prefer whichever version was modified most recently. - + Import Compressed - + Import WAVs - + Import Both - + Raw Import Mode - + Would you like to scan for all MusyX group files in this directory? - + Project Name - + What should this project be named? - - + + Importing - - + + Importing %1 - + Import Songs - + Exporting - + Exporting %1 - - + + Import C Headers - + <p>Importing names from C headers depends on up-to-date, consistent names relative to the sound group data.</p><p>Headers are imported on a per-subproject basis from a single directory. Headers must be named with the form <code>&lt;subproject&gt;.h</code>.</p><p>Group, Song and SFX definitions are matched according to the following forms:<pre>#define GRP&lt;name&gt; &lt;id&gt; #define SNG&lt;name&gt; &lt;id&gt; #define SFX&lt;name> &lt;id&gt;</pre></p><p><strong>This operation cannot be undone! It is recommended to make a backup of the project directory before proceeding.</strong></p><p>Continue?</p> - + Export C Headers - + New Subproject - + What should this subproject be named? - + New SFX Group - + What should the new SFX group in %1 be named? - + New Song Group - + What should the new Song group in %1 be named? - + New ADSR - + What should the new ADSR in %1 be named? - + New Curve - + What should the new Curve in %1 be named? - + New Keymap - + What should the new Keymap in %1 be named? - + New Layers - + What should the new Layers in %1 be named? - + About Amuse - + Export Complete - + %1? @@ -1573,7 +1573,7 @@ QDialogButtonBox - + OK @@ -1581,12 +1581,12 @@ QMessageBox - + <h3>About Amuse</h3> - + <p>Amuse is an alternate editor and runtime library for MusyX sound groups.</p><p>MusyX originally served as a widely-deployed audio system for developing games on the Nintendo 64, GameCube, and GameBoy Advance.</p><p>Amuse is available under the MIT license.<br>Please see <a href="https://gitlab.axiodl.com/AxioDL/amuse/blob/master/LICENSE">https://gitlab.axiodl.com/AxioDL/amuse/blob/master/LICENSE</a> for futher information.</p><p>Copyright (C) 2015-2018 Antidote / Jackoalan.</p><p>MusyX is a trademark of Factor 5, LLC.</p><p>Nintendo 64, GameCube, and GameBoy Advance are trademarks of Nintendo Co., Ltd.</p> @@ -2041,52 +2041,52 @@ TreeDelegate - + Export GameCube Group - + Find Usages - + Cut - + Copy - + Paste - + Duplicate - + Delete - + Rename - + Exporting - + Exporting %1