Make some interfaces global

Author: igorkorsukov

src/app/appfactory.cpp

@@ -390,7 +390,7 @@ std::shared_ptr<muse::IApplication> AppFactory::newGuiApp(const CmdOptions& opti
     app->addModule(new muse::extensions::ExtensionsModule());
     app->addModule(new muse::languages::LanguagesModule());
     app->addModule(new muse::learn::LearnModule());
-    app->addModule(new muse::mi::MultiInstancesModule());
+    app->addModule(new muse::mi::MultiWindowsModule());
     app->addModule(new mu::musesounds::MuseSoundsModule());
     app->addModule(new mu::notation::NotationModule());
     app->addModule(new mu::notation::NotationSceneModule());
@@ -504,7 +504,7 @@ static void addConsoleModules(std::shared_ptr<ConsoleApp> app)
     app->addModule(new mu::iex::lrcexport::LyricsExportModule());
 #endif
 
-    app->addModule(new muse::mi::MultiInstancesModule());
+    app->addModule(new muse::mi::MultiWindowsModule());
     app->addModule(new mu::notation::NotationModule());
     app->addModule(new mu::playback::PlaybackModule());
     app->addModule(new mu::project::ProjectModule());

src/app/internal/consoleapp.h

@@ -63,11 +63,10 @@ class ConsoleApp : public muse::BaseApplication, public std::enable_shared_from_
     muse::GlobalInject<iex::videoexport::IVideoExportConfiguration> videoExportConfiguration;
     muse::GlobalInject<iex::guitarpro::IGuitarProConfiguration> guitarProConfiguration;
     muse::GlobalInject<iex::musicxml::IMusicXmlConfiguration> musicXmlConfiguration;
-
-    muse::ContextInject<converter::IConverterController> converter = { this };
+    muse::GlobalInject<muse::audioplugins::IRegisterAudioPluginsScenario> registerAudioPluginsScenario;
+    muse::GlobalInject<converter::IConverterController> converter;
     muse::ContextInject<engraving::IDiagnosticDrawProvider> diagnosticDrawProvider = { this };
     muse::ContextInject<muse::autobot::IAutobot> autobot = { this };
-    muse::ContextInject<muse::audioplugins::IRegisterAudioPluginsScenario> registerAudioPluginsScenario = { this };
     muse::ContextInject<playback::ISoundProfilesRepository> soundProfilesRepository = { this };
 
 public:

src/appshell/internal/applicationactioncontroller.h

@@ -53,15 +53,15 @@ class ApplicationActionController : public QObject, public muse::Contextable, pu
     muse::GlobalInject<muse::mi::IMultiWindowsProvider> multiwindowsProvider;
     muse::GlobalInject<IAppShellConfiguration> configuration;
     muse::GlobalInject<muse::languages::ILanguagesService> languagesService;
+    muse::GlobalInject<muse::IApplication> application;
+    muse::GlobalInject<muse::extensions::IExtensionInstaller> extensionInstaller;
     muse::ContextInject<muse::ui::IUiActionsRegister> actionsRegister = { this };
     muse::ContextInject<muse::actions::IActionsDispatcher> dispatcher = { this };
     muse::ContextInject<muse::ui::IMainWindow> mainWindow = { this };
     muse::ContextInject<muse::IInteractive> interactive = { this };
     muse::ContextInject<project::IProjectFilesController> projectFilesController = { this };
     muse::ContextInject<muse::audio::ISoundFontController> soundFontController = { this };
     muse::ContextInject<IStartupScenario> startupScenario = { this };
-    muse::GlobalInject<muse::IApplication> application;
-    muse::ContextInject<muse::extensions::IExtensionInstaller> extensionInstaller = { this };
     muse::ContextInject<context::IGlobalContext> globalContext = { this };
     muse::ContextInject<context::IUiContextResolver> uiContextResolver = { this };
 

src/appshell/internal/startupscenario.h

@@ -44,11 +44,11 @@ class StartupScenario : public IStartupScenario, public muse::Contextable, publi
 {
     muse::GlobalInject<muse::mi::IMultiWindowsProvider> multiwindowsProvider;
     muse::GlobalInject<IAppShellConfiguration> configuration;
+    muse::GlobalInject<muse::audioplugins::IRegisterAudioPluginsScenario> registerAudioPluginsScenario;
     muse::ContextInject<muse::IInteractive> interactive = { this };
     muse::ContextInject<muse::actions::IActionsDispatcher> dispatcher = { this };
     muse::ContextInject<ISessionsManager> sessionsManager = { this };
     muse::ContextInject<project::IProjectAutoSaver> projectAutoSaver = { this };
-    muse::ContextInject<muse::audioplugins::IRegisterAudioPluginsScenario> registerAudioPluginsScenario = { this };
     muse::ContextInject<muse::update::IAppUpdateScenario> appUpdateScenario = { this };
     muse::ContextInject<mu::musesounds::IMuseSoundsCheckUpdateScenario> museSoundsUpdateScenario = { this };
     muse::ContextInject<musesounds::IMuseSamplerCheckUpdateScenario> museSamplerCheckForUpdateScenario = { this };

src/appshell/qml/MuseScore/AppShell/appmenumodel.h

@@ -67,11 +67,11 @@ class AppMenuModel : public muse::uicomponents::AbstractMenuModel
 #ifdef MUSE_MODULE_MUSESAMPLER
     muse::GlobalInject<muse::musesampler::IMuseSamplerInfo> museSamplerInfo;
 #endif
+    muse::GlobalInject<muse::extensions::IExtensionsProvider> extensionsProvider;
     muse::ContextInject<muse::ui::IUiActionsRegister> uiActionsRegister = { this };
     muse::ContextInject<IAppMenuModelHook> appMenuModelHook = { this };
     muse::ContextInject<mu::context::IGlobalContext> globalContext = { this };
     muse::ContextInject<muse::actions::IActionsDispatcher> actionsDispatcher = { this };
-    muse::ContextInject<muse::extensions::IExtensionsProvider> extensionsProvider = { this };
     muse::ContextInject<muse::ui::IMainWindow> mainWindow = { this };
     muse::ContextInject<muse::ui::INavigationController> navigationController = { this };
     muse::ContextInject<muse::workspace::IWorkspaceManager> workspacesManager = { this };

src/appshell/qml/MuseScore/AppShell/notationpagemodel.h

@@ -51,9 +51,9 @@ class NotationPageModel : public QObject, public muse::Contextable, public muse:
     muse::GlobalInject<notation::INotationSceneConfiguration> notationSceneConfiguration;
     muse::GlobalInject<braille::IBrailleConfiguration> brailleConfiguration;
     muse::GlobalInject<IAppShellConfiguration> configuration;
+    muse::GlobalInject<muse::extensions::IExtensionsProvider> extensionsProvider;
     muse::ContextInject<muse::actions::IActionsDispatcher> dispatcher = { this };
     muse::ContextInject<muse::dock::IDockWindowProvider> dockWindowProvider = { this };
-    muse::ContextInject<muse::extensions::IExtensionsProvider> extensionsProvider = { this };
     muse::ContextInject<context::IGlobalContext> globalContext = { this };
 
 public:

src/converter/api/converterapi.h

@@ -36,8 +36,8 @@ class ConverterApi : public muse::api::ApiObject, public muse::async::Asyncable
     Q_OBJECT
 
     muse::GlobalInject<muse::io::IFileSystem> fileSystem;
+    muse::GlobalInject<IConverterController> converter;
     muse::ContextInject<muse::IInteractive> interactive = { this };
-    muse::ContextInject<IConverterController> converter = { this };
 
 public:
     explicit ConverterApi(muse::api::IApiEngine* e);

src/converter/iconvertercontroller.h

@@ -31,7 +31,7 @@
 #include "global/progress.h"
 
 namespace mu::converter {
-class IConverterController : MODULE_CONTEXT_INTERFACE
+class IConverterController : MODULE_GLOBAL_INTERFACE
 {
     INTERFACE_ID(IConverterController)
 public:

src/converter/internal/convertercontroller.h

@@ -38,10 +38,10 @@ namespace mu::converter {
 class ConverterController : public IConverterController, public muse::Contextable
 {
     muse::GlobalInject<project::IProjectCreator> notationCreator;
+    muse::GlobalInject<muse::extensions::IExtensionsProvider> extensionsProvider;
     muse::ContextInject<project::INotationWritersRegister> writers = { this };
     muse::ContextInject<project::IProjectRWRegister> projectRW = { this };
     muse::ContextInject<context::IGlobalContext> globalContext = { this };
-    muse::ContextInject<muse::extensions::IExtensionsProvider> extensionsProvider = { this };
 
 public:
     ConverterController(const muse::modularity::ContextPtr& iocCtx)

src/engraving/api/v1/util.cpp

@@ -28,14 +28,6 @@
 #include "util.h"
 
 #include "log.h"
-#include "modularity/ioc.h"
-#include "global/iglobalconfiguration.h"
-#include "extensions/iextensionsconfiguration.h"
-#include "project/iprojectconfiguration.h"
-#include "notation/inotationconfiguration.h"
-#include "audio/main/iaudioconfiguration.h"
-#include "engraving/infrastructure/mscio.h"
-#include "context/iglobalcontext.h"
 
 using namespace muse;
 
@@ -45,83 +37,45 @@ namespace mu::engraving::apiv1 {
 //---------------------------------------------------------
 
 FileIO::FileIO(QObject* parent)
-    : QObject(parent)
+    : QObject(parent), muse::Contextable(muse::iocCtxForQmlObject(this))
 {
 }
 
 // User's MuseScore documents directory (default location for scores, plugins, etc.)
 QString FileIO::userDataPath()
 {
-    // Get global configuration to access allowed paths
-    auto globalConfig = muse::modularity::globalIoc()->resolve<IGlobalConfiguration>("extensions");
-    if (!globalConfig) {
-        LOGE() << "Failed to resolve IGlobalConfiguration";
-        return QString();
-    }
-
-    return globalConfig->userDataPath().toQString();
+    return globalConfiguration()->userDataPath().toQString();
 }
 
 // User-configured Plugins directory (Preferences → Folders → Plugins)
 QString FileIO::pluginsUserPath()
 {
-    auto extensionsConfig = muse::modularity::globalIoc()->resolve<extensions::IExtensionsConfiguration>("extensions");
-    if (!extensionsConfig) {
-        LOGE() << "Failed to resolve IExtensionsConfiguration";
-        return QString();
-    }
-
-    return extensionsConfig->pluginsUserPath().toQString();
+    return extensionsConfiguration()->pluginsUserPath().toQString();
 }
 
 // User-configured Scores directory (Preferences → Folders → Scores)
 QString FileIO::userProjectsPath()
 {
-    auto projectConfig = muse::modularity::globalIoc()->resolve<mu::project::IProjectConfiguration>("project");
-    if (!projectConfig) {
-        LOGE() << "Failed to resolve IProjectConfiguration";
-        return QString();
-    }
-
-    return projectConfig->userProjectsPath().toQString();
+    return projectConfiguration()->userProjectsPath().toQString();
 }
 
 // User-configured Templates directory (Preferences → Folders → Templates)
 QString FileIO::userTemplatesPath()
 {
-    auto projectConfig = muse::modularity::globalIoc()->resolve<mu::project::IProjectConfiguration>("project");
-    if (!projectConfig) {
-        LOGE() << "Failed to resolve IProjectConfiguration";
-        return QString();
-    }
-
-    return projectConfig->userTemplatesPath().toQString();
+    return projectConfiguration()->userTemplatesPath().toQString();
 }
 
 // User-configured Styles directory (Preferences → Folders → Styles)
 QString FileIO::userStylesPath()
 {
-    auto notationConfig = muse::modularity::globalIoc()->resolve<mu::notation::INotationConfiguration>("notation");
-    if (!notationConfig) {
-        LOGE() << "Failed to resolve INotationConfiguration";
-        return QString();
-    }
-
-    return notationConfig->userStylesPath().toQString();
+    return notationConfiguration()->userStylesPath().toQString();
 }
 
 // User-configured SoundFonts directories (Preferences → Folders → SoundFonts)
 QStringList FileIO::userSoundFontDirectories()
 {
     QStringList paths;
-    auto audioConfig = muse::modularity::globalIoc()->resolve<audio::IAudioConfiguration>("audio");
-
-    if (!audioConfig) {
-        LOGE() << "Failed to resolve IAudioConfiguration";
-        return paths; // empty list
-    }
-
-    for (const auto& path : audioConfig->userSoundFontDirectories()) {
+    for (const auto& path : audioConfiguration()->userSoundFontDirectories()) {
         if (!path.empty()) {
             paths << path.toQString();
         }
@@ -151,13 +105,7 @@ QString FileIO::pluginDirectoryPath()
 // Path of project file (ex: .../Desktop/project.mscz)
 QString FileIO::projectPath()
 {
-    auto globalContext = muse::modularity::globalIoc()->resolve<context::IGlobalContext>("project");
-    if (!globalContext) {
-        LOGE() << "Failed to resolve IGlobalContext";
-        return QString();
-    }
-
-    auto project = globalContext->currentProject();
+    auto project = globalContext()->currentProject();
     if (!project) {
         return QString();
     }