Remove codes for sesison backward compatibility

use MMCAM_CLIENT_PID attribute instead of MMCAM_PID_FOR_SOUND_FOCUS.

[Version] 0.3.14
[Profile] Common
[Issue Type] Clean-up
[Dependency module] N/A

Change-Id: I4655fc2d3ca92e1bbef249cd5184cdc9a7b259ef
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/legacy/src/legacy_camera.c b/legacy/src/legacy_camera.c
index 4ecb68d..a990969 100644 (file)
--- a/legacy/src/legacy_camera.c
+++ b/legacy/src/legacy_camera.c
@@ -308,7 +308,6 @@ static int __mm_camera_message_callback(int message, void *param, void *user_dat
 
        switch (message) {
        case MM_MESSAGE_CAMCORDER_STATE_CHANGED:
-       case MM_MESSAGE_CAMCORDER_STATE_CHANGED_BY_ASM:
        case MM_MESSAGE_CAMCORDER_STATE_CHANGED_BY_SECURITY:
        case MM_MESSAGE_CAMCORDER_STATE_CHANGED_BY_RM:
        {
@@ -325,24 +324,7 @@ static int __mm_camera_message_callback(int message, void *param, void *user_dat
                }
 
                /* check policy */
-               if (message == MM_MESSAGE_CAMCORDER_STATE_CHANGED_BY_ASM) {
-                       switch (m->state.code) {
-                       case MM_MSG_CODE_INTERRUPTED_BY_CALL_START:
-                       case MM_MSG_CODE_INTERRUPTED_BY_CALL_END:
-                               policy = CAMERA_POLICY_SOUND_BY_CALL;
-                               LOGW("CAMERA_POLICY_SOUND_BY_CALL");
-                               break;
-                       case MM_MSG_CODE_INTERRUPTED_BY_ALARM_START:
-                       case MM_MSG_CODE_INTERRUPTED_BY_ALARM_END:
-                               policy = CAMERA_POLICY_SOUND_BY_ALARM;
-                               LOGW("CAMERA_POLICY_SOUND_BY_ALARM");
-                               break;
-                       default:
-                               policy = CAMERA_POLICY_SOUND;
-                               LOGW("CAMERA_POLICY_SOUND");
-                               break;
-                       }
-               } else if (message == MM_MESSAGE_CAMCORDER_STATE_CHANGED_BY_SECURITY) {
+               if (message == MM_MESSAGE_CAMCORDER_STATE_CHANGED_BY_SECURITY) {
                        policy = CAMERA_POLICY_SECURITY;
                        LOGW("CAMERA_POLICY_SECURITY");
                } else if (message == MM_MESSAGE_CAMCORDER_STATE_CHANGED_BY_RM) {
@@ -411,13 +393,10 @@ static int __mm_camera_message_callback(int message, void *param, void *user_dat
                }
                break;
        }
-       case MM_MESSAGE_CAMCORDER_STATE_CHANGE_STARTED_BY_ASM:
        case MM_MESSAGE_CAMCORDER_STATE_CHANGE_STARTED_BY_SECURITY:
        case MM_MESSAGE_CAMCORDER_STATE_CHANGE_STARTED_BY_RM:
                if (handle->user_cb[_CAMERA_EVENT_TYPE_INTERRUPT_STARTED]) {
-                       if (message == MM_MESSAGE_CAMCORDER_STATE_CHANGE_STARTED_BY_ASM)
-                               policy = CAMERA_POLICY_SOUND;
-                       else if (message == MM_MESSAGE_CAMCORDER_STATE_CHANGE_STARTED_BY_SECURITY)
+                       if (message == MM_MESSAGE_CAMCORDER_STATE_CHANGE_STARTED_BY_SECURITY)
                                policy = CAMERA_POLICY_SECURITY;
                        else if (message == MM_MESSAGE_CAMCORDER_STATE_CHANGE_STARTED_BY_RM)
                                policy = CAMERA_POLICY_RESOURCE_CONFLICT;
@@ -765,7 +744,7 @@ int legacy_camera_change_device(camera_h *camera, camera_device_e device, bool i
 
        /* get pid from old handle */
        ret = mm_camcorder_get_attributes(old_handle->mm_handle, NULL,
-               MMCAM_PID_FOR_SOUND_FOCUS, &pid,
+               MMCAM_CLIENT_PID, &pid,
                NULL);
        if (ret != MM_ERROR_NONE) {
                LOGE("failed to get pid 0x%x", ret);
@@ -776,7 +755,7 @@ int legacy_camera_change_device(camera_h *camera, camera_device_e device, bool i
 
        /* set pid to new handle */
        ret = mm_camcorder_set_attributes(new_handle->mm_handle, NULL,
-               MMCAM_PID_FOR_SOUND_FOCUS, pid,
+               MMCAM_CLIENT_PID, pid,
                NULL);
        if (ret != MM_ERROR_NONE) {
                LOGE("failed to get pid 0x%x", ret);

diff --git a/legacy/src/legacy_camera_internal.c b/legacy/src/legacy_camera_internal.c
index 28dd012..05a233e 100644 (file)
--- a/legacy/src/legacy_camera_internal.c
+++ b/legacy/src/legacy_camera_internal.c
@@ -46,7 +46,7 @@ int legacy_camera_set_client_pid(camera_h camera, int pid)
        LOGE("pid %d", pid);
 
        ret = mm_camcorder_set_attributes(handle->mm_handle, NULL,
-               MMCAM_PID_FOR_SOUND_FOCUS, pid,
+               MMCAM_CLIENT_PID, pid,
                NULL);
 
        return __convert_camera_error_code(__func__, ret);

diff --git a/packaging/mmsvc-camera.spec b/packaging/mmsvc-camera.spec
index d3cbfba..185637e 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.3.13
+Version:    0.3.14
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0