[TSAM-8752]Controller on album art click added 21/92921/1
authorAlka Sethi <alka.sethi@samsung.com>
Wed, 19 Oct 2016 10:43:40 +0000 (16:13 +0530)
committerAlka Sethi <alka.sethi@samsung.com>
Wed, 19 Oct 2016 10:43:40 +0000 (16:13 +0530)
Change-Id: Icd3af5bd29aa8a7ebb260ad0c5bf5c02af68788d
Signed-off-by: Alka Sethi <alka.sethi@samsung.com>
playview/res/edje/pv-minicontroller.edc
playview/src/widget/vp-play-minicontroller.c

index d0c3fbe..ab38032 100644 (file)
@@ -783,7 +783,7 @@ group {
                MC_PROGRAM_IMAGE_VISIBLE("pause_btn", "show_pause_btn", "hide_pause_btn")
 
                program { name: "albumart_cb";
-                  signal: "mouse,clicked,1";
+                  signal: "mouse,down,1";
                   source: "albumart_image";
                        script{
                           emit("albumart_clicked", "edje");
@@ -873,14 +873,13 @@ group {
                           emit("close_btn_clicked", "edje");
                   }
                }
-
+/*
                program{
                        name: "albumart_cb_after_down";
                        source: "albumart_image";
                        signal: "mouse,down,1";
                        transition: ACCELERATE 0.02;
                }
-               /*
                program {
                        name: "albumart_cb_down";
                        source: "albumart_image";
@@ -1347,19 +1346,19 @@ group {
                }
 
                program { name: "albumart_cb";
-                  signal: "mouse,clicked,1";
+                  signal: "mouse,down,1";
                   source: "albumart_image";
                        script{
                           emit("albumart_clicked", "edje");
                   }
                }
+               /*
                program{
                        name: "albumart_cb_after_down";
                        source: "albumart_image";
                        signal: "mouse,down,1";
                        transition: ACCELERATE 0.02;
                }
-               /*
                program {
                        name: "albumart_cb_down";
                        source: "albumart_image";
index 1cf4d47..70a7caa 100644 (file)
@@ -95,29 +95,17 @@ _vp_minicontroller_landscape_is(PlayView *pPlayView, video_play_rotate_t angle)
        return landscape;
 }
 
-//static void
-//_vp_minicontroller_action_show_player_view(struct appdata *ad)
-//{
-//     startfunc;
-//     MP_CHECK(ad);
-//#ifndef MP_SOUND_PLAYER
-//     if (GET_PLAYER_VIEW != vp_view_mgr_get_top_view(GET_VIEW_MGR)) {
-//             if (!ad->is_focus_out) {
-//                     minicontrol_send_event(ad->win_minicon, MINICONTROL_EVENT_REQUEST_HIDE, NULL);
-//             } else {
-//                     vp_util_app_resume();
-//             }
-//             vp_common_show_player_view(MP_PLAYER_NORMAL, true, false, true);
-//     } else
-//#endif
-//     {
-//             if (!ad->is_focus_out) {
-//                     minicontrol_send_event(ad->win_minicon, MINICONTROL_EVENT_REQUEST_HIDE, NULL);
-//             } else {
-//                     vp_util_app_resume();
-//             }
-//     }
-//}
+static void
+_vp_minicontroller_action_show_player_view(PlayView *pPlayView)
+{
+       if (!pPlayView) {
+               VideoLogError("pPlayView is NULL");
+       }
+       VideoLogDebug("Showing controller.");
+       minicontrol_send_event(pPlayView->win_minicon, MINICONTROL_EVENT_REQUEST_HIDE, NULL);
+       vp_play_util_app_resume();
+
+}
 
 static void
 _minicontroller_action_cb(void *data, Evas_Object * obj, const char *emission, const char *source)
@@ -128,11 +116,12 @@ _minicontroller_action_cb(void *data, Evas_Object * obj, const char *emission, c
        }
        if (emission) {
                if (!g_strcmp0(emission, "close_btn_clicked")) {
+                       VideoLogDebug("close button clicked!!");
                        vp_minicontroller_destroy(pPlayView);
                        vp_play_normal_view_on_controller_button_press(pPlayView->pNormalView, CONTROLLER_PAUSE_BUTTON);
                } else if (!g_strcmp0(emission, "albumart_clicked")) {
-               //      EVENT_TRACE("albumart");
-               //      _vp_minicontroller_action_show_player_view(ad);
+                       VideoLogDebug("albumart clicked!!");
+                       _vp_minicontroller_action_show_player_view(pPlayView);
                        return;
                }
        }