diff options
| author |   Kazumasa Mitsunari <knimitz@witz-inc.co.jp> | 2018-07-12 18:00:20 +0900 |
|---|---|---|
| committer | Kazumasa Mitsunari <knimitz@witz-inc.co.jp> | 2018-07-12 18:00:20 +0900 |
| commit | 8e39dcdb059470dea82d9bfaa17dc9fe912fb9d2 (patch) | |
| tree | 4b5a84140b515b41822008ac9491e595c34f86da /src | |
| parent | 63d88bc4aba4148862b2a7441611f2fe7cfdb7a8 (diff) | |
Alwayls enable High Level API
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/sm-def.h | 4 | ||||
| -rw-r--r-- | src/soundmanager.c | 2 | ||||
| -rw-r--r-- | src/soundmanager.h | 6 |
4 files changed, 1 insertions, 18 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index aa69b85..a9e0e7b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -27,13 +27,6 @@ set(binding_sm_sources sm-helper.c dbus/audio_manager_interface.c) -option(ENABLE_AGL_AHL "Implement AGL High Level API" ON) - -if(ENABLE_AGL_AHL) - message(STATUS "Adopt high level API of AGL") - add_definitions(-DENABLE_AGL_AHL) -endif() - include_directories(dbus) link_libraries(-Wl,--as-needed -Wl,--gc-sections -Wl,--no-undefined) diff --git a/src/sm-def.h b/src/sm-def.h index a735cdd..9d4acb5 100644 --- a/src/sm-def.h +++ b/src/sm-def.h @@ -55,7 +55,6 @@ #define KEY_CONNECTION_FORMAT "connectionFormat" #define KEY_EVENT "event" -#ifdef ENABLE_AGL_AHL #define KEY_AHL_AUDIO_ROLE "audio_role" #define KEY_AHL_ENDPOINT_ID "endpoint_id" #define KEY_AHL_ENDPOINT_TYPE "endpoint_type" @@ -64,8 +63,7 @@ typedef enum { ENDPOINT_SINK, ENDPOINT_SOURCE, } EndPointType; -#endif #define MAX_LENGTH_STRING 256 -#endif // SOUNDMANAGER_DEFINE_H
\ No newline at end of file +#endif // SOUNDMANAGER_DEFINE_H diff --git a/src/soundmanager.c b/src/soundmanager.c index 689c358..2df7bd3 100644 --- a/src/soundmanager.c +++ b/src/soundmanager.c @@ -754,7 +754,6 @@ void unsubscribe(struct afb_req request) ****** High Level API *********** * */ -#ifdef ENABLE_AGL_AHL void streamOpen(struct afb_req req){ AFB_DEBUG("call %s", __FUNCTION__); // register audio role and endpoint @@ -820,7 +819,6 @@ void setStreamState(struct afb_req req){ /* ********** Callback Function invoked by Audio Manager ********** */ -#endif typedef struct source { struct source* next; diff --git a/src/soundmanager.h b/src/soundmanager.h index d34522f..e9e65ea 100644 --- a/src/soundmanager.h +++ b/src/soundmanager.h @@ -315,8 +315,6 @@ void subscribe(struct afb_req request); */ void unsubscribe(struct afb_req request); -#ifdef ENABLE_AGL_AHL - /** * Application High Level API for AGL * This function opens "stream". @@ -377,8 +375,6 @@ void setStreamState(struct afb_req req); ********** Event list from Sound Manager ********** */ -#endif - /* ********** Application Framework Imprement ********** @@ -388,7 +384,6 @@ void setStreamState(struct afb_req req); * array of the verbs exported to afb-daemon */ const struct afb_verb_v2 binding_verbs[]= { -#ifdef ENABLE_AGL_AHL // High Level API of AGL { .verb = "stream_open", .callback = streamOpen, .auth = NULL, .info = "Open stream." , .session = AFB_SESSION_NONE}, @@ -396,7 +391,6 @@ const struct afb_verb_v2 binding_verbs[]= { .info = "Close stream" , .session = AFB_SESSION_NONE}, { .verb = "set_stream_state", .callback = setStreamState, .auth = NULL, .info = "Set stream state" , .session = AFB_SESSION_NONE}, -#endif // Adaption API of Audio Manager { .verb = "connect", .callback = connect, .auth = NULL, .info = "Connect source id and sink id" , .session = AFB_SESSION_NONE}, |