From 26df5c4a7f54d493a09724a5f4f8f4a3a5c90f31 Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Mon, 12 Feb 2024 17:07:39 +1100
Subject: Remember per-device bluetooth volume

---
 src/drivers/bluetooth.cpp | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'src/drivers/bluetooth.cpp')

diff --git a/src/drivers/bluetooth.cpp b/src/drivers/bluetooth.cpp
index 1a303748..84c81de0 100644
--- a/src/drivers/bluetooth.cpp
+++ b/src/drivers/bluetooth.cpp
@@ -103,21 +103,12 @@ auto Bluetooth::IsConnected() -> bool {
   return bluetooth::BluetoothState::is_in_state<bluetooth::Connected>();
 }
 
-auto Bluetooth::ConnectedDevice() -> std::optional<bluetooth::Device> {
+auto Bluetooth::ConnectedDevice() -> std::optional<bluetooth::MacAndName> {
   auto lock = bluetooth::BluetoothState::lock();
   if (!bluetooth::BluetoothState::is_in_state<bluetooth::Connected>()) {
     return {};
   }
-  auto looking_for = bluetooth::BluetoothState::preferred_device();
-  if (!looking_for) {
-    return {};
-  }
-  for (const auto& dev : bluetooth::BluetoothState::devices()) {
-    if (dev.address == looking_for->mac) {
-      return dev;
-    }
-  }
-  return {};
+  return bluetooth::BluetoothState::preferred_device();
 }
 
 auto Bluetooth::KnownDevices() -> std::vector<bluetooth::Device> {
-- 
cgit v1.2.3