diff options
| author | Jeongmo Yang <jm80.yang@samsung.com> | 2016-03-23 20:02:36 +0900 |
|---|---|---|
| committer | Jeongmo Yang <jm80.yang@samsung.com> | 2016-03-23 20:06:10 +0900 |
| commit | 70b05ef9f526cb03b7bbb1f000349d90fe1d2546 (patch) | |
| tree | e837ea5a37c2c8e407e744d0bce7fec3264f2f8c | |
| parent | 1b562f22c1fc8066bbef300e386cb2b1df25f100 (diff) | |
| download | recorder-70b05ef9f526cb03b7bbb1f000349d90fe1d2546.tar.gz recorder-70b05ef9f526cb03b7bbb1f000349d90fe1d2546.tar.bz2 recorder-70b05ef9f526cb03b7bbb1f000349d90fe1d2546.zip | |
[Release version 0.2.22] 1. Do not get api_class in case of EVENT message, 2. match g_new and g_freesubmit/tizen/20160323.122858accepted/tizen/wearable/20160324.010358accepted/tizen/tv/20160324.010328accepted/tizen/mobile/20160324.010251accepted/tizen/ivi/20160324.010424accepted/tizen/common/20160323.185719
Change-Id: Ib8d8311a916216bac744e956a1061339c97d94f1
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
| -rw-r--r-- | packaging/capi-media-recorder.spec | 2 | ||||
| -rw-r--r-- | src/recorder.c | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/packaging/capi-media-recorder.spec b/packaging/capi-media-recorder.spec index a647604..8e3cb05 100644 --- a/packaging/capi-media-recorder.spec +++ b/packaging/capi-media-recorder.spec @@ -1,6 +1,6 @@ Name: capi-media-recorder Summary: A Recorder API -Version: 0.2.21 +Version: 0.2.22 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/recorder.c b/src/recorder.c index d41f0e7..6166237 100644 --- a/src/recorder.c +++ b/src/recorder.c @@ -308,7 +308,7 @@ IDLE_EVENT_CALLBACK_DONE: g_mutex_unlock(&rec_idle_event->event_mutex); g_mutex_clear(&rec_idle_event->event_mutex); - free(rec_idle_event); + g_free(rec_idle_event); rec_idle_event = NULL; return false; @@ -358,7 +358,7 @@ static void _recorder_remove_idle_event_all(recorder_cb_info_s *cb_info) if (ret == TRUE) { g_mutex_clear(&rec_idle_event->event_mutex); - free(rec_idle_event); + g_free(rec_idle_event); rec_idle_event = NULL; LOGD("remove idle event done"); @@ -459,7 +459,7 @@ static void *_recorder_msg_handler_func(gpointer data) _client_user_callback(cb_info, rec_msg->recv_msg, event); break; case MUSE_RECORDER_EVENT_CLASS_THREAD_MAIN: - rec_idle_event = (recorder_idle_event_s *)malloc(sizeof(recorder_idle_event_s)); + rec_idle_event = g_new0(recorder_idle_event_s, 1); if (rec_idle_event == NULL) { LOGE("rec_idle_event alloc failed"); break; @@ -489,7 +489,7 @@ static void *_recorder_msg_handler_func(gpointer data) LOGE("unknown recorder api[%d] message", api); } - free(rec_msg); + g_free(rec_msg); rec_msg = NULL; g_mutex_lock(&cb_info->msg_handler_mutex); @@ -592,8 +592,11 @@ static void *_recorder_msg_recv_func(gpointer data) continue; } - if (muse_recorder_msg_get(api_class, parse_str[i])) - LOGD("recorder api_class[%d]", api_class); + if (api != MUSE_RECORDER_CB_EVENT) { + LOGD("check api_class"); + if (muse_recorder_msg_get(api_class, parse_str[i])) + LOGD("recorder api_class[%d]", api_class); + } if (api_class == MUSE_RECORDER_API_CLASS_IMMEDIATE) { g_mutex_lock(&cb_info->api_mutex[api]); |