From 6cbd2d948649a2cdd55c9f33b0f9362296c278f1 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 15 Oct 2019 01:02:42 +0200 Subject: [PATCH] [AFV] Ref T739 remove unused old coreaudio arguments --- src/blackcore/application.cpp | 3 ++- src/swiftcore/swiftcore.cpp | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp index 3dd663908..60cbb2da0 100644 --- a/src/blackcore/application.cpp +++ b/src/blackcore/application.cpp @@ -302,7 +302,8 @@ namespace BlackCore static const QString launcher = CApplication::getExecutableForApplication(CApplicationInfo::Application::Laucher); if (launcher.isEmpty() || CApplication::isApplicationRunning(CApplicationInfo::Laucher)) { return false; } - const QStringList args = this->argumentsJoined({}, { "--dbus", "--core", "--coreaudio" }); + // const QStringList args = this->argumentsJoined({}, { "--dbus", "--core", "--coreaudio" }); + const QStringList args = this->argumentsJoined({}, { "--dbus", "--core" }); return QProcess::startDetached(launcher, args); } diff --git a/src/swiftcore/swiftcore.cpp b/src/swiftcore/swiftcore.cpp index 3660d92ff..92ce200c8 100644 --- a/src/swiftcore/swiftcore.cpp +++ b/src/swiftcore/swiftcore.cpp @@ -157,7 +157,9 @@ void CSwiftCore::restart() if (!sGui || sGui->isShuttingDown()) { return; } ui->pb_Restart->setEnabled(false); const QStringList args = this->getRestartCmdArgs(); - sGui->restartApplication(args, { "--coreaudio" }); + sGui->restartApplication(args); + + // sGui->restartApplication(args, { "--coreaudio" }); } void CSwiftCore::disconnectFromNetwork() @@ -173,14 +175,14 @@ void CSwiftCore::disconnectFromNetwork() QString CSwiftCore::getAudioCmdFromRadioButtons() const { - if (ui->rb_AudioOnCore->isChecked()) { return QStringLiteral("--coreaudio"); } + // if (ui->rb_AudioOnCore->isChecked()) { return QStringLiteral("--coreaudio"); } return {}; } QStringList CSwiftCore::getRestartCmdArgs() const { - const QString coreAudio = this->getAudioCmdFromRadioButtons(); + // const QString coreAudio = this->getAudioCmdFromRadioButtons(); QStringList cmds = ui->comp_DBusSelector->getDBusCmdLineArgs(); - if (!coreAudio.isEmpty()) { cmds.append(coreAudio); } + // if (!coreAudio.isEmpty()) { cmds.append(coreAudio); } return cmds; }