From cfead08b13dfafc8c60ed8d426283a0ad9a7bd41 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sat, 5 Oct 2019 00:22:04 +0200
Subject: [PATCH] Ref T739, use correct (new) core modes / removed old modes

---
 src/swiftcore/main.cpp                          | 7 ++-----
 src/swiftguistandard/swiftguistdapplication.cpp | 9 +++------
 src/swiftlauncher/swiftlauncher.cpp             | 4 ++--
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/swiftcore/main.cpp b/src/swiftcore/main.cpp
index 4486f8adf..55efdabd0 100644
--- a/src/swiftcore/main.cpp
+++ b/src/swiftcore/main.cpp
@@ -29,20 +29,17 @@ int main(int argc, char *argv[])
     //! [SwiftApplicationDemo]
     CGuiApplication::highDpiScreenSupport(CGuiApplication::parseScaleFactor(argc, argv));
     QApplication qa(argc, argv);
-    Q_UNUSED(qa); // init of qa is required, but qa not used
+    Q_UNUSED(qa) // init of qa is required, but qa not used
 
     CCrashHandler::instance()->init();
     CGuiApplication a(CApplicationInfo::swiftCore(), CApplicationInfo::PilotClientCore, CIcons::swiftCore24());
     a.addWindowStateOption();
     a.addDBusAddressOption();
     a.addVatlibOptions();
-    a.addParserOption({{"c", "coreaudio"}, QCoreApplication::translate("main", "Audio in core.")});
     if (!a.parseAndSynchronizeSetup()) { return EXIT_FAILURE; }
 
     const QString dBusAdress(a.getCmdDBusAddressValue());
-    a.useContexts(a.isParserOptionSet("coreaudio") ?
-                  CCoreFacadeConfig::forCoreAllLocalInDBus(dBusAdress) :
-                  CCoreFacadeConfig::forCoreAllLocalInDBusNoAudio(dBusAdress));
+    a.useContexts(CCoreFacadeConfig::forCoreAllLocalInDBus(dBusAdress));
     if (!a.start())
     {
         a.gracefulShutdown();
diff --git a/src/swiftguistandard/swiftguistdapplication.cpp b/src/swiftguistandard/swiftguistdapplication.cpp
index 18f0e1c0e..06b4f5152 100644
--- a/src/swiftguistandard/swiftguistdapplication.cpp
+++ b/src/swiftguistandard/swiftguistdapplication.cpp
@@ -50,13 +50,13 @@ CStatusMessageList CSwiftGuiStdApplication::startHookIn()
     CStatusMessageList msgs;
     if (!dBusAddress.isEmpty() && coreModeStr.isEmpty())
     {
-        coreMode = CoreModes::CoreExternalAudioGui; // default
+        coreMode = CoreModes::CoreExternal; // default
         const CStatusMessage m = CStatusMessage(this, CLogCategory::validation()).
                                  info(u"No DBus address, setting core mode: '%1'")
                                  << CoreModes::coreModeToString(coreMode);
         msgs.push_back(m);
     }
-    else if (dBusAddress.isEmpty() && (coreMode == CoreModes::CoreExternalCoreAudio || coreMode == CoreModes::CoreExternalAudioGui))
+    else if (dBusAddress.isEmpty() && coreMode == CoreModes::CoreExternal)
     {
         dBusAddress = CDBusServer::sessionBusAddress(); // a possible default
         const CStatusMessage m = CStatusMessage(this, CLogCategory::validation()).
@@ -68,12 +68,9 @@ CStatusMessageList CSwiftGuiStdApplication::startHookIn()
     CCoreFacadeConfig runtimeConfig;
     switch (coreMode)
     {
-    case CoreModes::CoreExternalCoreAudio:
+    case CoreModes::CoreExternal:
         runtimeConfig = CCoreFacadeConfig::remote(dBusAddress);
         break;
-    case CoreModes::CoreExternalAudioGui:
-        runtimeConfig = CCoreFacadeConfig::remoteLocalAudio(dBusAddress);
-        break;
     default:
     case CoreModes::CoreInGuiProcess:
         runtimeConfig = CCoreFacadeConfig::local(dBusAddress);
diff --git a/src/swiftlauncher/swiftlauncher.cpp b/src/swiftlauncher/swiftlauncher.cpp
index ff3f1f2be..e173488e5 100644
--- a/src/swiftlauncher/swiftlauncher.cpp
+++ b/src/swiftlauncher/swiftlauncher.cpp
@@ -125,8 +125,8 @@ CEnableForFramelessWindow::WindowMode CSwiftLauncher::getWindowMode() const
 CoreModes::CoreMode CSwiftLauncher::getCoreMode() const
 {
     if (ui->rb_SwiftStandalone->isChecked())      { return CoreModes::CoreInGuiProcess; }
-    if (ui->rb_SwiftCoreAudioOnCore->isChecked()) { return CoreModes::CoreExternalCoreAudio; }
-    if (ui->rb_SwiftCoreAudioOnGui->isChecked())  { return CoreModes::CoreExternalAudioGui; }
+    if (ui->rb_SwiftCoreAudioOnCore->isChecked()) { return CoreModes::CoreExternal; }
+    if (ui->rb_SwiftCoreAudioOnGui->isChecked())  { return CoreModes::CoreExternal; }
 
     Q_ASSERT_X(false, Q_FUNC_INFO, "wrong mode");
     return CoreModes::CoreInGuiProcess;