From e88bcfff1f81bf4ade7b3a5d89e0825d267d2601 Mon Sep 17 00:00:00 2001 From: "sahil.ch525" Date: Wed, 30 Dec 2015 17:10:22 +0530 Subject: [PATCH] Volume bar problem Resolved Change-Id: Ibff64edaebc34c49f87458c6dc4090d76c89cdf5 Signed-off-by: sahil.ch525 --- src/common/mp-app.c | 4 ++-- src/core/include/mp-volume.h | 2 +- src/core/mp-volume.c | 4 ++-- src/mp-main.c | 4 +--- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/common/mp-app.c b/src/common/mp-app.c index fa7c9d3..1420751 100755 --- a/src/common/mp-app.c +++ b/src/common/mp-app.c @@ -1025,7 +1025,7 @@ mp_app_grab_mm_keys(struct appdata *ad) { WARN_TRACE(""); Eina_Bool error = EINA_FALSE; - error = eext_win_keygrab_set(ad->xwin, "XF86AudioMedia"); + error = eext_win_keygrab_set(ad->win_main, "XF86AudioMedia"); if (error != EINA_TRUE) { ERROR_TRACE("Keygrab Failed"); } @@ -1044,7 +1044,7 @@ mp_app_ungrab_mm_keys(struct appdata *ad) WARN_TRACE(""); media_key_release(); Eina_Bool error = EINA_FALSE; - error = eext_win_keygrab_unset(ad->xwin, "XF86AudioMedia"); + error = eext_win_keygrab_unset(ad->win_main, "XF86AudioMedia"); if (error != EINA_TRUE) { ERROR_TRACE("Keygrab Failed"); } diff --git a/src/core/include/mp-volume.h b/src/core/include/mp-volume.h index 4f5c935..dc61dcc 100644 --- a/src/core/include/mp-volume.h +++ b/src/core/include/mp-volume.h @@ -43,7 +43,7 @@ extern "C" { #if 0 void mp_volume_init(Ecore_X_Window xwin, Elm_Win *Win); #else -void mp_volume_init(void *xwin, Elm_Win *Win); +void mp_volume_init(void *win); #endif void mp_volume_finalize(void); void mp_volume_key_grab_condition_set(mp_volume_key_grab_condition_e condition, bool enabled); diff --git a/src/core/mp-volume.c b/src/core/mp-volume.c index 39b7b6c..861795e 100755 --- a/src/core/mp-volume.c +++ b/src/core/mp-volume.c @@ -55,11 +55,11 @@ void mp_volume_init(Ecore_X_Window xwin, Elm_Win *win) #else void -mp_volume_init(void *xwin, Elm_Win *win) +mp_volume_init(void *win) #endif { startfunc; - g_volume_key_mgr.xwin = xwin; + g_volume_key_mgr.xwin = win; g_volume_key_mgr.win = win; #if 0 diff --git a/src/mp-main.c b/src/mp-main.c index 66644fe..3d5801f 100755 --- a/src/mp-main.c +++ b/src/mp-main.c @@ -567,7 +567,6 @@ _mp_main_app_init_idler_cb(void *data) if (!mp_app_noti_init(ad)) { ERROR_TRACE("Error when noti init"); } - ad->key_down = ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, mp_app_key_down_cb, ad); ad->key_up = ecore_event_handler_add(ECORE_EVENT_KEY_UP, mp_app_key_up_cb, ad); /*ad->mouse_button_down = ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, mp_app_mouse_event_cb, ad); @@ -636,7 +635,7 @@ _mp_main_app_init_idler_cb(void *data) ERROR_TRACE("Error when set session"); } */ - mp_volume_init(ad->xwin, ad->win_main); + mp_volume_init(ad->win_main); #ifdef MP_SOUND_PLAYER mp_volume_key_grab_condition_set(MP_VOLUME_KEY_GRAB_COND_VIEW_VISIBLE, true); #endif @@ -1407,7 +1406,6 @@ mp_create(void *data) evas_object_smart_callback_add(ad->win_main, "profile,changed", _mp_main_win_profile_changed_cb, ad); #endif -// ad->xwin = elm_win_xwindow_get(ad->win_main); ad->evas = evas_object_evas_get(ad->win_main); -- 2.7.4