Implemented the muse sounds page

Author: Eism

CMakeLists.txt

@@ -74,6 +74,7 @@ option(MUE_BUILD_VIDEOEXPORT_MODULE "Build videoexport module" OFF)
 option(MUE_BUILD_IMAGESEXPORT_MODULE "Build imagesexport module" ON)
 option(MUE_BUILD_INSPECTOR_MODULE "Build inspector module" ON)
 option(MUE_BUILD_INSTRUMENTSSCENE_MODULE "Build instruments scene module" ON)
+option(MUE_BUILD_MUSESOUNDS_MODULE "Build muse sounds module" ON)
 option(MUE_BUILD_NOTATION_MODULE "Build notation module" ON)
 option(MUE_BUILD_NOTATION_TESTS "Build notation tests" ON)
 option(MUE_BUILD_PALETTE_MODULE "Build palette module" ON)

SetupConfigure.cmake

@@ -143,6 +143,7 @@ if(BUILD_CONFIGURE MATCHES "VTEST")
     set(MUSE_MODULE_LANGUAGES OFF)
     set(MUSE_MODULE_LEARN OFF)
     set(MUSE_MODULE_MULTIINSTANCES OFF)
+    set(MUE_BUILD_MUSESOUNDS_MODULE OFF)
     set(MUE_BUILD_PALETTE_MODULE OFF)
     set(MUE_BUILD_PLAYBACK_MODULE OFF)
     set(MUSE_MODULE_EXTENSIONS OFF)
@@ -265,6 +266,7 @@ def_opt(MUE_BUILD_BRAILLE_MODULE ${MUE_BUILD_BRAILLE_MODULE})
 def_opt(MUE_BUILD_CONVERTER_MODULE ${MUE_BUILD_CONVERTER_MODULE})
 def_opt(MUE_BUILD_INSPECTOR_MODULE ${MUE_BUILD_INSPECTOR_MODULE})
 def_opt(MUE_BUILD_INSTRUMENTSSCENE_MODULE ${MUE_BUILD_INSTRUMENTSSCENE_MODULE})
+def_opt(MUE_BUILD_MUSESOUNDS_MODULE ${MUE_BUILD_MUSESOUNDS_MODULE})
 def_opt(MUE_BUILD_NOTATION_MODULE ${MUE_BUILD_NOTATION_MODULE})
 def_opt(MUE_BUILD_PALETTE_MODULE ${MUE_BUILD_PALETTE_MODULE})
 def_opt(MUE_BUILD_PLAYBACK_MODULE ${MUE_BUILD_PLAYBACK_MODULE})

src/CMakeLists.txt

@@ -52,6 +52,10 @@ if (MUE_BUILD_INSTRUMENTSSCENE_MODULE)
     add_subdirectory(instrumentsscene)
 endif()
 
+if (MUE_BUILD_MUSESOUNDS_MODULE)
+    add_subdirectory(musesounds)
+endif()
+
 if (MUE_BUILD_NOTATION_MODULE)
     add_subdirectory(notation)
 endif()

src/app/CMakeLists.txt

@@ -176,6 +176,10 @@ if (MUE_BUILD_APPSHELL_MODULE)
     list(APPEND LINK_LIB appshell)
 endif()
 
+if (MUE_BUILD_MUSESOUNDS_MODULE)
+    list(APPEND LINK_LIB musesounds)
+endif()
+
 if (NOT CC_IS_EMSCRIPTEN)
     list(APPEND LINK_LIB muse::cloud)
     list(APPEND LINK_LIB muse::languages)

src/app/appfactory.cpp

@@ -153,6 +153,10 @@
 #include "stubs/instrumentsscene/instrumentsscenestubmodule.h"
 #endif
 
+#ifdef MUE_BUILD_MUSESOUNDS_MODULE
+#include "musesounds/musesoundsmodule.h"
+#endif
+
 #ifdef MUE_BUILD_NOTATION_MODULE
 #include "notation/notationmodule.h"
 #else
@@ -287,6 +291,9 @@ std::shared_ptr<muse::IApplication> AppFactory::newGuiApp(const CmdOptions& opti
     app->addModule(new muse::languages::LanguagesModule());
     app->addModule(new muse::learn::LearnModule());
     app->addModule(new muse::mi::MultiInstancesModule());
+#ifdef MUE_BUILD_MUSESOUNDS_MODULE
+    app->addModule(new mu::musesounds::MuseSoundsModule());
+#endif
     app->addModule(new mu::notation::NotationModule());
     app->addModule(new mu::palette::PaletteModule());
     app->addModule(new mu::playback::PlaybackModule());

src/appshell/qml/HomePage/HomeMenu.qml

@@ -87,8 +87,7 @@ Item {
             model: [
                 { "name": "scores", "title": qsTrc("appshell", "Scores"), "icon": IconCode.MUSIC_NOTES },
                 { "name": "extensions", "title": qsTrc("appshell", "Plugins"), "icon":  IconCode.PLUGIN },
-                // TODO: need to implement
-                // { "name": "audio", "title": qsTrc("appshell", "Audio"), "icon":  IconCode.AUDIO },
+                { "name": "musesounds", "title": qsTrc("appshell", "Muse Sounds"), "icon": IconCode.PLAY },
                 { "name": "learn", "title": qsTrc("appshell", "Learn"), "icon":  IconCode.MORTAR_BOARD }
             ]
 

src/appshell/qml/HomePage/HomePage.qml

@@ -25,9 +25,10 @@ import Muse.Ui 1.0
 import Muse.UiComponents 1.0
 import Muse.Dock 1.0
 
-import MuseScore.Project 1.0
 import Muse.Cloud 1.0
 import Muse.Learn 1.0
+import MuseScore.Project 1.0
+import MuseScore.MuseSounds 1.0
 
 DockPage {
     id: root
@@ -65,7 +66,7 @@ DockPage {
         case "scores": root.central = scoresComp; break
         case "plugins": root.central = extensionsComp; break // backward compatibility
         case "extensions": root.central = extensionsComp; break
-        case "audio": root.central = audioComp; break
+        case "musesounds": root.central = museSoundsComp; break
         case "learn": root.central = learnComp; break
         case "account": root.central = accountComp; break
         }
@@ -125,12 +126,9 @@ DockPage {
     }
 
     Component {
-        id: audioComp
+        id: museSoundsComp
 
-        StyledTextLabel {
-            anchors.centerIn: parent
-            text: "Audio & VST"
-        }
+        MuseSoundsPage {}
     }
 
     Component {

src/framework/cloud/qml/Muse/Cloud/CloudScoresView.qml

@@ -217,7 +217,7 @@ ScoresView {
                 anchors.rightMargin: root.sideMargin
 
                 title: qsTrc("project", "Unable to load online scores")
-                body: qsTrc("project", "Please check your internet connection or try again later.")
+                body: qsTrc("global", "Please check your internet connection or try again later.")
             }
         }
     }

src/framework/global/serialization/json.cpp

@@ -412,6 +412,11 @@ void JsonArray::resize(size_t i)
     array_mut(m_data).resize(i);
 }
 
+bool JsonArray::empty() const
+{
+    return array_const(m_data).size() == 0;
+}
+
 JsonValue JsonArray::at(size_t i) const
 {
     std::shared_ptr<JsonData> d = std::make_shared<JsonData>();

src/framework/global/serialization/json.h

@@ -109,6 +109,8 @@ class JsonArray
     size_t size() const;
     void resize(size_t i);
 
+    bool empty() const;
+
     JsonValue at(size_t i) const;
 
     JsonArray& set(size_t i, bool v);