added MUSE_MODULE_MULTIWINDOWS_SINGLEPROC_MODE option

Author: igorkorsukov

src/appshell/internal/startupscenario.cpp

@@ -147,8 +147,10 @@ void StartupScenario::registerAudioPlugins()
 void StartupScenario::runAfterSplashScreen()
 {
     TRACEFUNC;
+    //! TODO We need to recognize this and refactor it.
+    //! This is a temporary solution for now.
 
-#ifdef MUSE_MULTICONTEXT_WIP
+#ifdef MUSE_MODULE_MULTIWINDOWS_SINGLEPROC_MODE
     if (m_startupScoreFile.isValid()) {
         muse::async::Channel<Uri> opened = interactive()->opened();
         opened.onReceive(this, [this, opened](const Uri&) {
@@ -170,8 +172,8 @@ void StartupScenario::runAfterSplashScreen()
     } else {
         interactive()->open(HOME_URI);
     }
-    return;
-#endif
+
+#else // MUSE_MODULE_MULTIWINDOWS_SINGLEPROC_MODE
 
     if (m_startupCompleted) {
         return;
@@ -201,6 +203,8 @@ void StartupScenario::runAfterSplashScreen()
 
     const Uri& startupUri = startupPageUri(modeType);
     interactive()->open(startupUri);
+
+#endif // MUSE_MODULE_MULTIWINDOWS_SINGLEPROC_MODE
 }
 
 bool StartupScenario::startupCompleted() const

src/framework/cmake/MuseDeclareOptions.cmake

@@ -65,7 +65,9 @@ declare_muse_module_opt(LANGUAGES ON)
 declare_muse_module_opt(LEARN ON)
 declare_muse_module_opt(MIDI ON)
 declare_muse_module_opt(MPE ON)
+
 declare_muse_module_opt(MULTIWINDOWS ON)
+option(MUSE_MODULE_MULTIWINDOWS_SINGLEPROC_MODE "Use single process mode for multi windows" OFF)
 
 declare_muse_module_opt(MUSESAMPLER ON)
 option(MUSE_MODULE_MUSESAMPLER_LOAD_IN_DEBUG "Load MuseSampler module in debug builds" OFF)

src/framework/cmake/muse_framework_config.h.in

@@ -123,6 +123,7 @@
 #cmakedefine MUSE_MODULE_MULTIWINDOWS 1
 #cmakedefine MUSE_MODULE_MULTIWINDOWS_TESTS 1
 #cmakedefine MUSE_MODULE_MULTIWINDOWS_API 1
+#cmakedefine MUSE_MODULE_MULTIWINDOWS_SINGLEPROC_MODE 1
 
 #cmakedefine MUSE_MODULE_MUSESAMPLER 1
 #cmakedefine MUSE_MODULE_MUSESAMPLER_TESTS 1

src/framework/multiwindows/multiwindowsmodule.cpp

@@ -30,7 +30,7 @@
 
 #include "muse_framework_config.h"
 
-#ifdef MUSE_MULTICONTEXT_WIP
+#ifdef MUSE_MODULE_MULTIWINDOWS_SINGLEPROC_MODE
 #include "internal/singleprocess/singleprocessprovider.h"
 #else
 #include "internal/multiprocess/multiprocessprovider.h"
@@ -48,7 +48,7 @@ std::string MultiWindowsModule::moduleName() const
 
 void MultiWindowsModule::registerExports()
 {
-#ifdef MUSE_MULTICONTEXT_WIP
+#ifdef MUSE_MODULE_MULTIWINDOWS_SINGLEPROC_MODE
     m_windowsProvider = std::make_shared<SingleProcessProvider>();
 #else
     m_windowsProvider = std::make_shared<MultiProcessProvider>(globalCtx());

src/framework/multiwindows/multiwindowsmodule.h

@@ -29,7 +29,7 @@
 #include "muse_framework_config.h"
 
 namespace muse::mi {
-#ifdef MUSE_MULTICONTEXT_WIP
+#ifdef MUSE_MODULE_MULTIWINDOWS_SINGLEPROC_MODE
 class SingleProcessProvider;
 #else
 class MultiProcessProvider;
@@ -46,7 +46,7 @@ class MultiWindowsModule : public modularity::IModuleSetup
     modularity::IContextSetup* newContext(const muse::modularity::ContextPtr& ctx) const override;
 
 private:
-#ifdef MUSE_MULTICONTEXT_WIP
+#ifdef MUSE_MODULE_MULTIWINDOWS_SINGLEPROC_MODE
     std::shared_ptr<SingleProcessProvider> m_windowsProvider;
 #else
     std::shared_ptr<MultiProcessProvider> m_windowsProvider;

src/framework/ui/internal/uiactionsregister.cpp

@@ -48,21 +48,13 @@ void UiActionsRegister::init()
 void UiActionsRegister::reg(const IUiActionsModulePtr& module)
 {
     const UiActionList& alist = module->actionsList();
-    ActionCodeList newActionCodeList;
     for (const UiAction& action : alist) {
         Info info;
         info.module = module;
         info.action = action;
         m_actions[action.code] = std::move(info);
-
-        newActionCodeList.push_back(action.code);
     }
 
-#ifdef MUSE_MULTICONTEXT_WIP
-    updateEnabled(newActionCodeList);
-    updateChecked(newActionCodeList);
-#endif
-
     module->actionsChanged().onReceive(this, [this](const UiActionList& actions) {
         updateActions(actions);
     }, async::Asyncable::Mode::SetReplace); // see IUiActionsModule::actionsChanged()

src/framework/ui/internal/uiarrangement.cpp

@@ -76,11 +76,8 @@ void UiArrangement::updateData(DataKey key, QJsonObject& obj, Notifications& not
 
 void UiArrangement::saveData(DataKey key, const QJsonObject& obj)
 {
-#ifndef MUSE_MULTICONTEXT_WIP
     QByteArray data = QJsonDocument(obj).toJson();
-
     workspacesDataProvider()->setRawData(key, data);
-#endif
 }
 
 QString UiArrangement::value(const QString& key) const