diff options
| -rw-r--r-- | ahl-binding/ahl-binding.cpp | 126 | ||||
| -rw-r--r-- | ahl-binding/ahl-binding.hpp | 14 | ||||
| -rw-r--r-- | ahl-binding/role.cpp | 110 | ||||
| -rw-r--r-- | ahl-binding/role.hpp | 18 | ||||
| -rw-r--r-- | conf.d/cmake/config.cmake | 4 |
5 files changed, 136 insertions, 136 deletions
diff --git a/ahl-binding/ahl-binding.cpp b/ahl-binding/ahl-binding.cpp index ce31499..a7cf7d4 100644 --- a/ahl-binding/ahl-binding.cpp +++ b/ahl-binding/ahl-binding.cpp @@ -18,31 +18,27 @@ #include <algorithm> #include "ahl-binding.hpp" -afb_dynapi* AFB_default; // BUG: Is it possible to get rid of this ? - /** * @brief Callback invoked on new api creation. * @param[in] handle Handle to the new api. * @return Status code, zero if success. */ -int ahl_api_create(void*, struct afb_dynapi* handle) +int ahl_api_create(void*, afb_api_t handle) { return ahl_binding_t::instance().preinit(handle); } /** - * @brief Entry point for dynamic API. + * @brief Entry point for API. * @param[in] handle Handle to start with for API creation. * @return Status code, zero if success. */ -int afbBindingEntry(afb_dynapi* handle) +int afbBindingEntry(afb_api_t handle) { using namespace std::placeholders; assert(handle != nullptr); - AFB_default = handle; - - return afb_dynapi_new_api( + afb_api_new_api( handle, HL_API_NAME, HL_API_INFO, @@ -50,13 +46,15 @@ int afbBindingEntry(afb_dynapi* handle) ahl_api_create, nullptr ); + + return 0; } /** * @brief Callback invoked when API enter the init phase. * @return Status code, zero if success. */ -int ahl_api_init(afb_dynapi*) +int ahl_api_init(afb_api_t) { return ahl_binding_t::instance().init(); } @@ -66,7 +64,7 @@ int ahl_api_init(afb_dynapi*) * @param[in] e Event's name. * @param[in] o Event's args. */ -void ahl_api_on_event(afb_dynapi*, const char* e, struct json_object* o) +void ahl_api_on_event(afb_api_t, const char* e, struct json_object* o) { ahl_binding_t::instance().event(e, o); } @@ -76,7 +74,7 @@ void ahl_api_on_event(afb_dynapi*, const char* e, struct json_object* o) * @param[in] o Config section to handle. * @return Status code, zero if success. */ -int ahl_api_config_roles(afb_dynapi*, CtlSectionT*, json_object* o) +int ahl_api_config_roles(afb_api_t, CtlSectionT*, json_object* o) { return ahl_binding_t::instance().parse_roles_config(o); } @@ -85,7 +83,7 @@ int ahl_api_config_roles(afb_dynapi*, CtlSectionT*, json_object* o) * @brief Callback invoked when clients call the verb 'get_roles'. * @param[in] req Request to handle. */ -void ahl_api_get_roles(afb_request* req) +void ahl_api_get_roles(afb_req_t req) { ahl_binding_t::instance().get_roles(req); } @@ -96,7 +94,7 @@ void ahl_api_get_roles(afb_request* req) * * Handle dynamic verbs based on role name ('multimedia', 'navigation', ...) */ -void ahl_api_role(afb_request* req) +void ahl_api_role(afb_req_t req) { role_t* role = (role_t*)req->vcbdata; assert(role != nullptr); @@ -127,7 +125,7 @@ ahl_binding_t& ahl_binding_t::instance() * @param[in] handle Handle to the api. * @return Status code, zero if success. */ -int ahl_binding_t::preinit(afb_dynapi* handle) +int ahl_binding_t::preinit(afb_api_t handle) { handle_ = handle; @@ -136,15 +134,15 @@ int ahl_binding_t::preinit(afb_dynapi* handle) load_static_verbs(); load_controller_configs(); - if (afb_dynapi_on_event(handle_, ahl_api_on_event)) + if (afb_api_on_event(handle_, ahl_api_on_event)) throw std::runtime_error("Failed to register event handler callback."); - if (afb_dynapi_on_init(handle_, ahl_api_init)) + if (afb_api_on_init(handle_, ahl_api_init)) throw std::runtime_error("Failed to register init handler callback."); } catch(std::exception& e) { - AFB_DYNAPI_ERROR(handle, "%s", e.what()); + AFB_API_ERROR(handle, "%s", e.what()); return -1; } @@ -158,22 +156,22 @@ int ahl_binding_t::init() { using namespace std::placeholders; - if (afb_dynapi_require_api(handle_, HAL_MGR_API, 1)) + if (afb_api_require_api(handle_, HAL_MGR_API, 1)) { - AFB_DYNAPI_ERROR(handle_, "Failed to require '%s' API!", HAL_MGR_API); + AFB_API_ERROR(handle_, "Failed to require '%s' API!", HAL_MGR_API); return -1; } - AFB_DYNAPI_NOTICE(handle_, "Required '%s' API found!", HAL_MGR_API); + AFB_API_NOTICE(handle_, "Required '%s' API found!", HAL_MGR_API); - if (afb_dynapi_require_api(handle_, "smixer", 1)) + if (afb_api_require_api(handle_, "smixer", 1)) { - AFB_DYNAPI_ERROR(handle_, "Failed to require 'smixer' API!"); + AFB_API_ERROR(handle_, "Failed to require 'smixer' API!"); return -1; } - AFB_DYNAPI_NOTICE(handle_, "Required 'smixer' API found!"); + AFB_API_NOTICE(handle_, "Required 'smixer' API found!"); - afb_dynapi_seal(handle_); - AFB_DYNAPI_NOTICE(handle_, "API is now sealed!"); + afb_api_seal(handle_); + AFB_API_NOTICE(handle_, "API is now sealed!"); if (update_streams()) return -1; return 0; @@ -186,42 +184,48 @@ int ahl_binding_t::init() int ahl_binding_t::update_streams() { json_object* loaded = nullptr; - json_object* response = nullptr; size_t hals_count = 0, streams_count = 0; - if (afb_dynapi_call_sync(handle_, "4a-hal-manager", "loaded", json_object_new_object(), &loaded)) + if (afb_api_call_sync(handle_, "4a-hal-manager", "loaded", json_object_new_object(), &loaded, nullptr, nullptr)) { - AFB_DYNAPI_ERROR(handle_, "Failed to call 'loaded' verb on '4a-hal-manager' API!"); - if (loaded) AFB_DYNAPI_ERROR(handle_, "%s", json_object_to_json_string(loaded)); + AFB_API_ERROR(handle_, "Failed to call 'loaded' verb on '4a-hal-manager' API!"); + if (loaded) + { + AFB_API_ERROR(handle_, "%s", json_object_to_json_string(loaded)); + json_object_put(loaded); + } return -1; } - json_bool ret = json_object_object_get_ex(loaded, "response", &response); - if (!ret) + + if (!json_object_is_type(loaded, json_type_array)) { - AFB_DYNAPI_ERROR(handle_, "Maformed response; missing 'response' field"); + AFB_API_ERROR(handle_, "Expected an array from '4a-hal-manager/loaded', but got something else!"); + json_object_put(loaded); return -1; } - hals_count = json_object_array_length(response); + hals_count = json_object_array_length(loaded); for(int i = 0; i < hals_count; ++i) { json_object* info = nullptr; - const char* halname = json_object_get_string(json_object_array_get_idx(response, i)); - AFB_DYNAPI_DEBUG(handle_, "Found an active HAL: %s", halname); + const char* halname = json_object_get_string(json_object_array_get_idx(loaded, i)); + AFB_API_DEBUG(handle_, "Found an active HAL: %s", halname); - if (afb_dynapi_call_sync(handle_, halname, "info", json_object_new_object(), &info)) + if (afb_api_call_sync(handle_, halname, "info", json_object_new_object(), &info, nullptr, nullptr)) { - AFB_DYNAPI_ERROR(handle_, "Failed to call 'info' verb on '%s' API!", halname); - if (info) AFB_DYNAPI_ERROR(handle_, "%s", json_object_to_json_string(info)); + AFB_API_ERROR(handle_, "Failed to call 'info' verb on '%s' API!", halname); + if (info) + { + AFB_API_ERROR(handle_, "%s", json_object_to_json_string(info)); + json_object_put(info); + } + json_object_put(loaded); return -1; } - json_object * responseJ = nullptr; - json_object_object_get_ex(info, "response", &responseJ); - json_object* streamsJ = nullptr; - json_object_object_get_ex(responseJ, "streams", &streamsJ); + json_object_object_get_ex(info, "streams", &streamsJ); streams_count = json_object_array_length(streamsJ); for(int j = 0; j < streams_count; ++j) { @@ -258,7 +262,7 @@ void ahl_binding_t::update_stream(std::string halname, std::string stream, std:: if(r.stream() == stream) { if (r.device_uri().size()) - AFB_DYNAPI_WARNING(handle_, "Multiple stream with same name: '%s'.", stream.c_str()); + AFB_API_WARNING(handle_, "Multiple stream with same name: '%s'.", stream.c_str()); else { r.device_uri(deviceid); @@ -270,19 +274,19 @@ void ahl_binding_t::update_stream(std::string halname, std::string stream, std:: void ahl_binding_t::event(std::string name, json_object* arg) { - AFB_DYNAPI_DEBUG(handle_, "Event '%s' received with the following arg: %s", name.c_str(), json_object_to_json_string(arg)); + AFB_API_DEBUG(handle_, "Event '%s' received with the following arg: %s", name.c_str(), json_object_to_json_string(arg)); } void ahl_binding_t::load_static_verbs() { - if (afb_dynapi_add_verb( + if (afb_api_add_verb( handle_, "get_roles", "Retrieve array of available audio roles", ahl_api_get_roles, nullptr, nullptr, - AFB_SESSION_NONE_X2)) + AFB_SESSION_NONE_X2, 0)) { throw std::runtime_error("Failed to add 'get_role' verb to the API."); } @@ -321,18 +325,18 @@ int ahl_binding_t::load_controller_config(const std::string& path) controller_config = CtlLoadMetaData(handle_, path.c_str()); if (!controller_config) { - AFB_DYNAPI_ERROR(handle_, "Failed to load controller from config file!"); + AFB_API_ERROR(handle_, "Failed to load controller from config file!"); return -1; } static CtlSectionT controller_sections[] = { - {.key = "plugins", .uid = nullptr, .info = nullptr, .loadCB = PluginConfig, .handle = nullptr, .actions = nullptr}, - {.key = "onload", .uid = nullptr, .info = nullptr, .loadCB = OnloadConfig, .handle = nullptr, .actions = nullptr}, - {.key = "controls", .uid = nullptr, .info = nullptr, .loadCB = ControlConfig, .handle = nullptr, .actions = nullptr}, - {.key = "events", .uid = nullptr, .info = nullptr, .loadCB = EventConfig, .handle = nullptr, .actions = nullptr}, - {.key = "roles", .uid = nullptr, .info = nullptr, .loadCB = ahl_api_config_roles, .handle = nullptr, .actions = nullptr }, - {.key = nullptr, .uid = nullptr, .info = nullptr, .loadCB = nullptr, .handle = nullptr, .actions = nullptr} + {.key = "plugins", .uid = nullptr, .info = nullptr, .prefix = nullptr, .loadCB = PluginConfig, .handle = nullptr, .actions = nullptr}, + {.key = "onload", .uid = nullptr, .info = nullptr, .prefix = nullptr, .loadCB = OnloadConfig, .handle = nullptr, .actions = nullptr}, + {.key = "controls", .uid = nullptr, .info = nullptr, .prefix = nullptr, .loadCB = ControlConfig, .handle = nullptr, .actions = nullptr}, + {.key = "events", .uid = nullptr, .info = nullptr, .prefix = nullptr, .loadCB = EventConfig, .handle = nullptr, .actions = nullptr}, + {.key = "roles", .uid = nullptr, .info = nullptr, .prefix = nullptr, .loadCB = ahl_api_config_roles, .handle = nullptr, .actions = nullptr }, + {.key = nullptr, .uid = nullptr, .info = nullptr, .prefix = nullptr, .loadCB = nullptr, .handle = nullptr, .actions = nullptr} }; CtlLoadSections(handle_, controller_config, controller_sections); @@ -365,18 +369,18 @@ int ahl_binding_t::parse_roles_config(json_object* o) int ahl_binding_t::create_api_verb(role_t* r) { - AFB_DYNAPI_NOTICE(handle_, "New audio role: %s", r->uid().c_str()); + AFB_API_NOTICE(handle_, "New audio role: %s", r->uid().c_str()); - if (afb_dynapi_add_verb( + if (afb_api_add_verb( handle_, r->uid().c_str(), r->description().c_str(), ahl_api_role, r, nullptr, - AFB_SESSION_NONE_X2)) + AFB_SESSION_NONE_X2, 0)) { - AFB_DYNAPI_ERROR(handle_, "Failed to add '%s' verb to the API.", + AFB_API_ERROR(handle_, "Failed to add '%s' verb to the API.", r->uid().c_str()); return -1; } @@ -384,10 +388,10 @@ int ahl_binding_t::create_api_verb(role_t* r) return 0; } -void ahl_binding_t::get_roles(afb_request* req) +void ahl_binding_t::get_roles(afb_req_t req) { json_bool verbose = FALSE; - json_object* arg = afb_request_json(req); + json_object* arg = afb_req_json(req); json_object* jverbose; if (arg != nullptr) { @@ -401,7 +405,7 @@ void ahl_binding_t::get_roles(afb_request* req) if (verbose == TRUE || r.device_uri().size()) json_object_array_add(result, json_object_new_string(r.uid().c_str())); } - afb_request_success(req, result, nullptr); + afb_req_success(req, result, nullptr); } const std::vector<role_t> ahl_binding_t::roles() const @@ -409,7 +413,7 @@ const std::vector<role_t> ahl_binding_t::roles() const return roles_; } -afb_dynapi* ahl_binding_t::handle() const +afb_api_t ahl_binding_t::handle() const { return handle_; } diff --git a/ahl-binding/ahl-binding.hpp b/ahl-binding/ahl-binding.hpp index aa4b104..0e7bd63 100644 --- a/ahl-binding/ahl-binding.hpp +++ b/ahl-binding/ahl-binding.hpp @@ -36,10 +36,10 @@ class ahl_binding_t { - using role_action = std::function<void(afb_request*, std::string, std::string, json_object*)>; + using role_action = std::function<void(afb_req_t, std::string, std::string, json_object*)>; private: - afb_dynapi* handle_; + afb_api_t handle_; std::vector<role_t> roles_; explicit ahl_binding_t(); @@ -53,19 +53,19 @@ private: void update_stream(std::string hal, std::string stream, std::string deviceuri); int create_api_verb(role_t* r); - void policy_open(afb_request* req, const role_t& role); + void policy_open(afb_req_t req, const role_t& role); public: static ahl_binding_t& instance(); - int preinit(afb_dynapi* handle); + int preinit(afb_api_t handle); int init(); void event(std::string name, json_object* arg); - void get_roles(afb_request* req); + void get_roles(afb_req_t req); const std::vector<role_t> roles() const; - afb_dynapi* handle() const; + afb_api_t handle() const; - void audiorole(afb_request* req); + void audiorole(afb_req_t req); int parse_roles_config(json_object* o); }; diff --git a/ahl-binding/role.cpp b/ahl-binding/role.cpp index a122fc2..b48b58e 100644 --- a/ahl-binding/role.cpp +++ b/ahl-binding/role.cpp @@ -109,7 +109,7 @@ const std::vector<interrupt_t>& role_t::interrupts() const return interrupts_; } -int role_t::apply_policy(afb_request* req) +int role_t::apply_policy(afb_req_t req) { if(interrupts_.size()) { @@ -135,36 +135,34 @@ int role_t::apply_policy(afb_request* req) json_object_get(i.args()); json_object* result = nullptr; - AFB_DYNAPI_DEBUG(ahl_binding_t::instance().handle(), - "Call '%s'/'%s' '%s", + AFB_API_DEBUG(ahl_binding_t::instance().handle(), "Call '%s'/'%s' '%s", r.hal().c_str(), r.stream().c_str(), json_object_to_json_string(arg)); - if(afb_dynapi_call_sync(ahl_binding_t::instance().handle(), r.hal().c_str(), r.stream().c_str(), arg, &result)) + if(afb_api_call_sync(ahl_binding_t::instance().handle(), r.hal().c_str(), r.stream().c_str(), arg, &result, nullptr, nullptr)) { - afb_request_fail(req, "Failed to call 'ramp' action on stream", nullptr); + afb_req_fail(req, "Failed to call 'ramp' action on stream", nullptr); return -1; } - AFB_DYNAPI_DEBUG(ahl_binding_t::instance().handle(), - "POLICY: Applying a ramp to '%s' stream because '%s' is opened and have higher priority!", + AFB_API_DEBUG(ahl_binding_t::instance().handle(), "POLICY: Applying a ramp to '%s' stream because '%s' is opened and have higher priority!", r.stream().c_str(), stream_.c_str()); } } } else { - afb_request_fail(req, "Unkown interrupt uid!", nullptr); + afb_req_fail(req, "Unkown interrupt uid!", nullptr); return -1; } } return 0; } -void role_t::invoke(afb_request* req) +void role_t::invoke(afb_req_t req) { - json_object* arg = afb_request_json(req); + json_object* arg = afb_req_json(req); if (arg == nullptr) { - afb_request_fail(req, "No valid argument!", nullptr); + afb_req_fail(req, "No valid argument!", nullptr); return; } @@ -172,14 +170,14 @@ void role_t::invoke(afb_request* req) json_bool ret = json_object_object_get_ex(arg, "action", &jaction); if (!ret) { - afb_request_fail(req, "No valid action!", nullptr); + afb_req_fail(req, "No valid action!", nullptr); return; } std::string action = json_object_get_string(jaction); if (action.size() == 0) { - afb_request_fail(req, "No valid action!", nullptr); + afb_req_fail(req, "No valid action!", nullptr); return; } @@ -189,36 +187,36 @@ void role_t::invoke(afb_request* req) else if (action == "interrupt") interrupt(req, arg); else if (action == "mute") mute(req, arg); else if (action == "unmute") unmute(req, arg); - else afb_request_fail(req, "Unknown action!", nullptr); + else afb_req_fail(req, "Unknown action!", nullptr); } -void role_t::open(afb_request* r, json_object* o) +void role_t::open(afb_req_t r, json_object* o) { if (opened_) { - afb_request_fail(r, "Already opened!", nullptr); + afb_req_fail(r, "Already opened!", nullptr); return; } if (!apply_policy(r)) { - afb_request_context_set( + afb_req_context_set( r, this, [](void* arg) { role_t * role = (role_t*) arg; - afb_dynapi * api = ahl_binding_t::instance().handle(); + afb_api_t api = ahl_binding_t::instance().handle(); - AFB_DYNAPI_DEBUG(api, "Released role %s\n", role->uid_.c_str()); + AFB_API_DEBUG(api, "Released role %s\n", role->uid_.c_str()); role->opened_ = false; // send a mute command to the HAL. We cannot reuse the do_mute function, - // because in the context here, the afb_request is no longer valid. + // because in the context here, the afb_req_t is no longer valid. json_object* a = json_object_new_object(); json_object_object_add(a, "mute", json_object_new_boolean(true)); - afb_dynapi_call( + afb_api_call( api, role->hal_.c_str(), role->stream_.c_str(), @@ -232,88 +230,88 @@ void role_t::open(afb_request* r, json_object* o) json_object* result = json_object_new_object(); json_object_object_add(result, "device_uri", json_object_new_string(device_uri_.c_str())); - afb_request_success(r, result, nullptr); + afb_req_success(r, result, nullptr); } } -void role_t::close(afb_request* r, json_object* o) +void role_t::close(afb_req_t r, json_object* o) { if (!opened_) { - afb_request_success(r, nullptr, "Already closed!"); + afb_req_success(r, nullptr, "Already closed!"); return; } - if(!afb_request_context_get(r)) + if(!afb_req_context_get(r)) { - afb_request_fail(r, "Stream is opened by another client!", nullptr); + afb_req_fail(r, "Stream is opened by another client!", nullptr); return; } opened_ = false; - afb_request_success(r, nullptr, "Stream closed!"); + afb_req_success(r, nullptr, "Stream closed!"); } -void role_t::mute(afb_request * r, json_object* o) { +void role_t::mute(afb_req_t r, json_object* o) { do_mute(r, true); } -void role_t::unmute(afb_request *r, json_object *o) { +void role_t::unmute(afb_req_t r, json_object *o) { do_mute(r, false); } -void role_t::do_mute(afb_request * r, bool v) { +void role_t::do_mute(afb_req_t r, bool v) { json_object* a = json_object_new_object(); json_object_object_add(a, "mute", json_object_new_boolean(v)); - afb_dynapi * api = ahl_binding_t::instance().handle(); + afb_api_t api = ahl_binding_t::instance().handle(); - afb_dynapi_call( + afb_api_call( api, hal_.c_str(), stream_.c_str(), a, - [](void* closure, int status, json_object* result, afb_dynapi* handle) + [](void* closure, json_object* result, const char* error, const char* info, afb_api_t handle) { - AFB_DYNAPI_DEBUG(handle, "Got the following answer: %s", json_object_to_json_string(result)); - afb_request* r = (afb_request*)closure; + AFB_API_DEBUG(handle, "Got the following answer: %s", json_object_to_json_string(result)); + afb_req_t r = (afb_req_t)closure; json_object_get(result); - if (status) afb_request_fail(r, json_object_to_json_string(result), nullptr); - else afb_request_success(r, result, nullptr); - afb_request_unref(r); + if (error) afb_req_fail(r, json_object_to_json_string(result), nullptr); + else afb_req_success(r, result, nullptr); + afb_req_unref(r); }, - afb_request_addref(r)); + afb_req_addref(r)); } -void role_t::volume(afb_request* r, json_object* o) +void role_t::volume(afb_req_t r, json_object* o) { - afb_dynapi * api = ahl_binding_t::instance().handle(); + afb_api_t api = ahl_binding_t::instance().handle(); - if(!afb_request_has_permission(r, "urn:AGL:permission::public:4a-audio-mixer")) + if(!afb_req_has_permission(r, "urn:AGL:permission::public:4a-audio-mixer")) { if (!opened_) { - afb_request_fail(r, "You have to open the stream first!", nullptr); + afb_req_fail(r, "You have to open the stream first!", nullptr); return; } - if(!afb_request_context_get(r)) + if(!afb_req_context_get(r)) { - afb_request_fail(r, "Stream is opened by another client!", nullptr); + afb_req_fail(r, "Stream is opened by another client!", nullptr); return; } } else { - AFB_DYNAPI_DEBUG(api, "Granted special audio-mixer permission to change volume"); + AFB_API_DEBUG(api, "Granted special audio-mixer permission to change volume"); } json_object* value; json_bool ret = json_object_object_get_ex(o, "value", &value); if (!ret) { - afb_request_fail(r, "No value given!", nullptr); + afb_req_fail(r, "No value given!", nullptr); return; } @@ -322,24 +320,24 @@ void role_t::volume(afb_request* r, json_object* o) json_object* a = json_object_new_object(); json_object_object_add(a, "volume", value); - afb_dynapi_call( + afb_api_call( api, hal_.c_str(), stream_.c_str(), a, - [](void* closure, int status, json_object* result, afb_dynapi* handle) + [](void* closure, json_object* result, const char* error, const char* info, afb_api_t handle) { - AFB_DYNAPI_DEBUG(handle, "Got the following answer: %s", json_object_to_json_string(result)); - afb_request* r = (afb_request*)closure; + AFB_API_DEBUG(handle, "Got the following answer: %s", json_object_to_json_string(result)); + afb_req_t r = (afb_req_t)closure; json_object_get(result); - if (status) afb_request_fail(r, json_object_to_json_string(result), nullptr); - else afb_request_success(r, result, nullptr); - afb_request_unref(r); + if (error) afb_req_fail(r, json_object_to_json_string(result), nullptr); + else afb_req_success(r, result, nullptr); + afb_req_unref(r); }, - afb_request_addref(r)); + afb_req_addref(r)); } -void role_t::interrupt(afb_request* r, json_object* o) +void role_t::interrupt(afb_req_t r, json_object* o) { } diff --git a/ahl-binding/role.hpp b/ahl-binding/role.hpp index 5e64e11..143a717 100644 --- a/ahl-binding/role.hpp +++ b/ahl-binding/role.hpp @@ -35,9 +35,9 @@ private: std::string device_uri_; bool opened_; - int apply_policy(afb_request* req); + int apply_policy(afb_req_t req); - void do_mute(afb_request*, bool); + void do_mute(afb_req_t, bool); public: explicit role_t() = default; @@ -71,12 +71,12 @@ public: void device_uri(std::string v); void priority(int v); - void invoke(afb_request* r); + void invoke(afb_req_t r); - void open(afb_request* r, json_object* o); - void close(afb_request* r, json_object* o); - void volume(afb_request* r, json_object* o); - void interrupt(afb_request* r, json_object* o); - void mute(afb_request* r, json_object* o); - void unmute(afb_request* r, json_object* o); + void open(afb_req_t r, json_object* o); + void close(afb_req_t r, json_object* o); + void volume(afb_req_t r, json_object* o); + void interrupt(afb_req_t r, json_object* o); + void mute(afb_req_t r, json_object* o); + void unmute(afb_req_t r, json_object* o); }; diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 66099cb..cc8bcb3 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -92,9 +92,7 @@ set(COMPILE_OPTIONS -DCONTROL_CONFIG_PATH="${CMAKE_CURRENT_BINARY_DIR}/package/etc:${CMAKE_SOURCE_DIR}/conf.d/project:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}:/var/local/lib/afm/applications/${PROJECT_NAME}" -DCONTROL_PLUGIN_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/plugins/lib:${CMAKE_BINARY_DIR}/package/lib/plugins:/var/local/lib/afm/applications/${PROJECT_NAME}/${PROJECT_VERSION}/lib/plugins" -DCONTROL_LUA_PATH="${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/plugins/lua:${CMAKE_BINARY_DIR}/package/data:/var/local/lib/afm/applications/${PROJECT_NAME}/${PROJECT_VERSION}/var" --DUSE_API_DYN=1 --DAFB_BINDING_VERSION=0 --DAFB_BINDING_WANT_DYNAPI=1 +-DAFB_BINDING_VERSION=3 CACHE STRING "Compilation flags") #set(C_COMPILE_OPTIONS "" CACHE STRING "Compilation flags for C language.") #set(CXX_COMPILE_OPTIONS "" CACHE STRING "Compilation flags for C++ language.") |