diff options
author | inhyeok <i_bc.kim@samsung.com> | 2015-06-25 16:49:28 +0900 |
---|---|---|
committer | inhyeok <i_bc.kim@samsung.com> | 2015-06-26 11:07:41 +0900 |
commit | 7e72265b2a4deca07195129f428769811ea3873d (patch) | |
tree | a22a64344848526120270a6e9fed00f89fe4adcc /test | |
parent | cba5a315ca8abb87ec935048647feaa129f5c277 (diff) | |
download | audio-session-manager-7e72265b2a4deca07195129f428769811ea3873d.tar.gz audio-session-manager-7e72265b2a4deca07195129f428769811ea3873d.tar.bz2 audio-session-manager-7e72265b2a4deca07195129f428769811ea3873d.zip |
Merge based 2.4tizen_3.0.m2.a1_tv_releasetizen_3.0.m2.a1_mobile_releasetizen_3.0.m1_tv_releasetizen_3.0.m1_mobile_releasesubmit/tizen_common/20151026.085049submit/tizen_common/20151023.083358submit/tizen_common/20151019.135620submit/tizen_common/20151015.190624submit/tizen/20150716.043920submit/tizen/20150715.102326submit/tizen/20150715.092047accepted/tizen/wearable/20150717.002925accepted/tizen/wearable/20150716.061216accepted/tizen/tv/20150717.002910accepted/tizen/tv/20150716.061203accepted/tizen/mobile/20150717.002856accepted/tizen/mobile/20150716.061158tizen_3.0.m1_tvtizen_3.0.m1_mobile
[Version] Release 0.3.0
[Profile] Common
[Issue Type] Migration
Merged main changes
- Update vconftool for SoundStatus initialize
- Apply ASLR
- Replace msgqueue to gdbus
- Revise return value of asm callback in asm_testsuite
- Support container
Change-Id: If8fc14a03f1f00a45c7163d9f21a8df8de04f559
Signed-off-by: inhyeok <i_bc.kim@samsung.com>
Diffstat (limited to 'test')
-rw-r--r-- | test/Makefile.am | 2 | ||||
-rw-r--r-- | test/asm_testsuite.c | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index df09a2e..83a7a07 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -7,6 +7,8 @@ asm_testsuite_CFLAGS = -I$(srcdir)/../include \ $(DLOG_CFLAGS) \ $(VCONF_CFLAGS) +asm_testsuite_CFLAGS += -fPIC -pie + asm_testsuite_DEPENDENCIES = $(srcdir)/../.libs/libaudio-session-mgr.la asm_testsuite_LDADD = $(AUDIOSESSIONMGR_LIBS) \ diff --git a/test/asm_testsuite.c b/test/asm_testsuite.c index 88b8f32..c5b963f 100644 --- a/test/asm_testsuite.c +++ b/test/asm_testsuite.c @@ -20,7 +20,17 @@ asm_callback (int handle, ASM_event_sources_t event_src, ASM_sound_commands_t co { g_print ("\n[%s] handle = %d, event src = %d, command = %d, sound_state = %d, cb_data = %p\n\n", __func__, handle, event_src, command, sound_status, cb_data); - return ASM_CB_RES_NONE; + switch (command) { + case ASM_COMMAND_PLAY: + case ASM_COMMAND_RESUME: + return ASM_CB_RES_PLAYING; + case ASM_COMMAND_STOP: + return ASM_CB_RES_STOP; + case ASM_COMMAND_PAUSE: + return ASM_CB_RES_PAUSE; + default: + return ASM_CB_RES_NONE; + } } ASM_cb_result_t |