Release version 0.2.10

1. Change class of some event from NORMAL to IDLE
2. Remove unused pkgconf - json

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

diff --git a/muse/include/muse_camera_msg.h b/muse/include/muse_camera_msg.h
index 5eab4ea..06d9b72 100755 (executable)
--- a/muse/include/muse_camera_msg.h
+++ b/muse/include/muse_camera_msg.h
@@ -160,7 +160,7 @@ typedef const char* STRING;
                        LOGE("sending message failed"); \
                        ret = CAMERA_ERROR_INVALID_OPERATION; \
                } else \
-                       ret = client_wait_for_cb_return(api, cb_info, CALLBACK_TIME_OUT); \
+                       ret = _client_wait_for_cb_return(api, cb_info, CALLBACK_TIME_OUT); \
                muse_core_msg_json_factory_free(__sndMsg__); \
        }while(0)
 
@@ -181,7 +181,7 @@ typedef const char* STRING;
                        LOGE("sending message failed"); \
                        ret = CAMERA_ERROR_INVALID_OPERATION; \
                } else \
-                       ret = client_wait_for_cb_return(api, cb_info, CALLBACK_TIME_OUT_LONG); \
+                       ret = _client_wait_for_cb_return(api, cb_info, CALLBACK_TIME_OUT_LONG); \
                muse_core_msg_json_factory_free(__sndMsg__); \
        }while(0)
 
@@ -207,7 +207,7 @@ typedef const char* STRING;
                        LOGE("sending message failed"); \
                        ret = CAMERA_ERROR_INVALID_OPERATION; \
                } else \
-                       ret = client_wait_for_cb_return(api, cb_info, CALLBACK_TIME_OUT); \
+                       ret = _client_wait_for_cb_return(api, cb_info, CALLBACK_TIME_OUT); \
                muse_core_msg_json_factory_free(__sndMsg__); \
        }while(0)
 
@@ -260,7 +260,7 @@ typedef const char* STRING;
                        LOGE("sending message failed"); \
                        ret = CAMERA_ERROR_INVALID_OPERATION; \
                } else \
-                       ret = client_wait_for_cb_return(api, cb_info, CALLBACK_TIME_OUT); \
+                       ret = _client_wait_for_cb_return(api, cb_info, CALLBACK_TIME_OUT); \
                muse_core_msg_json_factory_free(__sndMsg__); \
        }while(0)
 
@@ -294,7 +294,7 @@ typedef const char* STRING;
                        LOGE("sending message failed"); \
                        ret = CAMERA_ERROR_INVALID_OPERATION; \
                } else \
-                       ret = client_wait_for_cb_return(api, cb_info, CALLBACK_TIME_OUT); \
+                       ret = _client_wait_for_cb_return(api, cb_info, CALLBACK_TIME_OUT); \
                muse_core_msg_json_factory_free(__sndMsg__); \
        }while(0)
 
@@ -325,7 +325,7 @@ typedef const char* STRING;
                        LOGE("sending message failed"); \
                        ret = CAMERA_ERROR_INVALID_OPERATION; \
                } else \
-                       ret = client_wait_for_cb_return(api, cb_info, CALLBACK_TIME_OUT); \
+                       ret = _client_wait_for_cb_return(api, cb_info, CALLBACK_TIME_OUT); \
                muse_core_msg_json_factory_free(__sndMsg__); \
        }while(0)
 

diff --git a/muse/src/muse_camera_dispatcher.c b/muse/src/muse_camera_dispatcher.c
index 9c1e190..720523e 100755 (executable)
--- a/muse/src/muse_camera_dispatcher.c
+++ b/muse/src/muse_camera_dispatcher.c
@@ -425,12 +425,12 @@ void _camera_dispatcher_capturing_cb(camera_image_data_s* image, camera_image_da
 
        /* add bo and key to list */
        muse_camera_msg_event3(MUSE_CAMERA_CB_EVENT,
-                                                             MUSE_CAMERA_EVENT_TYPE_CAPTURE,
-                                                             MUSE_CAMERA_EVENT_CLASS_NORMAL,
-                                                             module,
-                                                             INT, tbm_key,
-                                                             INT, is_postview,
-                                                             INT, is_thumbnail);
+                              MUSE_CAMERA_EVENT_TYPE_CAPTURE,
+                              MUSE_CAMERA_EVENT_CLASS_NORMAL,
+                              module,
+                              INT, tbm_key,
+                              INT, is_postview,
+                              INT, is_thumbnail);
 
        return;
 }
