diff options
| author |   Tobias Jahnke <tjahnk@users.noreply.github.com> | 2017-08-16 15:54:22 +0200 |
|---|---|---|
| committer | Tobias Jahnke <tjahnk@users.noreply.github.com> | 2017-08-16 16:00:50 +0200 |
| commit | c01c0a73884fc39791862a0a3b5d1759a52c04bf (patch) | |
| tree | 198dc64a04238ba66d67fd3ec083b5c6ae454e7c /HAL-afb/HAL_MOST_UNICENS/hal_most_unicens.c | |
| parent | 999340f641477f94e3730e53d8a8bf39fe93b0c4 (diff) | |
merge changes for new audio interface
Diffstat (limited to 'HAL-afb/HAL_MOST_UNICENS/hal_most_unicens.c')
| -rw-r--r-- | HAL-afb/HAL_MOST_UNICENS/hal_most_unicens.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/HAL-afb/HAL_MOST_UNICENS/hal_most_unicens.c b/HAL-afb/HAL_MOST_UNICENS/hal_most_unicens.c index 7240fe0..4405e61 100644 --- a/HAL-afb/HAL_MOST_UNICENS/hal_most_unicens.c +++ b/HAL-afb/HAL_MOST_UNICENS/hal_most_unicens.c @@ -16,10 +16,10 @@ * */ #define _GNU_SOURCE +#include <string.h> #include "hal-interface.h" -#include "audio-interface.h" +#include "audio-common.h" #include "wrap-json.h" -#include "string.h" #include "wrap_unicens.h" #include "wrap_volume.h" @@ -34,7 +34,7 @@ static int master_volume; static json_bool master_switch; static int pcm_volume[PCM_MAX_CHANNELS]; -void unicens_master_vol_cb(halCtlsEnumT tag, alsaHalCtlMapT *control, void* handle, json_object *j_obj) { +void unicens_master_vol_cb(halCtlsTagT tag, alsaHalCtlMapT *control, void* handle, json_object *j_obj) { const char *j_str = json_object_to_json_string(j_obj); @@ -47,7 +47,7 @@ void unicens_master_vol_cb(halCtlsEnumT tag, alsaHalCtlMapT *control, void* hand } } -void unicens_master_switch_cb(halCtlsEnumT tag, alsaHalCtlMapT *control, void* handle, json_object *j_obj) { +void unicens_master_switch_cb(halCtlsTagT tag, alsaHalCtlMapT *control, void* handle, json_object *j_obj) { const char *j_str = json_object_to_json_string(j_obj); @@ -59,7 +59,7 @@ void unicens_master_switch_cb(halCtlsEnumT tag, alsaHalCtlMapT *control, void* h } } -void unicens_pcm_vol_cb(halCtlsEnumT tag, alsaHalCtlMapT *control, void* handle, json_object *j_obj) { +void unicens_pcm_vol_cb(halCtlsTagT tag, alsaHalCtlMapT *control, void* handle, json_object *j_obj) { const char *j_str = json_object_to_json_string(j_obj); |