Bug fix for foreach supported callback

The foreach supported callback stopped because of void return.
So, add proper return value for them to call remained callback.

[Version] 0.2.77
[Profile] Common
[Issue Type] Bug fix
[Dependency module] N/A
[Test] [M(T) - Boot=(OK), sdb=(OK), Home=(OK), Touch=(OK), Version=20170412_223034]

Change-Id: I8750c247744e886160d2290e59187df4249683bb
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/muse/src/muse_camera_dispatcher.c b/muse/src/muse_camera_dispatcher.c
index 803efc9..51c280e 100644 (file)
--- a/muse/src/muse_camera_dispatcher.c
+++ b/muse/src/muse_camera_dispatcher.c
@@ -187,103 +187,143 @@ static void muse_camera_msg_event3(int api, int event, int class, muse_module_h
 }
 
 
-void _camera_dispatcher_callback_supported_theater_mode(int param1, void *user_data)
+bool _camera_dispatcher_callback_supported_theater_mode(int param1, void *user_data)
 {
        muse_module_h module = (muse_module_h)user_data;
 
+       if (!module) {
+               LOGE("NULL module");
+               return false;
+       }
+
        muse_camera_msg_event1(MUSE_CAMERA_CB_EVENT,
                MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_THEATER_MODE,
                MUSE_CAMERA_EVENT_CLASS_THREAD_SUB,
                module, "param1", param1);
 
-       return;
+       return true;
 }
 
-void _camera_dispatcher_callback_supported_af_mode(int param1, void *user_data)
+bool _camera_dispatcher_callback_supported_af_mode(int param1, void *user_data)
 {
        muse_module_h module = (muse_module_h)user_data;
 
+       if (!module) {
+               LOGE("NULL module");
+               return false;
+       }
+
        muse_camera_msg_event1(MUSE_CAMERA_CB_EVENT,
                MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_AF_MODE,
                MUSE_CAMERA_EVENT_CLASS_THREAD_SUB,
                module, "param1", param1);
 
-       return;
+       return true;
 }
 
-void _camera_dispatcher_callback_supported_exposure_mode(int param1, void *user_data)
+bool _camera_dispatcher_callback_supported_exposure_mode(int param1, void *user_data)
 {
        muse_module_h module = (muse_module_h)user_data;
 
+       if (!module) {
+               LOGE("NULL module");
+               return false;
+       }
+
        muse_camera_msg_event1(MUSE_CAMERA_CB_EVENT,
                MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_EXPOSURE_MODE,
                MUSE_CAMERA_EVENT_CLASS_THREAD_SUB,
                module, "param1", param1);
 
-       return;
+       return true;
 }
 
-void _camera_dispatcher_callback_supported_iso_mode(int param1, void *user_data)
+bool _camera_dispatcher_callback_supported_iso_mode(int param1, void *user_data)
 {
        muse_module_h module = (muse_module_h)user_data;
 
+       if (!module) {
+               LOGE("NULL module");
+               return false;
+       }
+
        muse_camera_msg_event1(MUSE_CAMERA_CB_EVENT,
                MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_ISO,
                MUSE_CAMERA_EVENT_CLASS_THREAD_SUB,
                module, "param1", param1);
 
-       return;
+       return true;
 }
 
-void _camera_dispatcher_callback_supported_whitebalance(int param1, void *user_data)
+bool _camera_dispatcher_callback_supported_whitebalance(int param1, void *user_data)
 {
        muse_module_h module = (muse_module_h)user_data;
 
+       if (!module) {
+               LOGE("NULL module");
+               return false;
+       }
+
        muse_camera_msg_event1(MUSE_CAMERA_CB_EVENT,
                MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_WHITEBALANCE,
                MUSE_CAMERA_EVENT_CLASS_THREAD_SUB,
                module, "param1", param1);
 
-       return;
+       return true;
 }
 
