From ce9178f9c1138060a1f0deff25db03e2707d1472 Mon Sep 17 00:00:00 2001 From: Jeongmo Yang Date: Tue, 5 Jan 2016 11:48:03 +0900 Subject: [PATCH] Release version 0.10.23 1. Remove and replace unsupported mm-sound APIs Change-Id: I1be301b242189487798e9ce90e7ef37e3f440a83 Signed-off-by: Jeongmo Yang --- packaging/libmm-camcorder.spec | 2 +- src/include/mm_camcorder_sound.h | 1 - src/mm_camcorder_resource.c | 2 +- src/mm_camcorder_sound.c | 45 ++-------------------------------------- src/mm_camcorder_stillshot.c | 1 - 5 files changed, 4 insertions(+), 47 deletions(-) diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec index 21c730a..bdeb87c 100644 --- a/packaging/libmm-camcorder.spec +++ b/packaging/libmm-camcorder.spec @@ -2,7 +2,7 @@ Name: libmm-camcorder Summary: Camera and recorder library -Version: 0.10.22 +Version: 0.10.23 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/include/mm_camcorder_sound.h b/src/include/mm_camcorder_sound.h index b1a05a8..3b148e1 100644 --- a/src/include/mm_camcorder_sound.h +++ b/src/include/mm_camcorder_sound.h @@ -64,7 +64,6 @@ typedef enum { typedef struct __SOUND_INFO { /* PCM */ MMSoundPcmHandle_t handle; - mm_sound_device_out active_out_backup; int volume_type; unsigned int volume_level; diff --git a/src/mm_camcorder_resource.c b/src/mm_camcorder_resource.c index 93a9b49..57c2110 100644 --- a/src/mm_camcorder_resource.c +++ b/src/mm_camcorder_resource.c @@ -391,7 +391,7 @@ int _mmcamcorder_resource_manager_deinit(MMCamcorderResourceManager *resource_ma if (resource_manager->rset) { if (resource_manager->rset->state == MRP_RES_RESOURCE_ACQUIRED) { if (mrp_res_release_resource_set(resource_manager->rset)) - _mmcam_dbg_err("- could not release resource\n"); + _mmcam_dbg_err("- could not release resource"); } mrp_res_delete_resource_set(resource_manager->rset); resource_manager->rset = NULL; diff --git a/src/mm_camcorder_sound.c b/src/mm_camcorder_sound.c index ef8c7d7..d2fda12 100644 --- a/src/mm_camcorder_sound.c +++ b/src/mm_camcorder_sound.c @@ -167,8 +167,6 @@ gboolean _mmcamcorder_sound_init(MMHandleType handle) int sound_enable = TRUE; mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); SOUND_INFO *info = NULL; - mm_sound_device_in device_in; - mm_sound_device_out device_out; pa_mainloop_api *api = NULL; int error = PA_ERR_INTERNAL; @@ -349,26 +347,6 @@ gboolean _mmcamcorder_sound_init(MMHandleType handle) } #endif /* _MMCAMCORDER_UPLOAD_SAMPLE */ - /* backup current route */ - info->active_out_backup = DEFAULT_ACTIVE_DEVICE; - - ret = mm_sound_get_active_device(&device_in, &device_out); - if (ret != MM_ERROR_NONE) { - _mmcam_dbg_err("mm_sound_get_active_device failed [%x]. skip sound play.", ret); - goto SOUND_INIT_ERROR; - } - - _mmcam_dbg_log("current out [%x]", device_out); - - if (device_out != MM_SOUND_DEVICE_OUT_SPEAKER) { - //ret = mm_sound_set_active_route_without_broadcast (MM_SOUND_ROUTE_OUT_SPEAKER); - if (ret != MM_ERROR_NONE) { - _mmcam_dbg_err("mm_sound_set_active_route_without_broadcast failed [%x]. skip sound play.", ret); - goto SOUND_INIT_ERROR; - } - info->active_out_backup = device_out; - } - //info->volume_type = PA_TIZEN_AUDIO_VOLUME_TYPE_FIXED; info->volume_level = 0; @@ -547,24 +525,6 @@ gboolean _mmcamcorder_sound_finalize(MMHandleType handle) return TRUE; } - /* Restore route */ - _mmcam_dbg_log("restore route"); - if (info->active_out_backup != DEFAULT_ACTIVE_DEVICE) { - ret = mm_sound_get_active_device(&device_in, &device_out); - if (ret != MM_ERROR_NONE) { - _mmcam_dbg_err("mm_sound_get_active_device failed [%x]", ret); - } - - _mmcam_dbg_log("current out [%x]", device_out); - - if (device_out != info->active_out_backup) { - //ret = mm_sound_set_active_route_without_broadcast (info->active_out_backup); - if (ret != MM_ERROR_NONE) { - _mmcam_dbg_err("mm_sound_set_active_route_without_broadcast [%x]", ret); - } - } - } - pa_threaded_mainloop_lock(info->pulse_mainloop); #ifdef _MMCAMCORDER_UPLOAD_SAMPLE @@ -613,7 +573,6 @@ gboolean _mmcamcorder_sound_finalize(MMHandleType handle) #endif /* _MMCAMCORDER_UPLOAD_SAMPLE */ info->state = _MMCAMCORDER_SOUND_STATE_NONE; - info->active_out_backup = DEFAULT_ACTIVE_DEVICE; /* release mutex and cond */ _mmcam_dbg_log("release play_mutex/cond"); @@ -680,8 +639,8 @@ void _mmcamcorder_sound_solo_play(MMHandleType handle, const char* filepath, gbo if (hcamcorder->shutter_sound_policy == VCONFKEY_CAMERA_SHUTTER_SOUND_POLICY_ON || hcamcorder->sub_context->info_image->sound_status) { - ret = mm_sound_play_loud_solo_sound(filepath, VOLUME_TYPE_FIXED | gain_type, - (mm_sound_stop_callback_func)__solo_sound_callback, (void*)hcamcorder, &sound_handle); + ret = mm_sound_play_sound(filepath, VOLUME_TYPE_FIXED | gain_type, + (mm_sound_stop_callback_func)__solo_sound_callback, (void*)hcamcorder, &sound_handle); sound_played = TRUE; } else { _mmcam_dbg_warn("skip shutter sound"); diff --git a/src/mm_camcorder_stillshot.c b/src/mm_camcorder_stillshot.c index bc3b9f9..d67f67e 100644 --- a/src/mm_camcorder_stillshot.c +++ b/src/mm_camcorder_stillshot.c @@ -852,7 +852,6 @@ int _mmcamcorder_image_cmd_preview_stop(MMHandleType handle) _mmcam_dbg_log("deregister sound status callback"); vconf_ignore_key_changed(VCONFKEY_SETAPPL_SOUND_STATUS_BOOL, __sound_status_changed_cb); - mm_sound_volume_remove_callback(VOLUME_TYPE_SYSTEM); sc->info_image->sound_status = _SOUND_STATUS_INIT; } -- 2.7.4