1 files changed, 13 insertions, 6 deletions
diff --git a/ble/Bluetooth.cpp b/ble/Bluetooth.cpp
index 3db0bfc..13c81b3 100644
--- a/ble/Bluetooth.cpp
+++ b/ble/Bluetooth.cpp
@@ -201,19 +201,26 @@ BluetoothAdapter::BluetoothAdapter() {
 BluetoothAdapter::~BluetoothAdapter() {
 }
 
+// -----------------------------------------------------------------------
+// Bluetooth System. This is not sub-classed by implementations.
+// -----------------------------------------------------------------------
+
 BluetoothSystem::BluetoothSystem() {
 }
 
 BluetoothSystem::~BluetoothSystem() {
-    shutdown();
+    adapters.clear();
 }
 
-shared_ptr<BluetoothAdapter> getAdapter(int hciDevice) {
-    return getAdapterImpl(hciDevice);
-}
+shared_ptr<BluetoothAdapter> BluetoothSystem::getAdapter(string name) {
+    auto it = adapters.find(name);
+
+    if (it == adapters.end()) {
+        auto adapter = adapters[name] = getAdapterImpl(name);
+        return adapter;
+    }
 
-void shutdown() {
-    shutdownImpl();
+    return it->second;
 }
 
 uuid_t makeUuid(const uuid_t base, uint8_t a, uint8_t b) {