From 26ab64c1f254c12f1b5b65d3db13ac66e9708369 Mon Sep 17 00:00:00 2001 From: Sangchul Lee Date: Thu, 2 Feb 2017 16:29:07 +0900 Subject: [PATCH] sound-server: Enable session backward compatibility and fix codes to pass session option to MMSoundMgrCodecPlay() [Version] 0.10.86 [Profile] Common [Issue Type] Bug fix Change-Id: I6342be16fc11fb24e1b715ab60b8c523951e7497 Signed-off-by: Sangchul Lee --- packaging/libmm-sound.spec | 2 +- server/mm_sound_mgr_codec.c | 5 +++-- server/mm_sound_mgr_ipc.c | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packaging/libmm-sound.spec b/packaging/libmm-sound.spec index 9023b45..ef148a0 100644 --- a/packaging/libmm-sound.spec +++ b/packaging/libmm-sound.spec @@ -1,6 +1,6 @@ Name: libmm-sound Summary: MMSound Package contains client lib and sound_server binary -Version: 0.10.85 +Version: 0.10.86 Release: 0 Group: System/Libraries License: Apache-2.0 diff --git a/server/mm_sound_mgr_codec.c b/server/mm_sound_mgr_codec.c index d0f917e..8dc3591 100644 --- a/server/mm_sound_mgr_codec.c +++ b/server/mm_sound_mgr_codec.c @@ -43,7 +43,7 @@ #define _ENABLE_KEYTONE /* Temporal test code */ -/* #define FOCUS_INTEGRATION */ +#define FOCUS_INTEGRATION typedef struct { int (*callback)(int, void *, void *, int); /* msg_type(pid) client callback & client data info */ @@ -242,7 +242,8 @@ int MMSoundMgrCodecPlay(int *slotid, const mmsound_mgr_codec_param_t *param) } /*The count num means codec type WAV, MP3 */ - debug_msg("DTMF[%d] Repeat[%d] Volume[%f] plugin_codec[%d]\n", param->tone, param->repeat_count, param->volume, count); + debug_msg("DTMF[%d] Repeat[%d] Volume[%f] plugin_codec[%d], session(type[%d],option[%d])\n", + param->tone, param->repeat_count, param->volume, count, param->session_type, param->session_options); if (g_plugins[count].GetSupportTypes == NULL) { /* Codec not found */ debug_error("unsupported file type %d\n", count); diff --git a/server/mm_sound_mgr_ipc.c b/server/mm_sound_mgr_ipc.c index e5654f0..415623f 100644 --- a/server/mm_sound_mgr_ipc.c +++ b/server/mm_sound_mgr_ipc.c @@ -75,6 +75,7 @@ int _MMSoundMgrIpcPlayFile(char* filename,int tone, int repeat, int volume, int param.volume_config = volume_config; param.priority = priority; param.session_type = session_type; + param.session_options = session_options; param.param = (void*)client_pid; param.source = source; param.handle_route = handle_route; -- 2.7.4