sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 01:18:36 +02:00
Code Issues Projects Releases Wiki Activity

Replaced formal parameter filter in addmessagecallback and addeventcallback

Browse Source
This commit is contained in:
EricLiu2000
2019-08-06 10:31:08 -04:00
parent 4a81b9443a
commit 01c62b6445
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/icsneoc/icsneoc.cpp
+2 -2
View File
@@ -243,7 +243,7 @@ bool icsneo_setPollingMessageLimit(const neodevice_t* device, size_t newLimit) {
return true; return true;
} }
int icsneo_addMessageCallback(const neodevice_t* device, void (*callback)(neomessage_t), void* filter) { int icsneo_addMessageCallback(const neodevice_t* device, void (*callback)(neomessage_t), void*) {
if(!icsneo_isValidNeoDevice(device)) if(!icsneo_isValidNeoDevice(device))
return -1; return -1;
@@ -489,7 +489,7 @@ neoversion_t icsneo_getVersion(void) {
return icsneo::GetVersion(); return icsneo::GetVersion();
} }
int icsneo_addEventCallback(void (*callback)(neoevent_t), void* filter) { int icsneo_addEventCallback(void (*callback)(neoevent_t), void*) {
return EventManager::GetInstance().addEventCallback( return EventManager::GetInstance().addEventCallback(
EventCallback( EventCallback(
[=](std::shared_ptr<icsneo::APIEvent> evt) { [=](std::shared_ptr<icsneo::APIEvent> evt) {
include/icsneo/icsneoc.h
+4 -4
View File
@@ -291,7 +291,7 @@ extern bool DLLExport icsneo_setPollingMessageLimit(const neodevice_t* device, s
* \param[in] filter Unused for now. Exists as a placeholder here for future backwards-compatibility. * \param[in] filter Unused for now. Exists as a placeholder here for future backwards-compatibility.
* \returns The id of the callback added, or -1 if the operation failed. * \returns The id of the callback added, or -1 if the operation failed.
*/ */
extern int DLLExport icsneo_addMessageCallback(const neodevice_t* device, void (*callback)(neomessage_t), void* filter); extern int DLLExport icsneo_addMessageCallback(const neodevice_t* device, void (*callback)(neomessage_t), void*);
/** /**
* \brief Removes a message callback from the specified device. * \brief Removes a message callback from the specified device.
@@ -596,7 +596,7 @@ extern neoversion_t DLLExport icsneo_getVersion(void);
* *
* Do not attempt to add or remove callbacks inside of a callback, as the stored callbacks are locked during calls. * Do not attempt to add or remove callbacks inside of a callback, as the stored callbacks are locked during calls.
*/ */
extern int DLLExport icsneo_addEventCallback(void (*callback)(neoevent_t), void* filter); extern int DLLExport icsneo_addEventCallback(void (*callback)(neoevent_t), void*);
/** /**
* \brief Removes an event callback. * \brief Removes an event callback.
@@ -773,7 +773,7 @@ fn_icsneo_getPollingMessageLimit icsneo_getPollingMessageLimit;
typedef bool(*fn_icsneo_setPollingMessageLimit)(const neodevice_t* device, size_t newLimit); typedef bool(*fn_icsneo_setPollingMessageLimit)(const neodevice_t* device, size_t newLimit);
fn_icsneo_setPollingMessageLimit icsneo_setPollingMessageLimit; fn_icsneo_setPollingMessageLimit icsneo_setPollingMessageLimit;
typedef int(*fn_icsneo_addMessageCallback)(const neodevice_t* device, void (*callback)(neomessage_t), void* filter); typedef int(*fn_icsneo_addMessageCallback)(const neodevice_t* device, void (*callback)(neomessage_t), void*);
fn_icsneo_addMessageCallback icsneo_addMessageCallback; fn_icsneo_addMessageCallback icsneo_addMessageCallback;
typedef bool(*fn_icsneo_removeMessageCallback)(const neodevice_t* device, int id); typedef bool(*fn_icsneo_removeMessageCallback)(const neodevice_t* device, int id);
@@ -833,7 +833,7 @@ fn_icsneo_describeDevice icsneo_describeDevice;
typedef neoversion_t(*fn_icsneo_getVersion)(void); typedef neoversion_t(*fn_icsneo_getVersion)(void);
fn_icsneo_getVersion icsneo_getVersion; fn_icsneo_getVersion icsneo_getVersion;
typedef int(*fn_icsneo_addEventCallback)(void (*callback)(neoevent_t), void* filter); typedef int(*fn_icsneo_addEventCallback)(void (*callback)(neoevent_t), void*);
fn_icsneo_addEventCallback icsneo_addEventCallback; fn_icsneo_addEventCallback icsneo_addEventCallback;
typedef bool(*fn_icsneo_removeEventCallback)(int id); typedef bool(*fn_icsneo_removeEventCallback)(int id);