From 9a57e535616ce2fd84344911b02a6fe471258c93 Mon Sep 17 00:00:00 2001 From: Tobias Jahnke Date: Thu, 10 Aug 2017 16:34:54 +0200 Subject: includes lib-most-volume in HAL UNICENS --- HAL-afb/hal-most-unicens/hal_most_unicens.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'HAL-afb/hal-most-unicens/hal_most_unicens.c') diff --git a/HAL-afb/hal-most-unicens/hal_most_unicens.c b/HAL-afb/hal-most-unicens/hal_most_unicens.c index 394e502..ace9399 100644 --- a/HAL-afb/hal-most-unicens/hal_most_unicens.c +++ b/HAL-afb/hal-most-unicens/hal_most_unicens.c @@ -21,12 +21,13 @@ #include "wrap-json.h" #include "string.h" #include "wrap_unicens.h" +#include "wrap_volume.h" static int master_volume; static json_bool master_switch; static int pcm_volume[6]; -static uint8_t test[3] = {0x07,0x03,0xFF}; +/*static uint8_t test[3] = {0x07,0x03,0xFF};*/ void unicens_master_vol_cb(halCtlsEnumT tag, alsaHalCtlMapT *control, void* handle, json_object *j_obj) { @@ -109,13 +110,19 @@ STATIC int unicens_service_init() { err = wrap_ucs_subscribe_sync(); if (err) { - AFB_ERROR("Failed to subscribe to unicensv2-binding"); + AFB_ERROR("Failed to subscribe to UNICENS binding"); goto OnErrorExit; } err = wrap_ucs_initialize_sync("/home/agluser/DEVELOPMENT/AGL/BINDING/unicens2-binding/data/config_multichannel_audio_kit.xml"); if (err) { - AFB_ERROR("Failed to initialize unicens-v2 binding"); + AFB_ERROR("Failed to initialize UNICENS binding"); + goto OnErrorExit; + } + + err = wrap_volume_init(); + if (err) { + AFB_ERROR("Failed to initialize wrapper for volume library"); goto OnErrorExit; } -- cgit 1.2.3-korg