TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-14 22:56:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor windows medium selector to remove generic type

Browse Source 
PiperOrigin-RevId: 522422530
This commit is contained in:
Anay Wadhera
2023-04-06 13:35:31 -07:00
committed by Copybara-Service
parent 097ff07811
commit bd4f7646f5
2 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/c/connection_options_w.h
+1 -3
View File
@@ -15,6 +15,7 @@
#define THIRD_PARTY_NEARBY_CONNECTIONS_C_CONNECTION_OPTIONS_W_H_
#include <string>
#include "connections/c/dll_config.h"
#include "connections/c/medium_selector_w.h"
#include "connections/c/options_base_w.h"
@@ -24,9 +25,6 @@ extern "C" {
#define MAX_MEDIUMS 6
// Feature On/Off switch for mediums.
using BooleanMediumSelector = MediumSelectorW<bool>;
// Connection Options: used for both Advertising and Discovery.
// All fields are mutable, to make the type copy-assignable.
struct DLL_API ConnectionOptionsW : public OptionsBaseW {
connections/c/medium_selector_w.h
+19 -20
View File
@@ -14,36 +14,38 @@
#ifndef THIRD_PARTY_NEARBY_CONNECTIONS_C_MEDIUM_SELECTOR_W_H_
#define THIRD_PARTY_NEARBY_CONNECTIONS_C_MEDIUM_SELECTOR_W_H_
#include <vector>
#include "proto/connections_enums.pb.h"
namespace nearby::windows {
using MediumW = ::location::nearby::proto::connections::Medium;
// Generic type: allows definition of a feature T for every Medium.
template <typename T>
struct MediumSelectorW {
T bluetooth;
T ble;
T web_rtc;
T wifi_lan;
T wifi_hotspot;
T wifi_direct;
// Feature On/Off switch for mediums.
struct BooleanMediumSelectorW {
bool bluetooth;
bool ble;
bool web_rtc;
bool wifi_lan;
bool wifi_hotspot;
bool wifi_direct;
constexpr MediumSelectorW() = default;
constexpr MediumSelectorW(const MediumSelectorW&) = default;
constexpr MediumSelectorW& operator=(const MediumSelectorW&) = default;
constexpr bool Any(const T& value) const {
BooleanMediumSelectorW() = default;
constexpr BooleanMediumSelectorW(const BooleanMediumSelectorW&) = default;
constexpr BooleanMediumSelectorW& operator=(const BooleanMediumSelectorW&) =
default;
constexpr bool Any(const bool value) const {
return bluetooth == value || ble == value || web_rtc == value ||
wifi_lan == value || wifi_hotspot == value || wifi_direct == value;
}
constexpr bool All(const T& value) const {
constexpr bool All(const bool value) const {
return bluetooth == value && ble == value && web_rtc == value &&
wifi_lan == value && wifi_hotspot == value && wifi_direct == value;
}
constexpr int Count(const T& value) const {
constexpr int Count(const bool value) const {
int count = 0;
if (bluetooth == value) ++count;
if (ble == value) ++count;
@@ -54,7 +56,7 @@ struct MediumSelectorW {
return count;
}
constexpr MediumSelectorW& SetAll(const T& value) {
constexpr BooleanMediumSelectorW& SetAll(const bool value) {
bluetooth = value;
ble = value;
web_rtc = value;
@@ -64,7 +66,7 @@ struct MediumSelectorW {
return *this;
}
std::vector<MediumW> GetMediums(const T& value) const {
std::vector<MediumW> GetMediums(const bool value) const {
std::vector<MediumW> mediums;
// Mediums are sorted in order of decreasing preference.
if (wifi_lan == value) mediums.push_back(MediumW::WIFI_LAN);
@@ -77,9 +79,6 @@ struct MediumSelectorW {
}
};
// Feature On/Off switch for mediums.
using BooleanMediumSelectorW = MediumSelectorW<bool>;
} // namespace nearby::windows
#endif // THIRD_PARTY_NEARBY_CONNECTIONS_C_MEDIUM_SELECTOR_W_H_