From 58e2f35653e79c9cf851cc21d32670e35e4f4bf9 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 15 Oct 2019 12:12:33 +0200 Subject: [PATCH] [AFV] Ref T730, use "%Application%" to split audio settings among core and UI * both can have independent settings * user report hanging core - this seems to fix it --- src/blackcore/audio/audiosettings.h | 4 ++-- src/blackmisc/audio/audiosettings.h | 2 +- src/blackmisc/audio/settings/voicesettings.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/blackcore/audio/audiosettings.h b/src/blackcore/audio/audiosettings.h index c40b964df..9eb73364a 100644 --- a/src/blackcore/audio/audiosettings.h +++ b/src/blackcore/audio/audiosettings.h @@ -22,7 +22,7 @@ namespace BlackCore struct TInputDevice : public BlackMisc::TSettingTrait { //! \copydoc BlackMisc::TSettingTrait::key - static const char *key() { return "audio/inputdevice"; } + static const char *key() { return "audio/%Application%/inputdevice"; } //! \copydoc BlackMisc::TSettingTrait::humanReadable static const QString &humanReadable() { static const QString name("Input device"); return name; } @@ -35,7 +35,7 @@ namespace BlackCore struct TOutputDevice : public BlackMisc::TSettingTrait { //! \copydoc BlackMisc::TSettingTrait::key - static const char *key() { return "audio/outputdevice"; } + static const char *key() { return "audio/%Application%/outputdevice"; } //! \copydoc BlackMisc::TSettingTrait::humanReadable static const QString &humanReadable() { static const QString name("Output device"); return name; } diff --git a/src/blackmisc/audio/audiosettings.h b/src/blackmisc/audio/audiosettings.h index 003ee507f..69d7f6b98 100644 --- a/src/blackmisc/audio/audiosettings.h +++ b/src/blackmisc/audio/audiosettings.h @@ -138,7 +138,7 @@ namespace BlackMisc struct TSettings : public TSettingTrait { //! \copydoc BlackMisc::TSettingTrait::key - static const char *key() { return "audio/setup"; } + static const char *key() { return "audio/%Application%/setup"; } //! \copydoc BlackMisc::TSettingTrait::humanReadable static const QString &humanReadable() { static const QString name("Audio"); return name; } diff --git a/src/blackmisc/audio/settings/voicesettings.h b/src/blackmisc/audio/settings/voicesettings.h index 9afe83e3c..4e4fb9a2a 100644 --- a/src/blackmisc/audio/settings/voicesettings.h +++ b/src/blackmisc/audio/settings/voicesettings.h @@ -26,7 +26,7 @@ namespace BlackMisc struct TVoiceSetup : public TSettingTrait { //! \copydoc BlackMisc::TSettingTrait::key - static const char *key() { return "audio/currentvoicesetup"; } + static const char *key() { return "audio/%Application%/currentvoicesetup"; } //! \copydoc BlackMisc::TSettingTrait::humanReadable static const QString &humanReadable() { static const QString name("Voice setup"); return name; }