Merge pull request #25754 from Eism/muse_sounds_page_4.4.4

Muse sounds page. 4.4.4

Author: RomanPudashkin

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);

src/framework/global/types/uri.cpp

@@ -50,6 +50,11 @@ Uri::Uri(const std::string& str)
     m_path = str.substr(pathPos, pathN);
 }
 
+Uri::Uri(const String& str)
+    : Uri(str.toStdString())
+{
+}
+
 bool Uri::isValid() const
 {
     if (m_scheme.empty()) {
@@ -86,6 +91,11 @@ UriQuery::UriQuery(const std::string& str)
     parceParams(str, m_params);
 }
 
+UriQuery::UriQuery(const String& str)
+    : UriQuery(str.toStdString())
+{
+}
+
 UriQuery::UriQuery(const Uri& uri)
     : m_uri(uri)
 {

src/framework/global/types/uri.h

@@ -35,6 +35,7 @@ class Uri
 public:
     Uri() = default;
     explicit Uri(const std::string& str);
+    explicit Uri(const muse::String& str);
 
     using Scheme = std::string;
     static const Scheme MuseScore;
@@ -72,6 +73,7 @@ class UriQuery
 
     UriQuery() = default;
     explicit UriQuery(const std::string& str);
+    explicit UriQuery(const String& str);
     explicit UriQuery(const Uri& uri);
 
     const Uri& uri() const;

src/framework/learn/internal/learnservice.cpp

@@ -55,7 +55,11 @@ void LearnService::refreshPlaylists()
             return;
         }
 
-        m_startedPlaylist = result.val;
+        {
+            std::lock_guard lock(m_startedPlaylistMutex);
+            m_startedPlaylist = result.val;
+        }
+
         m_startedPlaylistChannel.send(m_startedPlaylist);
     };
 
@@ -69,7 +73,10 @@ void LearnService::refreshPlaylists()
             return;
         }
 
-        m_advancedPlaylist = result.val;
+        {
+            std::lock_guard lock(m_advancedPlaylistMutex);
+            m_advancedPlaylist = result.val;
+        }
         m_advancedPlaylistChannel.send(m_advancedPlaylist);
     };
 
@@ -79,6 +86,7 @@ void LearnService::refreshPlaylists()
 
 Playlist LearnService::startedPlaylist() const
 {
+    std::lock_guard lock(m_startedPlaylistMutex);
     return m_startedPlaylist;
 }
 
@@ -89,6 +97,7 @@ async::Channel<Playlist> LearnService::startedPlaylistChanged() const
 
 Playlist LearnService::advancedPlaylist() const
 {
+    std::lock_guard lock(m_advancedPlaylistMutex);
     return m_advancedPlaylist;
 }
 

src/framework/learn/internal/learnservice.h

@@ -52,9 +52,11 @@ class LearnService : public ILearnService
 
     Playlist parsePlaylist(const QJsonDocument& playlistDoc) const;
 
+    mutable std::mutex m_startedPlaylistMutex;
     Playlist m_startedPlaylist;
     async::Channel<Playlist> m_startedPlaylistChannel;
 
+    mutable std::mutex m_advancedPlaylistMutex;
     Playlist m_advancedPlaylist;
     async::Channel<Playlist> m_advancedPlaylistChannel;
 };

src/framework/learn/qml/Muse/Learn/internal/Playlist.qml

@@ -139,7 +139,7 @@ FocusScope {
 
         StyledTextLabel {
             width: parent.width
-            text: qsTrc("learn", "Please check your internet connection or try again later.")
+            text: qsTrc("global", "Please check your internet connection or try again later.")
         }
     }
 }

src/musesounds/CMakeLists.txt

@@ -0,0 +1,42 @@
+# SPDX-License-Identifier: GPL-3.0-only
+# MuseScore-CLA-applies
+#
+# MuseScore
+# Music Composition & Notation
+#
+# Copyright (C) 2024 MuseScore BVBA and others
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+declare_module(musesounds)
+
+set(MODULE_QRC musesounds.qrc)
+set(MODULE_QML_IMPORT ${CMAKE_CURRENT_LIST_DIR}/qml)
+
+set(MODULE_SRC
+    ${CMAKE_CURRENT_LIST_DIR}/musesoundsmodule.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/musesoundsmodule.h
+    ${CMAKE_CURRENT_LIST_DIR}/imusesoundsrepository.h
+    ${CMAKE_CURRENT_LIST_DIR}/imusesoundsconfiguration.h
+    ${CMAKE_CURRENT_LIST_DIR}/musesoundstypes.h
+
+    ${CMAKE_CURRENT_LIST_DIR}/internal/musesoundsrepository.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/internal/musesoundsrepository.h
+    ${CMAKE_CURRENT_LIST_DIR}/internal/musesoundsconfiguration.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/internal/musesoundsconfiguration.h
+
+    ${CMAKE_CURRENT_LIST_DIR}/view/musesoundslistmodel.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/view/musesoundslistmodel.h
+    )
+
+setup_module()

src/musesounds/imusesoundsconfiguration.h

@@ -0,0 +1,44 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0-only
+ * MuseScore-CLA-applies
+ *
+ * MuseScore
+ * Music Composition & Notation
+ *
+ * Copyright (C) 2024 MuseScore BVBA and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "types/string.h"
+
+#include "modularity/imoduleinterface.h"
+
+#include "global/types/uri.h"
+#include "network/networktypes.h"
+
+namespace mu::musesounds {
+class IMuseSoundsConfiguration : MODULE_EXPORT_INTERFACE
+{
+    INTERFACE_ID(IMuseSoundsConfiguration)
+
+public:
+    virtual ~IMuseSoundsConfiguration() = default;
+
+    virtual muse::network::RequestHeaders headers() const = 0;
+
+    virtual muse::UriQuery soundsUri() const = 0;
+    virtual muse::UriQuery soundPageUri(const muse::String& soundCode) const = 0;
+};
+}

src/musesounds/imusesoundsrepository.h

@@ -0,0 +1,40 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0-only
+ * MuseScore-CLA-applies
+ *
+ * MuseScore
+ * Music Composition & Notation
+ *
+ * Copyright (C) 2024 MuseScore BVBA and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "modularity/imoduleinterface.h"
+
+#include "async/notification.h"
+#include "musesoundstypes.h"
+
+namespace mu::musesounds {
+class IMuseSoundsRepository : MODULE_EXPORT_INTERFACE
+{
+    INTERFACE_ID(IMuseSoundsRepository)
+
+public:
+    virtual ~IMuseSoundsRepository() = default;
+
+    virtual const SoundCatalogueInfoList& soundsCatalogueList() const = 0;
+    virtual muse::async::Notification soundsCatalogueListChanged() const = 0;
+};
+}