diff options
| author | Sven Gothel <[email protected]> | 2020-06-09 20:58:17 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2020-06-09 20:58:17 +0200 |
| commit | dd8c46d923c5beeea201d0e0b9445699cec0ebf8 (patch) | |
| tree | 89f7902a121c8ee3f47ff92410c209851ccc38f6 /src | |
| parent | 02c270b54ba9845b1cdeccb793504b61ecffb6dd (diff) | |
BluetoothManager startDiscovery(): Add @Deprecated tag; Fix misc DBG_PRINT commands
Diffstat (limited to 'src')
| -rw-r--r-- | src/direct_bt/DBTAdapter.cpp | 8 | ||||
| -rw-r--r-- | src/direct_bt/DBTDevice.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/direct_bt/DBTAdapter.cpp b/src/direct_bt/DBTAdapter.cpp index 5b2a7643..7427b13e 100644 --- a/src/direct_bt/DBTAdapter.cpp +++ b/src/direct_bt/DBTAdapter.cpp @@ -476,9 +476,9 @@ bool DBTAdapter::mgmtEvNewSettingsCB(std::shared_ptr<MgmtEvent> e) { AdapterSetting old_setting = adapterInfo->getCurrentSetting(); AdapterSetting changes = adapterInfo->setCurrentSetting(event.getSettings()); DBG_PRINT("DBTAdapter::EventCB:NewSettings: %s -> %s, changes %s", - adapterSettingsToString(old_setting).c_str(), - adapterSettingsToString(adapterInfo->getCurrentSetting()).c_str(), - adapterSettingsToString(changes).c_str() ); + getAdapterSettingsString(old_setting).c_str(), + getAdapterSettingsString(adapterInfo->getCurrentSetting()).c_str(), + getAdapterSettingsString(changes).c_str() ); int i=0; for_each_idx_mtx(mtx_statusListenerList, statusListenerList, [&](std::shared_ptr<AdapterStatusListener> &l) { @@ -570,7 +570,7 @@ bool DBTAdapter::mgmtEvDeviceConnectedCB(std::shared_ptr<MgmtEvent> e) { } } DBG_PRINT("DBTAdapter::EventCB:DeviceConnected(dev_id %d, new_connect %d, updated %s): %s,\n %s\n -> %s", - dev_id, new_connect, eirDataMaskToString(updateMask).c_str(), event.toString().c_str(), ad_report.toString().c_str(), device->toString().c_str()); + dev_id, new_connect, getEIRDataMaskString(updateMask).c_str(), event.toString().c_str(), ad_report.toString().c_str(), device->toString().c_str()); if( EIRDataType::NONE != updateMask || 0 < new_connect ) { device->notifyConnected(); int i=0; diff --git a/src/direct_bt/DBTDevice.cpp b/src/direct_bt/DBTDevice.cpp index 6d7c3b55..f27beef8 100644 --- a/src/direct_bt/DBTDevice.cpp +++ b/src/direct_bt/DBTDevice.cpp @@ -461,7 +461,7 @@ std::vector<std::shared_ptr<GATTService>> DBTDevice::getGATTServices() { const uint64_t ts = getCurrentMilliseconds(); EIRDataType updateMask = update(*gattGenericAccess, ts); DBG_PRINT("DBTDevice::getGATTServices: updated %s:\n %s\n -> %s", - eirDataMaskToString(updateMask).c_str(), gattGenericAccess->toString().c_str(), toString().c_str()); + getEIRDataMaskString(updateMask).c_str(), gattGenericAccess->toString().c_str(), toString().c_str()); if( EIRDataType::NONE != updateMask ) { std::shared_ptr<DBTDevice> sharedInstance = getSharedInstance(); if( nullptr == sharedInstance ) { |