From 4f0f495be6ef5dc28f20feb88d2b335d5e620d3b Mon Sep 17 00:00:00 2001 From: HyunJin Park Date: Mon, 4 Apr 2016 13:28:46 +0900 Subject: [PATCH] Revert "[Mediakey] add ecore_main_loop_iterate [Verification] TCT pass rate 100% (15/15/0/0/0)" This reverts commit 1b4d732547f01c7b6ac904b1547f304265459496. Change-Id: I3acf55b8f56fc41c1a4e6541aa648b89fb0c4bdf --- src/mediakey/mediakey.gyp | 1 - src/mediakey/mediakey_manager.cc | 32 -------------------------------- 2 files changed, 33 deletions(-) diff --git a/src/mediakey/mediakey.gyp b/src/mediakey/mediakey.gyp index 2a8656d7..339ea010 100644 --- a/src/mediakey/mediakey.gyp +++ b/src/mediakey/mediakey.gyp @@ -26,7 +26,6 @@ 'variables': { 'packages': [ 'capi-system-media-key', - 'ecore', ] }, }], diff --git a/src/mediakey/mediakey_manager.cc b/src/mediakey/mediakey_manager.cc index 654ccce7..0ba6aea7 100755 --- a/src/mediakey/mediakey_manager.cc +++ b/src/mediakey/mediakey_manager.cc @@ -17,8 +17,6 @@ #include "mediakey/mediakey_manager.h" #include "common/logger.h" #include "common/platform_exception.h" -#include -#include namespace extension { namespace mediakey { @@ -40,37 +38,14 @@ MediaKeyManager::MediaKeyManager() LoggerD("Enter"); } -static int timeout_id_=0; - -static gboolean itr_ecore(gpointer user_data){ - //LoggerD("Enter"); - ecore_main_loop_iterate(); - - return true; -} - common::PlatformResult MediaKeyManager::RegisterMediaKeyEventListener( MediaKeyListener* listener) { LoggerD("Enter"); - - - - if (!m_media_key_listener_registered) { LoggerD("before calling media_key_reserve"); - - ecore_init(); - timeout_id_ = g_timeout_add(100, itr_ecore, this); - int ret = media_key_reserve(MediaKeyEventCallback, NULL); - LoggerD("after calling media_key_reserve - result = %d", ret); if (MEDIA_KEY_ERROR_NONE != ret) { - if (timeout_id_ > 0) { - // cancel terminate callback - g_source_remove(timeout_id_); - timeout_id_ = 0; - } return LogAndCreateResult( ErrorCode::UNKNOWN_ERR, "Failed to register a media keys change event callback", @@ -86,13 +61,6 @@ common::PlatformResult MediaKeyManager::UnregisterMediaKeyEventListener() { LoggerD("Enter"); if (m_media_key_listener_registered) { int ret = media_key_release(); - - if (timeout_id_ > 0) { - // cancel terminate callback - g_source_remove(timeout_id_); - timeout_id_ = 0; - } - if (MEDIA_KEY_ERROR_NONE != ret) { return LogAndCreateResult( ErrorCode::UNKNOWN_ERR, -- 2.34.1