-void _camera_dispatcher_callback_supported_effect(int param1, void *user_data)
+bool _camera_dispatcher_callback_supported_effect(int param1, void *user_data)
 {
        muse_module_h module = (muse_module_h)user_data;
 
+       if (!module) {
+               LOGE("NULL module");
+               return false;
+       }
+
        muse_camera_msg_event1(MUSE_CAMERA_CB_EVENT,
                MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_EFFECT,
                MUSE_CAMERA_EVENT_CLASS_THREAD_SUB,
                module, "param1", param1);
 
-       return;
+       return true;
 }
 
-void _camera_dispatcher_callback_supported_scene_mode(int param1, void *user_data)
+bool _camera_dispatcher_callback_supported_scene_mode(int param1, void *user_data)
 {
        muse_module_h module = (muse_module_h)user_data;
 
+       if (!module) {
+               LOGE("NULL module");
+               return false;
+       }
+
        muse_camera_msg_event1(MUSE_CAMERA_CB_EVENT,
                MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_SCENE_MODE,
                MUSE_CAMERA_EVENT_CLASS_THREAD_SUB,
                module, "param1", param1);
 
-       return;
+       return true;
 }
 
-void _camera_dispatcher_callback_supported_flash_mode(int param1, void *user_data)
+bool _camera_dispatcher_callback_supported_flash_mode(int param1, void *user_data)
 {
        muse_module_h module = (muse_module_h)user_data;
 
+       if (!module) {
+               LOGE("NULL module");
+               return false;
+       }
+
        muse_camera_msg_event1(MUSE_CAMERA_CB_EVENT,
                MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_FLASH_MODE,
                MUSE_CAMERA_EVENT_CLASS_THREAD_SUB,
                module, "param1", param1);
 
-       return;
+       return true;
 }
 
