Change related feature

- As-Is : http://tizen.org/feature/microphone
- To-Be : http://tizen.org/feature/media.audio_recording, http://tizen.org/feature/media.video_recording

[Version] 0.3.9
[Profile] Common
[Issue Type] Update
[Dependency module] N/A
[Test] [M(T) - Boot=(OK), sdb=(OK), Home=(OK), Touch=(OK), Version=tizen-unified_20180108.2]

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

diff --git a/muse/src/muse_recorder_dispatcher.c b/muse/src/muse_recorder_dispatcher.c
index b8e2901..292855e 100644 (file)
--- a/muse/src/muse_recorder_dispatcher.c
+++ b/muse/src/muse_recorder_dispatcher.c
@@ -36,8 +36,9 @@
 #define LOG_TAG "MUSED_RECORDER"
 #define KEY_LENGTH 32
 
+#define AUDIO_RECORDING_FEATURE_NAME    "http://tizen.org/feature/media.audio_recording"
+#define VIDEO_RECORDING_FEATURE_NAME    "http://tizen.org/feature/media.video_recording"
 #define CAMERA_PRIVILEGE_NAME           "http://tizen.org/privilege/camera"
-#define MICROPHONE_FEATURE_NAME         "http://tizen.org/feature/microphone"
 #define RECORDER_PRIVILEGE_NAME         "http://tizen.org/privilege/recorder"
 #define RECORDER_DEVICE_STATE_KEY_AUDIO "device_state_recorder_audio"
 #define RECORDER_DEVICE_STATE_KEY_VIDEO "device_state_recorder_video"
@@ -571,7 +572,8 @@ int recorder_dispatcher_create(muse_module_h module)
        int ret = RECORDER_ERROR_NONE;
        int recorder_type = MUSE_RECORDER_TYPE_AUDIO;
        int pid = 0;
-       bool microphone_feature_supported = false;
+       bool feature_supported = false;
+       const char *feature_name = NULL;
        void *gdbus_connection = NULL;
        muse_recorder_api_e api = MUSE_RECORDER_API_CREATE;
        muse_recorder_api_class_e class = MUSE_RECORDER_API_CLASS_IMMEDIATE;
@@ -618,6 +620,8 @@ int recorder_dispatcher_create(muse_module_h module)
                LOGD("video type, camera handle : %p", muse_camera->camera_handle);
 
                ret = legacy_recorder_create_videorecorder(muse_camera->camera_handle, &muse_recorder->recorder_handle);
+
+               feature_name = VIDEO_RECORDING_FEATURE_NAME;
        } else if (recorder_type == MUSE_RECORDER_TYPE_AUDIO) {
                muse_recorder_msg_get(pid, muse_server_module_get_msg(module));
 
@@ -631,17 +635,19 @@ int recorder_dispatcher_create(muse_module_h module)
 
                ret = legacy_recorder_set_client_pid(muse_recorder->recorder_handle, pid);
                ret |= legacy_recorder_set_gdbus_connection(muse_recorder->recorder_handle, gdbus_connection);
+
+               feature_name = AUDIO_RECORDING_FEATURE_NAME;
        }
 
        if (ret != RECORDER_ERROR_NONE)
                goto _CREATE_ERROR;
 
        /* microphone feature support check */
-       if (muse_server_get_platform_info(MICROPHONE_FEATURE_NAME, &microphone_feature_supported) != MM_ERROR_NONE)
-               LOGE("failed to get platform info for microphone support");
+       if (muse_server_get_platform_info(feature_name, &feature_supported) != MM_ERROR_NONE)
+               LOGE("failed to get platform info for [%s]", feature_name);
 
-       if (!microphone_feature_supported) {
-               LOGE("MICROPHONE NOT SUPPORTED, BUT INI FILE FOR RECORDER IS EXISTED. RECOMMEND TO REMOVE IT.");
+       if (!feature_supported) {
+               LOGE("feature[%s] NOT SUPPORTED, BUT INI FILE FOR RECORDER IS EXISTED. RECOMMEND TO REMOVE IT.", feature_name);
                ret = RECORDER_ERROR_NOT_SUPPORTED;
                goto _CREATE_ERROR;
        }
@@ -670,7 +676,7 @@ _CREATE_ERROR:
        free(muse_recorder);
        muse_recorder = NULL;
 
-       LOGE("error 0x%d", ret);
+       LOGE("error 0x%x", ret);
 
        muse_recorder_msg_return(api, class, ret, module);
 
@@ -2509,7 +2515,7 @@ static int recorder_cmd_external_storage_state_changed(muse_module_h module)
                return MUSE_RECORDER_ERROR_NONE;
        }
 
-       storage_state = (int)(long)muse_server_get_cust_data(module);
+       storage_state = (int)(long)muse_server_get_user_data(module);
 
        LOGW("storage state %d", storage_state);
 

diff --git a/packaging/mmsvc-recorder.spec b/packaging/mmsvc-recorder.spec
index 8fe93e7..3aadc43 100644 (file)
--- 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.3.8
+Version:    0.3.9
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0