From 9721ac6f364ba192fe506aeae2cd09809a9ed7fd Mon Sep 17 00:00:00 2001 From: lx-s Date: Thu, 13 Apr 2023 10:53:00 +0200 Subject: [PATCH] Added new setting. Updated copyright --- WinMute/AboutDlg.cpp | 2 +- WinMute/BluetoothDetector.cpp | 2 +- WinMute/BluetoothDetector.h | 2 +- WinMute/MMNotificationClient.cpp | 2 +- WinMute/MMNotificationClient.h | 2 +- WinMute/MuteControl.cpp | 2 +- WinMute/MuteControl.h | 2 +- WinMute/QuietHoursTimer.cpp | 2 +- WinMute/QuietHoursTimer.h | 2 +- WinMute/SettingsDlg.cpp | 2 +- WinMute/Settings_BluetoothDlg.cpp | 2 +- WinMute/Settings_GeneralDlg.cpp | 2 +- WinMute/Settings_ManageEndpointsDlg.cpp | 0 WinMute/Settings_MuteDlg.cpp | 2 +- WinMute/Settings_QuietHoursDlg.cpp | 2 +- WinMute/Settings_WifiDlg.cpp | 2 +- WinMute/TrayIcon.cpp | 2 +- WinMute/TrayIcon.h | 2 +- WinMute/Utility.cpp | 2 +- WinMute/VistaAudio.cpp | 2 +- WinMute/VistaAudioSessionEvents.cpp | 2 +- WinMute/VistaAudioSessionEvents.h | 2 +- WinMute/WMLog.cpp | 2 +- WinMute/WMLog.h | 2 +- WinMute/WMSettings.cpp | 7 ++++++- WinMute/WMSettings.h | 4 +++- WinMute/WiFiDetector.h | 2 +- WinMute/WifiDetector.cpp | 2 +- WinMute/WinAudio.h | 2 +- WinMute/WinMain.cpp | 2 +- WinMute/WinMute.cpp | 2 +- WinMute/WinMute.h | 2 +- WinMute/common.cpp | 2 +- WinMute/common.h | 2 +- WinMute/resource.h | 8 ++++++-- 35 files changed, 46 insertions(+), 35 deletions(-) create mode 100644 WinMute/Settings_ManageEndpointsDlg.cpp diff --git a/WinMute/AboutDlg.cpp b/WinMute/AboutDlg.cpp index 9c953e1..b7f2c55 100644 --- a/WinMute/AboutDlg.cpp +++ b/WinMute/AboutDlg.cpp @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/BluetoothDetector.cpp b/WinMute/BluetoothDetector.cpp index ba45a12..7991162 100644 --- a/WinMute/BluetoothDetector.cpp +++ b/WinMute/BluetoothDetector.cpp @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/BluetoothDetector.h b/WinMute/BluetoothDetector.h index a8ffe90..2f97717 100644 --- a/WinMute/BluetoothDetector.h +++ b/WinMute/BluetoothDetector.h @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/MMNotificationClient.cpp b/WinMute/MMNotificationClient.cpp index 21dac01..6348cbd 100644 --- a/WinMute/MMNotificationClient.cpp +++ b/WinMute/MMNotificationClient.cpp @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/MMNotificationClient.h b/WinMute/MMNotificationClient.h index 7a9559b..a4eb9c1 100644 --- a/WinMute/MMNotificationClient.h +++ b/WinMute/MMNotificationClient.h @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/MuteControl.cpp b/WinMute/MuteControl.cpp index e63872a..9315815 100644 --- a/WinMute/MuteControl.cpp +++ b/WinMute/MuteControl.cpp @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/MuteControl.h b/WinMute/MuteControl.h index d9ea0db..a566802 100644 --- a/WinMute/MuteControl.h +++ b/WinMute/MuteControl.h @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/QuietHoursTimer.cpp b/WinMute/QuietHoursTimer.cpp index 7af79b2..6bd8475 100644 --- a/WinMute/QuietHoursTimer.cpp +++ b/WinMute/QuietHoursTimer.cpp @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/QuietHoursTimer.h b/WinMute/QuietHoursTimer.h index 3eea76e..8ac977f 100644 --- a/WinMute/QuietHoursTimer.h +++ b/WinMute/QuietHoursTimer.h @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/SettingsDlg.cpp b/WinMute/SettingsDlg.cpp index cf433ad..6f82de0 100644 --- a/WinMute/SettingsDlg.cpp +++ b/WinMute/SettingsDlg.cpp @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/Settings_BluetoothDlg.cpp b/WinMute/Settings_BluetoothDlg.cpp index ee9de6b..f6069e9 100644 --- a/WinMute/Settings_BluetoothDlg.cpp +++ b/WinMute/Settings_BluetoothDlg.cpp @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/Settings_GeneralDlg.cpp b/WinMute/Settings_GeneralDlg.cpp index b9fd2ab..ff06889 100644 --- a/WinMute/Settings_GeneralDlg.cpp +++ b/WinMute/Settings_GeneralDlg.cpp @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/Settings_ManageEndpointsDlg.cpp b/WinMute/Settings_ManageEndpointsDlg.cpp new file mode 100644 index 0000000..e69de29 diff --git a/WinMute/Settings_MuteDlg.cpp b/WinMute/Settings_MuteDlg.cpp index c9a456f..7be5ab9 100644 --- a/WinMute/Settings_MuteDlg.cpp +++ b/WinMute/Settings_MuteDlg.cpp @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/Settings_QuietHoursDlg.cpp b/WinMute/Settings_QuietHoursDlg.cpp index 246131a..a563e28 100644 --- a/WinMute/Settings_QuietHoursDlg.cpp +++ b/WinMute/Settings_QuietHoursDlg.cpp @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/Settings_WifiDlg.cpp b/WinMute/Settings_WifiDlg.cpp index cf17a4c..12e5175 100644 --- a/WinMute/Settings_WifiDlg.cpp +++ b/WinMute/Settings_WifiDlg.cpp @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/TrayIcon.cpp b/WinMute/TrayIcon.cpp index 9d30015..6e617ef 100644 --- a/WinMute/TrayIcon.cpp +++ b/WinMute/TrayIcon.cpp @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/TrayIcon.h b/WinMute/TrayIcon.h index 3176e0a..6d7cc10 100644 --- a/WinMute/TrayIcon.h +++ b/WinMute/TrayIcon.h @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/Utility.cpp b/WinMute/Utility.cpp index 924bcc2..8e66a6f 100644 --- a/WinMute/Utility.cpp +++ b/WinMute/Utility.cpp @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/VistaAudio.cpp b/WinMute/VistaAudio.cpp index 1a66daa..3a7f554 100644 --- a/WinMute/VistaAudio.cpp +++ b/WinMute/VistaAudio.cpp @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/VistaAudioSessionEvents.cpp b/WinMute/VistaAudioSessionEvents.cpp index 1d5d22a..7b876bc 100644 --- a/WinMute/VistaAudioSessionEvents.cpp +++ b/WinMute/VistaAudioSessionEvents.cpp @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/VistaAudioSessionEvents.h b/WinMute/VistaAudioSessionEvents.h index 103d506..5bda36b 100644 --- a/WinMute/VistaAudioSessionEvents.h +++ b/WinMute/VistaAudioSessionEvents.h @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/WMLog.cpp b/WinMute/WMLog.cpp index 08b7b51..fc3ef5f 100644 --- a/WinMute/WMLog.cpp +++ b/WinMute/WMLog.cpp @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/WMLog.h b/WinMute/WMLog.h index 73465aa..08c0229 100644 --- a/WinMute/WMLog.h +++ b/WinMute/WMLog.h @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/WMSettings.cpp b/WinMute/WMSettings.cpp index 6cf51bc..68dec2a 100644 --- a/WinMute/WMSettings.cpp +++ b/WinMute/WMSettings.cpp @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -80,6 +80,9 @@ static const wchar_t* KeyToStr(SettingsKey key) case SettingsKey::MUTE_ON_WLAN_ALLOWLIST: keyStr = L"MuteOnWlanAllowList"; break; + case SettingsKey::MUTE_INDIVIDUAL_ENDPOINTS: + keyStr = L"MuteIndividualEndpoints"; + break; case SettingsKey::QUIETHOURS_ENABLE: keyStr = L"QuietHoursEnabled"; break; @@ -126,6 +129,8 @@ static DWORD GetDefaultSetting(SettingsKey key) return 0; case SettingsKey::MUTE_ON_WLAN_ALLOWLIST: return 0; + case SettingsKey::MUTE_INDIVIDUAL_ENDPOINTS: + return 0; case SettingsKey::QUIETHOURS_ENABLE: return 0; case SettingsKey::QUIETHOURS_FORCEUNMUTE: diff --git a/WinMute/WMSettings.h b/WinMute/WMSettings.h index 8e2d905..c99d310 100644 --- a/WinMute/WMSettings.h +++ b/WinMute/WMSettings.h @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -47,6 +47,8 @@ enum class SettingsKey { , MUTE_ON_BLUETOOTH_DEVICELIST , MUTE_ON_WLAN , MUTE_ON_WLAN_ALLOWLIST + // 0 = mute all, 1 = mute specific (allowlist), 2 = mute specific (blocklist) + , MUTE_INDIVIDUAL_ENDPOINTS , QUIETHOURS_ENABLE , QUIETHOURS_FORCEUNMUTE , QUIETHOURS_NOTIFICATIONS diff --git a/WinMute/WiFiDetector.h b/WinMute/WiFiDetector.h index 7667b46..f268af3 100644 --- a/WinMute/WiFiDetector.h +++ b/WinMute/WiFiDetector.h @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/WifiDetector.cpp b/WinMute/WifiDetector.cpp index b70b7fa..428461b 100644 --- a/WinMute/WifiDetector.cpp +++ b/WinMute/WifiDetector.cpp @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/WinAudio.h b/WinMute/WinAudio.h index 8a827a5..2152cba 100644 --- a/WinMute/WinAudio.h +++ b/WinMute/WinAudio.h @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/WinMain.cpp b/WinMute/WinMain.cpp index 8e4c2cd..dd8fb14 100644 --- a/WinMute/WinMain.cpp +++ b/WinMute/WinMain.cpp @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/WinMute.cpp b/WinMute/WinMute.cpp index 894b329..7ca9a9d 100644 --- a/WinMute/WinMute.cpp +++ b/WinMute/WinMute.cpp @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/WinMute.h b/WinMute/WinMute.h index c794c81..8aa747b 100644 --- a/WinMute/WinMute.h +++ b/WinMute/WinMute.h @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/common.cpp b/WinMute/common.cpp index 6e47737..20b87ba 100644 --- a/WinMute/common.cpp +++ b/WinMute/common.cpp @@ -1,5 +1,5 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/common.h b/WinMute/common.h index bfcaa85..f4a52e1 100644 --- a/WinMute/common.h +++ b/WinMute/common.h @@ -1,6 +1,6 @@ /* WinMute - Copyright (c) 2022, Alexander Steinhoefer + Copyright (c) 2023, Alexander Steinhoefer ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/WinMute/resource.h b/WinMute/resource.h index 13f17da..8412e7e 100644 --- a/WinMute/resource.h +++ b/WinMute/resource.h @@ -20,6 +20,7 @@ #define IDD_SETTINGS_BLUETOOTH 131 #define IDD_DIALOG1 133 #define IDD_SETTINGS_BLUETOOTH_ADD 133 +#define IDD_MANAGE_ENDPOINTS 135 #define IDC_LINK_HOMEPAGE 1001 #define IDC_LINK_SUPPORT 1002 #define IDC_LINK_PROJECT 1002 @@ -74,6 +75,9 @@ #define IDC_LOGFILEPATH 1040 #define IDC_BUTTON1 1041 #define IDC_MANAGE_ENDPOINTS 1041 +#define IDC_ENDPOINT_LIST_IS_ALLOWLIST 1042 +#define IDC_MUTE_SPECIFIC_ENDPOINTS2 1043 +#define IDC_ENDPOINT_LIST_IS_BLOCKLIST 1043 #define ID_TRAYMENU_INFO 40001 #define ID_TRAYMENU_ 40002 #define ID_TRAYMENU_MUTEON 40003 @@ -115,9 +119,9 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 135 +#define _APS_NEXT_RESOURCE_VALUE 137 #define _APS_NEXT_COMMAND_VALUE 40037 -#define _APS_NEXT_CONTROL_VALUE 1042 +#define _APS_NEXT_CONTROL_VALUE 1043 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif -- 2.43.0