tobias/waybar
1
0
Fork 0
mirror of https://github.com/rad4day/Waybar.git synced 2023-12-21 10:22:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: adapter renamed to controller

Browse Source 
Since it is also called controller in bluetoothctl
This commit is contained in:
Daan Goossens
2022-05-06 00:38:04 +02:00
parent 13df878bc3
commit 954bed3f5e
3 changed files with 68 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/modules/bluetooth.hpp
View File

@ -12,7 +12,7 @@
namespace waybar::modules {
class Bluetooth : public ALabel {
struct AdapterInfo
struct ControllerInfo
{
std::string path;
std::string address;
@ -29,7 +29,7 @@ class Bluetooth : public ALabel {
struct DeviceInfo
{
std::string path;
std::string paired_adapter;
std::string paired_controller;
std::string address;
std::string address_type;
// std::optional<std::string> name; // just use alias instead
@ -55,9 +55,9 @@ class Bluetooth : public ALabel {
auto getDeviceBatteryPercentage(GDBusObject*) -> std::optional<unsigned char>;
auto getDeviceProperties(GDBusObject*, DeviceInfo&) -> bool;
auto getAdapterProperties(GDBusObject*, AdapterInfo&) -> bool;
auto getControllerProperties(GDBusObject*, ControllerInfo&) -> bool;
auto findCurAdapter(AdapterInfo&) -> bool;
auto findCurController(ControllerInfo&) -> bool;
auto findConnectedDevices(const std::string&, std::vector<DeviceInfo>&) -> void;
@ -67,7 +67,7 @@ class Bluetooth : public ALabel {
const std::unique_ptr<GDBusObjectManager, void (*)(GDBusObjectManager*)> manager_;
std::string state_;
AdapterInfo cur_adapter_;
ControllerInfo cur_controller_;
std::vector<DeviceInfo> connected_devices_;
DeviceInfo cur_focussed_device_;
std::string device_enumerate_;