From ebbcd3d9e262e7c729c2c8b2a036d80712f940fc Mon Sep 17 00:00:00 2001 From: Jihye Kang Date: Fri, 5 Apr 2013 20:04:05 +0900 Subject: [PATCH] [WK2] Add TIZEN_LOG for MediaCapture API [Title] Add TIZEN_LOG for MediaCapture API [Issue#] N/A [Problem] [Cause] [Solution] Change-Id: Ia8a54b2404a7cc92c1a0ad75816197cb6970e309 --- .../WebKit2/UIProcess/API/efl/tizen/OpenPanel.cpp | 58 ++++++++++++---------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/Source/WebKit2/UIProcess/API/efl/tizen/OpenPanel.cpp b/Source/WebKit2/UIProcess/API/efl/tizen/OpenPanel.cpp index aee4bcd..f7dd033 100644 --- a/Source/WebKit2/UIProcess/API/efl/tizen/OpenPanel.cpp +++ b/Source/WebKit2/UIProcess/API/efl/tizen/OpenPanel.cpp @@ -40,35 +40,35 @@ OpenPanel::~OpenPanel() static void layout_cb(ui_gadget_h ug, enum ug_mode mode, void* priv) { - Evas_Object* base, *win; - - if (!ug || !priv) - return; - - base = (Evas_Object*)ug_get_layout(ug); - if (!base) - return; - - win = (Evas_Object*)ug_get_window(); - - switch (mode) - { - case UG_MODE_FULLVIEW: - evas_object_size_hint_weight_set(base, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, base); - evas_object_show(base); - break; - default: - break; - } + Evas_Object* base, *win; + + if (!ug || !priv) + return; + + base = (Evas_Object*)ug_get_layout(ug); + if (!base) + return; + + win = (Evas_Object*)ug_get_window(); + + switch (mode) { + case UG_MODE_FULLVIEW: + evas_object_size_hint_weight_set(base, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, base); + evas_object_show(base); + break; + default: + break; + } } static void result_cb(ui_gadget_h ug, service_h service, void* priv) { - if (ug == NULL || priv == NULL) + TIZEN_LOGI("ug(%d), service(%d), priv(%d)", ug, service, priv); + if (!ug || !priv) return; - OpenPanel* openPanel = (OpenPanel*)priv; + OpenPanel* openPanel = static_cast(priv); Evas_Object* ewk_view = openPanel->ewkView(); if (!ewk_view) return; @@ -105,12 +105,13 @@ static void result_cb(ui_gadget_h ug, service_h service, void* priv) static void destroy_cb(ui_gadget_h ug, void* priv) { + TIZEN_LOGI("ug(%d), priv(%d)", ug, priv); ug_destroy(ug); OpenPanel* openPanel = (OpenPanel*)priv; Evas_Object* ewk_view = openPanel->ewkView(); if (!ewk_view) - return; + return; ewk_view_open_panel_reply(ewk_view, NULL, EINA_FALSE); return; @@ -120,6 +121,8 @@ static void _cameraResultCb(service_h request, service_h reply, service_result_e { OpenPanel* openPanel = static_cast(data); + TIZEN_LOGI("result(%d)", result); + if (result == SERVICE_RESULT_SUCCEEDED) { char* resultFilename = 0; int ret = service_get_extra_data(reply, SERVICE_DATA_SELECTED, &resultFilename); @@ -156,6 +159,7 @@ bool OpenPanel::_capturePicture() int ret = service_send_launch_request(svcHandle, _cameraResultCb, this); if (ret != SERVICE_ERROR_NONE) { service_destroy(svcHandle); + TIZEN_LOGE("ret(%d)", ret); return false; } @@ -178,6 +182,7 @@ bool OpenPanel::_recordVideo() int ret = service_send_launch_request(svcHandle, _cameraResultCb, this); if (ret != SERVICE_ERROR_NONE) { service_destroy(svcHandle); + TIZEN_LOGE("ret(%d)", ret); return false; } @@ -198,6 +203,7 @@ bool OpenPanel::_recordVoice() int ret = service_send_launch_request(svcHandle, _cameraResultCb, this); if (ret != SERVICE_ERROR_NONE) { service_destroy(svcHandle); + TIZEN_LOGE("ret(%d)", ret); return false; } @@ -304,8 +310,10 @@ bool OpenPanel::openPanel(Evas_Object* ewkView, Eina_Bool allow_multiple_files, cbs.destroy_cb = destroy_cb; cbs.priv = (void*)this; - if(!ug_create(NULL, "myfile-efl", UG_MODE_FULLVIEW, service, &cbs)) + if(!ug_create(NULL, "myfile-efl", UG_MODE_FULLVIEW, service, &cbs)) { + TIZEN_LOGE("ug_create FAIL"); return false; + } service_destroy(service); -- 2.7.4