DevAttachment:Rename: api=>stimbuffapi, implexor=>qualeiface
This commit is contained in:
@@ -110,9 +110,9 @@ spec_body:
|
||||
$$ = new smo::device::DeviceAttachmentSpec();
|
||||
$$->deviceIdentifier = std::string($1);
|
||||
$$->sensorType = '\0'; // This will be set by the parent rule
|
||||
$$->implexor = std::string($3);
|
||||
$$->api = std::string($5);
|
||||
$$->apiParams = std::move(*$7);
|
||||
$$->qualeIfaceApi = std::string($3);
|
||||
$$->stimBuffApi = std::string($5);
|
||||
$$->stimBuffApiParams = std::move(*$7);
|
||||
$$->provider = std::string($10);
|
||||
$$->providerParams = std::move(*$12);
|
||||
$$->deviceSelector = std::string($15);
|
||||
|
||||
@@ -361,7 +361,7 @@ public:
|
||||
if (senseApiLib->isBeingDestroyed.load())
|
||||
{
|
||||
std::cerr << std::string(__func__) + ": Library is being destroyed"
|
||||
<< " for API '" << spec->api << "'. Bailing out." << std::endl;
|
||||
<< " for API '" << spec->stimBuffApi << "'. Bailing out.\n";
|
||||
callOriginalCb(false, spec);
|
||||
return;
|
||||
}
|
||||
@@ -430,7 +430,7 @@ public:
|
||||
if (senseApiLib->isBeingDestroyed.load())
|
||||
{
|
||||
std::cerr << std::string(__func__) + ": Library is being destroyed"
|
||||
<< " for API '" << spec->api << "'. Bailing out." << std::endl;
|
||||
<< " for API '" << spec->stimBuffApi << "'. Bailing out.\n";
|
||||
callOriginalCb(false, spec);
|
||||
return;
|
||||
}
|
||||
@@ -476,12 +476,12 @@ void DeviceManager::attachSenseDeviceReq(
|
||||
|
||||
// Get the sense API lib's qutex
|
||||
auto libOpt = sense_api::SenseApiManager::getInstance()
|
||||
.getSenseApiLibByApiName(spec->api);
|
||||
.getSenseApiLibByApiName(spec->stimBuffApi);
|
||||
|
||||
if (!libOpt)
|
||||
{
|
||||
std::cerr << "attachSenseDeviceReq: No library found for API '"
|
||||
<< spec->api << "'" << std::endl;
|
||||
<< spec->stimBuffApi << "'" << std::endl;
|
||||
cb.callbackFn(false, spec);
|
||||
return;
|
||||
}
|
||||
@@ -511,12 +511,12 @@ void DeviceManager::detachSenseDeviceReq(
|
||||
|
||||
// Get the sense API lib's qutex
|
||||
auto libOpt = sense_api::SenseApiManager::getInstance()
|
||||
.getSenseApiLibByApiName(spec->api);
|
||||
.getSenseApiLibByApiName(spec->stimBuffApi);
|
||||
|
||||
if (!libOpt)
|
||||
{
|
||||
std::cerr << "detachSenseDeviceReq: No library found for API '"
|
||||
<< spec->api << "'" << std::endl;
|
||||
<< spec->stimBuffApi << "'" << std::endl;
|
||||
cb.callbackFn(false, spec);
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user