@@ -444,7 +444,7 @@ void _camera_dispatcher_state_changed_cb(camera_state_e previous, camera_state_e
 
        muse_camera_msg_event3(MUSE_CAMERA_CB_EVENT,
                               MUSE_CAMERA_EVENT_TYPE_STATE_CHANGE,
-                              MUSE_CAMERA_EVENT_CLASS_NORMAL,
+                              MUSE_CAMERA_EVENT_CLASS_IDLE,
                               module,
                               INT, previous,
                               INT, current,
@@ -461,7 +461,7 @@ void _camera_dispatcher_interrupted_cb(camera_policy_e policy, camera_state_e pr
 
        muse_camera_msg_event3(MUSE_CAMERA_CB_EVENT,
                               MUSE_CAMERA_EVENT_TYPE_INTERRUPTED,
-                              MUSE_CAMERA_EVENT_CLASS_NORMAL,
+                              MUSE_CAMERA_EVENT_CLASS_IDLE,
                               module,
                               INT, policy,
                               INT, previous,
@@ -584,10 +584,10 @@ void _camera_dispatcher_preview_cb(camera_preview_data_s *frame, void *user_data
 
        /* add bo and key to list */
        muse_camera_msg_event1(MUSE_CAMERA_CB_EVENT,
-                                                             MUSE_CAMERA_EVENT_TYPE_PREVIEW,
-                                                             MUSE_CAMERA_EVENT_CLASS_NORMAL,
-                                                             module,
-                                                             INT, tbm_key);
+                              MUSE_CAMERA_EVENT_TYPE_PREVIEW,
+                              MUSE_CAMERA_EVENT_CLASS_NORMAL,
+                              module,
+                              INT, tbm_key);
        return;
 }
 
@@ -612,7 +612,7 @@ void _camera_dispatcher_capture_completed_cb(void *user_data)
 
        muse_camera_msg_event(MUSE_CAMERA_CB_EVENT,
                              MUSE_CAMERA_EVENT_TYPE_CAPTURE_COMPLETE,
-                             MUSE_CAMERA_EVENT_CLASS_NORMAL,
+                             MUSE_CAMERA_EVENT_CLASS_IDLE,
                              module);
        return;
 }
@@ -696,7 +696,7 @@ void _camera_dispatcher_face_detected_cb(camera_detected_face_s *faces, int coun
                /* send message */
                muse_camera_msg_event2(MUSE_CAMERA_CB_EVENT,
                                       MUSE_CAMERA_EVENT_TYPE_FACE_DETECTION,
-                                      MUSE_CAMERA_EVENT_CLASS_NORMAL,
+                                      MUSE_CAMERA_EVENT_CLASS_IDLE,
                                       module,
                                       INT, count,
                                       INT, tbm_key);
@@ -715,7 +715,7 @@ void _camera_dispatcher_focus_changed_cb(camera_focus_state_e state, void *user_
 
        muse_camera_msg_event1(MUSE_CAMERA_CB_EVENT,
                               MUSE_CAMERA_EVENT_TYPE_FOCUS_CHANGE,
-                              MUSE_CAMERA_EVENT_CLASS_NORMAL,
+                              MUSE_CAMERA_EVENT_CLASS_IDLE,
                               module,
                               INT, state);
 
@@ -730,7 +730,7 @@ void _camera_dispatcher_error_cb(camera_error_e error, camera_state_e current_st
 
        muse_camera_msg_event2(MUSE_CAMERA_CB_EVENT,
                               MUSE_CAMERA_EVENT_TYPE_ERROR,
-                              MUSE_CAMERA_EVENT_CLASS_NORMAL,
+                              MUSE_CAMERA_EVENT_CLASS_IDLE,
                               module,
                               INT, error,
                               INT, current_state);
@@ -746,7 +746,7 @@ void _camera_dispatcher_hdr_progress_cb(int percent, void *user_data)
 
        muse_camera_msg_event1(MUSE_CAMERA_CB_EVENT,
                               MUSE_CAMERA_EVENT_TYPE_HDR_PROGRESS,
-                              MUSE_CAMERA_EVENT_CLASS_NORMAL,
+                              MUSE_CAMERA_EVENT_CLASS_IDLE,
                               module,
                               INT, percent);
        return;

diff --git a/packaging/mmsvc-camera.spec b/packaging/mmsvc-camera.spec
index 4857923..c53039e 100644 (file)
--- a/packaging/mmsvc-camera.spec
+++ b/packaging/mmsvc-camera.spec
@@ -3,7 +3,7 @@
 
 Name:       mmsvc-camera
 Summary:    A Camera module for muse server
-Version:    0.2.9
+Version:    0.2.10
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0
@@ -22,7 +22,6 @@ BuildRequires:  pkgconfig(ecore-x)
 %if %{with wayland}
 BuildRequires:  pkgconfig(ecore-wayland)
 %endif
-BuildRequires:  pkgconfig(json)
 BuildRequires:  pkgconfig(libtbm)
 BuildRequires:  pkgconfig(evas)
 BuildRequires:  pkgconfig(ecore)