@@ -27,33 +27,25 @@ FSTR(RANGE, rangeValueDelta); // "rangeValueDelta"
2727 * @snippet callbacks.cpp onRangeValue
2828 **/
2929
30- using GenericRangeValueCallback_int = std::function< bool ( const String &, const String &, int &)> ;
31- using GenericRangeValueCallback_float = std::function< bool ( const String &, const String &, float &)> ;
30+ using GenericRangeValueCallback_int = bool (*)( const String &, const String &, int &);
31+ using GenericRangeValueCallback_float = bool (*)( const String &, const String &, float &);
3232
3333struct GenericRangeValueCallback {
3434 GenericRangeValueCallback () : type(type_unknown) {}
35- GenericRangeValueCallback (GenericRangeValueCallback_int cb) : type(type_int), callback(cb) {}
36- GenericRangeValueCallback (GenericRangeValueCallback_float cb) : type(type_float), callback(cb) {}
37- ~GenericRangeValueCallback () {};
38- GenericRangeValueCallback& operator =(const GenericRangeValueCallback& other) { this ->callback = other.callback ; this ->type = other.type ; return *this ; };
35+ GenericRangeValueCallback (GenericRangeValueCallback_int cb) : type(type_int), cb_int(cb) {}
36+ GenericRangeValueCallback (GenericRangeValueCallback_float cb) : type(type_float), cb_float(cb) {}
3937 enum {
4038 type_unknown,
4139 type_int,
4240 type_float
4341 } type;
44- union Callback {
45- Callback () {};
46- Callback (const GenericRangeValueCallback_int& cb) : cb_int (cb) {};
47- Callback (const GenericRangeValueCallback_float& cb) : cb_float (cb) {};
48- Callback& operator =(const Callback& other) { cb_int = other.cb_int ; return *this ; }
49- ~Callback (){};
50-
42+ union {
5143 GenericRangeValueCallback_int cb_int;
5244 GenericRangeValueCallback_float cb_float;
53- } callback ;
45+ };
5446};
5547
56- using SetRangeValueCallback = std::function< bool ( const String &, int &)> ;
48+ using SetRangeValueCallback = bool (*)( const String &, int &);
5749
5850/* *
5951 * @brief Callback definition for onRangeValue function on a specific instance
0 commit comments