From 50753fe835e1190e157c318bbe9a022b77a894c8 Mon Sep 17 00:00:00 2001 From: Soonmin Jung Date: Tue, 4 Sep 2012 14:41:55 +0900 Subject: [PATCH] Remove voice recorder --- composer/include/msg-ui-composer-external.h | 1 - composer/src/external/msg-ui-composer-external.c | 46 ---------------------- .../ui-composer/msg-ui-composer-body-callback.c | 3 -- 3 files changed, 50 deletions(-) diff --git a/composer/include/msg-ui-composer-external.h b/composer/include/msg-ui-composer-external.h index 1515748..db2adb5 100755 --- a/composer/include/msg-ui-composer-external.h +++ b/composer/include/msg-ui-composer-external.h @@ -36,7 +36,6 @@ typedef enum { COMPOSER_EXT_TYPE_GALLERY, COMPOSER_EXT_TYPE_MYFILE, - COMPOSER_EXT_TYPE_VOICEREC, COMPOSER_EXT_TYPE_LOG, COMPOSER_EXT_TYPE_CONTACT, COMPOSER_EXT_TYPE_CONTACTLIST, diff --git a/composer/src/external/msg-ui-composer-external.c b/composer/src/external/msg-ui-composer-external.c index 440bdbd..5da1614 100755 --- a/composer/src/external/msg-ui-composer-external.c +++ b/composer/src/external/msg-ui-composer-external.c @@ -981,48 +981,6 @@ int appsvc_take_camcorder(void *data) return COMPOSER_RETURN_SUCCESS; } -static void __appsvc_record_voice_result_cb(bundle *b, int reserved, appsvc_result_val result, void *data) -{ - D_ENTER; - MSG_COMPOSER_VIEW_DATA_S *cd = (MSG_COMPOSER_VIEW_DATA_S *)data; - - if (result == APPSVC_RES_OK) { - const char *result_filename = appsvc_get_data(b, APPSVC_DATA_SELECTED); - if (result_filename) { - D_MSG("result file name : %s", result_filename); - cd->attachlist = eina_list_append(cd->attachlist, g_strdup(result_filename)); - } else { - D_MSG("No result"); - } - } - __msg_ui_composer_external_closed(cd); - D_LEAVE; -} - -int appsvc_record_voice(void *data) -{ - D_ENTER; - - MSG_COMPOSER_VIEW_DATA_S *cd = (MSG_COMPOSER_VIEW_DATA_S *)data; - int ret; - bundle *b; - - b = bundle_create(); - appsvc_set_operation(b, APPSVC_OPERATION_CREATE_CONTENT); - appsvc_set_mime(b, "audio/amr"); /*"audio/mp4" for high quality*/ - appsvc_add_data(b, "SIZE", MSG_BUNDLE_VALUE_VR_LIMIT_SIZE); /* unit:KB (if max size is not set, no limit.)*/ - ret = appsvc_run_service(b, 0, __appsvc_record_voice_result_cb, cd); - bundle_free(b); - - if (ret < APPSVC_RET_OK) { - D_EMSG("appsvc_run_service is failed ret = %d", ret); - return COMPOSER_RETURN_FAIL; - } - - D_LEAVE; - return COMPOSER_RETURN_SUCCESS; -} - int appsvc_launch_app(const char *uri) { D_ENTER; @@ -1129,9 +1087,6 @@ COMPOSER_RETURN_TYPE_E msg_ui_composer_external_aul_call(MSG_COMPOSER_VIEW_DATA_ case COMPOSER_EXT_TYPE_CAMCORDER: ret = appsvc_take_camcorder(cd); break; - case COMPOSER_EXT_TYPE_VOICEREC: - ret = appsvc_record_voice(cd); - break; case COMPOSER_EXT_TYPE_COMMON: ret = appsvc_launch_app(reserved); break; @@ -1169,7 +1124,6 @@ COMPOSER_RETURN_TYPE_E msg_ui_composer_external_call(MSG_COMPOSER_VIEW_DATA_S *c ret = msg_ui_composer_external_ug_call(cd, ext_type, reserved); break; - case COMPOSER_EXT_TYPE_VOICEREC: case COMPOSER_EXT_TYPE_CAMERA: case COMPOSER_EXT_TYPE_CAMCORDER: case COMPOSER_EXT_TYPE_COMMON: diff --git a/composer/src/ui-composer/msg-ui-composer-body-callback.c b/composer/src/ui-composer/msg-ui-composer-body-callback.c index 63cd6fa..e3a9b31 100755 --- a/composer/src/ui-composer/msg-ui-composer-body-callback.c +++ b/composer/src/ui-composer/msg-ui-composer-body-callback.c @@ -74,8 +74,6 @@ static void __add_list_popup_clicked_cb(void *data, Evas_Object *obj, void *even msg_ui_composer_external_call(cd, COMPOSER_EXT_TYPE_MYFILE, NULL); } else if (!g_strcmp0(label, _MSGSTR("IDS_MSGC_BODY_TAKE_PICTURE"))) { msg_ui_composer_external_call(cd, COMPOSER_EXT_TYPE_CAMERA, NULL); - } else if (!g_strcmp0(label, _MSGSTR("IDS_MSGC_BODY_RECORD_AUDIO"))) { - msg_ui_composer_external_call(cd, COMPOSER_EXT_TYPE_VOICEREC, NULL); } else if (!g_strcmp0(label, _MSGSTR("IDS_MSGC_BODY_CAPTURE_VIDEO"))) { msg_ui_composer_external_call(cd, COMPOSER_EXT_TYPE_CAMCORDER, NULL); } else if (!g_strcmp0(label, MSGC_STR_CONTACT)) { @@ -127,7 +125,6 @@ static void __add_list_popup_show(void *data) elm_list_item_append(list, MSGC_STR_GALLERY, NULL, NULL, __add_list_popup_clicked_cb, data); elm_list_item_append(list, _MSGSTR("IDS_MSGC_BODY_TAKE_PICTURE"), NULL, NULL, __add_list_popup_clicked_cb, data); elm_list_item_append(list, _MSGSTR("IDS_MSGC_BODY_CAPTURE_VIDEO"), NULL, NULL, __add_list_popup_clicked_cb, data); - elm_list_item_append(list, _MSGSTR("IDS_MSGC_BODY_RECORD_AUDIO"), NULL, NULL, __add_list_popup_clicked_cb, data); elm_list_item_append(list, MSGC_STR_MYFILE, NULL, NULL, __add_list_popup_clicked_cb, data); elm_list_item_append(list, MSGC_STR_CONTACT, NULL, NULL, __add_list_popup_clicked_cb, data); elm_list_item_append(list, MSGC_STR_CALENDAR, NULL, NULL, __add_list_popup_clicked_cb, data); -- 2.7.4