-int _camera_dispatcher_callback_supported_flash_mode2(int param1, void *user_data)
+bool _camera_dispatcher_callback_supported_flash_mode2(int param1, void *user_data)
 {
        int *count = (int *)user_data;
 
@@ -293,91 +333,126 @@ int _camera_dispatcher_callback_supported_flash_mode2(int param1, void *user_dat
        return true;
 }
 
-void _camera_dispatcher_callback_supported_fps(int param1, void *user_data)
+bool _camera_dispatcher_callback_supported_fps(int param1, void *user_data)
 {
        muse_module_h module = (muse_module_h)user_data;
 
+       if (!module) {
+               LOGE("NULL module");
+               return false;
+       }
+
        muse_camera_msg_event1(MUSE_CAMERA_CB_EVENT,
                MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_FPS,
                MUSE_CAMERA_EVENT_CLASS_THREAD_SUB,
                module, "param1", param1);
 
-       return;
+       return true;
 }
 
-void _camera_dispatcher_callback_supported_fps_by_resolution(int param1, void *user_data)
+bool _camera_dispatcher_callback_supported_fps_by_resolution(int param1, void *user_data)
 {
        muse_module_h module = (muse_module_h)user_data;
 
+       if (!module) {
+               LOGE("NULL module");
+               return false;
+       }
+
        muse_camera_msg_event1(MUSE_CAMERA_CB_EVENT,
                MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_FPS_BY_RESOLUTION,
                MUSE_CAMERA_EVENT_CLASS_THREAD_SUB,
                module, "param1", param1);
 
-       return;
+       return true;
 }
 
-void _camera_dispatcher_callback_supported_stream_flip(int param1, void *user_data)
+bool _camera_dispatcher_callback_supported_stream_flip(int param1, void *user_data)
 {
        muse_module_h module = (muse_module_h)user_data;
 
+       if (!module) {
+               LOGE("NULL module");
+               return false;
+       }
+
        muse_camera_msg_event1(MUSE_CAMERA_CB_EVENT,
                MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_STREAM_FLIP,
                MUSE_CAMERA_EVENT_CLASS_THREAD_SUB,
                module, "param1", param1);
 
-       return;
+       return true;
 }
 
-void _camera_dispatcher_callback_supported_stream_rotation(int param1, void *user_data)
+bool _camera_dispatcher_callback_supported_stream_rotation(int param1, void *user_data)
 {
        muse_module_h module = (muse_module_h)user_data;
 
+       if (!module) {
+               LOGE("NULL module");
+               return false;
+       }
+
        muse_camera_msg_event1(MUSE_CAMERA_CB_EVENT,
                MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_STREAM_ROTATION,
                MUSE_CAMERA_EVENT_CLASS_THREAD_SUB,
                module, "param1", param1);
 
-       return;
+       return true;
 }
 
-void _camera_dispatcher_callback_supported_capture_format(int param1, void *user_data)
+bool _camera_dispatcher_callback_supported_capture_format(int param1, void *user_data)
 {
        muse_module_h module = (muse_module_h)user_data;
 
+       if (!module) {
+               LOGE("NULL module");
+               return false;
+       }
+
        muse_camera_msg_event1(MUSE_CAMERA_CB_EVENT,
                MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_CAPTURE_FORMAT,
                MUSE_CAMERA_EVENT_CLASS_THREAD_SUB,
                module, "param1", param1);
 
-       return;
+       return true;
 }
 
-void _camera_dispatcher_callback_supported_preview_format(int param1, void *user_data)
+bool _camera_dispatcher_callback_supported_preview_format(int param1, void *user_data)
 {
        muse_module_h module = (muse_module_h)user_data;
 
+       if (!module) {
+               LOGE("NULL module");
+               return false;
+       }
+
        muse_camera_msg_event1(MUSE_CAMERA_CB_EVENT,
                MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_PREVIEW_FORMAT,
                MUSE_CAMERA_EVENT_CLASS_THREAD_SUB,
                module, "param1", param1);
 
-       return;
+       return true;
 }
 
-void _camera_dispatcher_callback_supported_preview_resolution(int param1, int param2, void *user_data)
+bool _camera_dispatcher_callback_supported_preview_resolution(int param1, int param2, void *user_data)
 {
        muse_module_h module = (muse_module_h)user_data;
 
+       if (!module) {
+               LOGE("NULL module");
+               return false;
+       }
+
        muse_camera_msg_event2(MUSE_CAMERA_CB_EVENT,
                MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_PREVIEW_RESOLUTION,
                MUSE_CAMERA_EVENT_CLASS_THREAD_SUB,
                module, "param1", param1, "param2", param2);
 
-       return;
+       return true;
 }
 
-void _camera_dispatcher_callback_supported_capture_resolution(int param1, int param2, void *user_data)
+bool _camera_dispatcher_callback_supported_capture_resolution(int param1, int param2, void *user_data)
 {
        muse_module_h module = (muse_module_h)user_data;
 
@@ -386,19 +461,24 @@ void _camera_dispatcher_callback_supported_capture_resolution(int param1, int pa
                MUSE_CAMERA_EVENT_CLASS_THREAD_SUB,
                module, "param1", param1, "param2", param2);
 
-       return;
+       return true;
 }
 
-void _camera_dispatcher_callback_supported_ptz_type(int param1, void *user_data)
+bool _camera_dispatcher_callback_supported_ptz_type(int param1, void *user_data)
 {
        muse_module_h module = (muse_module_h)user_data;
 
+       if (!module) {
+               LOGE("NULL module");
+               return false;
+       }
+
        muse_camera_msg_event1(MUSE_CAMERA_CB_EVENT,
                MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_PTZ_TYPE,
                MUSE_CAMERA_EVENT_CLASS_THREAD_SUB,
                module, "param1", param1);
 
-       return;
+       return true;
 }
 
 static int _camera_remove_export_data(muse_module_h module, int key, int remove_all)

diff --git a/packaging/mmsvc-camera.spec b/packaging/mmsvc-camera.spec
index 80eeb17..c2f5ee4 100644 (file)
--- a/packaging/mmsvc-camera.spec
+++ b/packaging/mmsvc-camera.spec
@@ -1,6 +1,6 @@
 Name:       mmsvc-camera
 Summary:    A Camera module for muse server
-Version:    0.2.76
+Version:    0.2.77
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0