Release version 0.2.18 94/53494/2 accepted/tizen/mobile/20151208.125137 accepted/tizen/tv/20151208.125148 accepted/tizen/wearable/20151208.125208 submit/tizen/20151208.041805
authorJeongmo Yang <jm80.yang@samsung.com>
Mon, 7 Dec 2015 09:42:54 +0000 (18:42 +0900)
committerJeongmo Yang <jm80.yang@samsung.com>
Tue, 8 Dec 2015 03:02:56 +0000 (12:02 +0900)
1. Remove ASM related code

Change-Id: Ife8af7e112d5ef293d995da663e4bf4b6ed4531a
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
legacy/CMakeLists.txt
legacy/src/legacy_camera.c
packaging/mmsvc-camera.spec

index 2f3f762..bbb5d0e 100644 (file)
@@ -4,7 +4,7 @@ SET(service "legacy")
 SET(submodule "camera")
 
 # for package file
-SET(dependents "dlog audio-session-mgr mm-camcorder capi-base-common capi-media-tool gstreamer-1.0 libtbm evas ecore elementary vconf")
+SET(dependents "dlog mm-camcorder capi-base-common capi-media-tool gstreamer-1.0 libtbm evas ecore elementary vconf")
 
 SET(fw_name "${service}-${submodule}")
 
index b806ceb..8b018f0 100644 (file)
@@ -19,7 +19,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <mm.h>
-#include <audio-session-manager-types.h>
 #include <mm_camcorder.h>
 #include <mm_types.h>
 #include <math.h>
@@ -367,13 +366,13 @@ static int __mm_camera_message_callback(int message, void *param, void *user_dat
 
                if (message == MM_MESSAGE_CAMCORDER_STATE_CHANGED_BY_ASM) {
                        switch (m->state.code) {
-                       case ASM_EVENT_SOURCE_CALL_START:
-                       case ASM_EVENT_SOURCE_CALL_END:
+                       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 ASM_EVENT_SOURCE_ALARM_START:
-                       case ASM_EVENT_SOURCE_ALARM_END:
+                       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;
index a76e914..c9275d1 100644 (file)
@@ -3,7 +3,7 @@
 
 Name:       mmsvc-camera
 Summary:    A Camera module for muse server
-Version:    0.2.17
+Version:    0.2.18
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0
@@ -13,7 +13,6 @@ BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(mused)
 BuildRequires:  pkgconfig(mm-camcorder)
-BuildRequires:  pkgconfig(audio-session-mgr)
 BuildRequires:  pkgconfig(capi-base-common)
 BuildRequires:  pkgconfig(capi-media-tool)
 %if %{with x}