Release version 0.2.6tizen_3.0.m2.a1_tv_releasetizen_3.0.m2.a1_mobile_releasesubmit/tizen/20151017.073337accepted/tizen/wearable/20151017.101937accepted/tizen/tv/20151017.101510accepted/tizen/mobile/20151017.101250

1. Remove temporary code
2. Update camera handle related code

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

3 files changed, 15 insertions, 22 deletions

diff --git a/legacy/src/legacy_recorder.c b/legacy/src/legacy_recorder.c
index 1fff8e1..2433e06 100644
--- a/legacy/src/legacy_recorder.c
+++ b/legacy/src/legacy_recorder.c
@@ -37,7 +37,6 @@
 #define LOG_TAG "TIZEN_N_RECORDER"
 
 #define LOWSET_DECIBEL -300.0
-#define RECORDER_PATH_RECORDER_RESOURCE    "/usr/share/sounds/mm-camcorder/recorder_resource"
 
 
 /*
@@ -494,7 +493,6 @@ static int _recorder_check_and_set_attribute(recorder_h recorder, const char *at
 int legacy_recorder_create_videorecorder(camera_h camera, recorder_h *recorder)
 {
 	int ret = MM_ERROR_NONE;
-	int resource_fd = -1;
 	recorder_s *handle = NULL;
 	int preview_format = MM_PIXEL_FORMAT_NV12;
 	int camera_device_count = 0;
@@ -514,23 +512,6 @@ int legacy_recorder_create_videorecorder(camera_h camera, recorder_h *recorder)
 		return RECORDER_ERROR_INVALID_PARAMETER;
 	}
 
-	resource_fd = open(RECORDER_PATH_RECORDER_RESOURCE, O_RDONLY);
-	if (resource_fd < 0) {
-		LOGE("failed to open recorder resource : errno [%d]", errno);
-		if (errno == EPERM || errno == EACCES) {
-			LOGE("permission denied");
-			return RECORDER_ERROR_PERMISSION_DENIED;
-		} else {
-			LOGE("invalid operation");
-			return RECORDER_ERROR_INVALID_OPERATION;
-		}
-	}
-
-	close(resource_fd);
-	resource_fd = -1;
-
-	LOGW("permission check done");
-
 	handle = (recorder_s*)malloc( sizeof(recorder_s) );
 	if(handle == NULL){
 		LOGE("[%s] malloc error", __func__);
diff --git a/muse/src/muse_recorder_dispatcher.c b/muse/src/muse_recorder_dispatcher.c
index fb4ef85..106f983 100644
--- a/muse/src/muse_recorder_dispatcher.c
+++ b/muse/src/muse_recorder_dispatcher.c
@@ -27,6 +27,7 @@
 #include <muse_core.h>
 #include <muse_core_ipc.h>
 #include <muse_core_security.h>
+#include <muse_camera.h>
 #include <mm_types.h>
 #include <dlog.h>
 
@@ -218,6 +219,7 @@ int recorder_dispatcher_create(muse_module_h module)
 	muse_recorder_api_e api = MUSE_RECORDER_API_CREATE;
 	recorder_h recorder;
 	intptr_t camera_handle;
+	muse_camera_handle_s *muse_camera = NULL;
 	muse_recorder_info_s *recorder_data;
 	tbm_bufmgr bufmgr;
 	int recorder_type;
@@ -239,8 +241,18 @@ int recorder_dispatcher_create(muse_module_h module)
 
 	if (recorder_type == MUSE_RECORDER_TYPE_VIDEO) {
 		muse_recorder_msg_get_pointer(camera_handle, muse_core_client_get_msg(module));
-		LOGD("video type, camera handle : 0x%x", camera_handle);
-		ret = legacy_recorder_create_videorecorder((camera_h)camera_handle, &recorder);
+		if (camera_handle == NULL) {
+			LOGE("NULL handle");
+			ret = RECORDER_ERROR_INVALID_PARAMETER;
+			muse_recorder_msg_return(api, ret, module);
+			return MUSE_RECORDER_ERROR_NONE;
+		}
+
+		muse_camera = (muse_recorder_info_s *)camera_handle;
+
+		LOGD("video type, camera handle : %p", muse_camera->camera_handle);
+
+		ret = legacy_recorder_create_videorecorder(muse_camera->camera_handle, &recorder);
 	} else if (recorder_type == MUSE_RECORDER_TYPE_AUDIO) {
 		LOGD("audio type");
 		ret = legacy_recorder_create_audiorecorder(&recorder);
diff --git a/packaging/mmsvc-recorder.spec b/packaging/mmsvc-recorder.spec
index 8c08024..a871469 100644
--- a/packaging/mmsvc-recorder.spec
+++ b/packaging/mmsvc-recorder.spec
@@ -1,6 +1,6 @@
 Name:       mmsvc-recorder
 Summary:    A Recorder module for muse server
-Version:    0.2.3
+Version:    0.2.4
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0