Add temp key name macro

Change-Id: Ic8696183594dab06cbd2d0286efcd980ae75e446
Signed-off-by: Kim Tae Soo <taesoo46.kim@samsung.com>

diff --git a/include/define.h b/include/define.h
index 4b9ce75..ac1b648 100644 (file)
--- a/include/define.h
+++ b/include/define.h
@@ -429,6 +429,14 @@
 #define POSITION_PLAY_LIST_POPUP_Y 190
 
 /* TEMP KEY DEFINITION */
+#undef KEY_UP
+#define KEY_UP "Up"
+#undef KEY_DOWN
+#define KEY_DOWN "Down"
+#undef KEY_LEFT
+#define KEY_LEFT "Left"
+#undef KEY_RIGHT
+#define KEY_RIGHT "Right"
 #undef KEY_VOLUMEUP
 #define KEY_VOLUMEUP "F9"
 #undef KEY_VOLUMEDOWN
@@ -439,34 +447,31 @@
 #define KEY_BACK "Escape"
 #undef KEY_MENU
 #define KEY_MENU "Super_L"
+#undef KEY_VOLUMEUP_REMOTE
+#define KEY_VOLUMEUP_REMOTE "XF86AudioRaiseVolume"
+#undef KEY_VOLUMEDOWN_REMOTE
+#define KEY_VOLUMEDOWN_REMOTE "XF86AudioLowerVolume"
 #undef KEY_ENTER_REMOTE
 #define KEY_ENTER_REMOTE "KP_Enter"
 #undef KEY_BACK_REMOTE
 #define KEY_BACK_REMOTE "XF86Close"
 #undef KEY_MENU_REMOTE
 #define KEY_MENU_REMOTE "XF86Send"
-#undef KEY_UP
-#define KEY_UP "Up"
-#undef KEY_DOWN
-#define KEY_DOWN "Down"
-#undef KEY_LEFT
-#define KEY_LEFT "Left"
-#undef KEY_RIGHT
-#define KEY_RIGHT "Right"
-
-/* SHOULD BE DEFINED */
 #undef KEY_PLAY
-#define KEY_PLAY "Play"
+#define KEY_PLAY "XF86AudioPlay"
+#undef KEY_PAUSE
+#define KEY_PAUSE "Pause"
 #undef KEY_NEXT
-#define KEY_NEXT "Next"
+#define KEY_NEXT "XF86AudioNext"
 #undef KEY_PREVIOUS
-#define KEY_PREVIOUS "Previous"
+#define KEY_PREVIOUS "XF86AudioPrev"
+#undef KEY_MUTE
+#define KEY_MUTE "XF86AudioMute"
+
+/* SHOULD BE DEFINED */
 #undef KEY_EXIT
 #define KEY_EXIT "Exit"
-#undef KEY_MUTE
-#define KEY_MUTE "Mute"
-#undef KEY_PAUSE
-#define KEY_PAUSE "Pause"
+
 
 /* SORTING ID */
 #define SORT_BY_ARTIST_AZ "SORT_BY_ARTIST_AZ"

diff --git a/src/views/base-view.cpp b/src/views/base-view.cpp
index ccec9b2..93ff5fb 100644 (file)
--- a/src/views/base-view.cpp
+++ b/src/views/base-view.cpp
@@ -975,9 +975,11 @@ void CMusicBaseView::OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key
                                m_UpdateCurrentLayout(true);
                        }
                }
-               else if (!strcmp(ev->keyname, KEY_VOLUMEUP))
+               else if (!strcmp(ev->keyname, KEY_VOLUMEUP) ||
+                       !strcmp(ev->keyname, KEY_VOLUMEUP_REMOTE))
                        m->pHandleVolume->Up();
-               else if (!strcmp(ev->keyname, KEY_VOLUMEDOWN))
+               else if (!strcmp(ev->keyname, KEY_VOLUMEDOWN) ||
+                       !strcmp(ev->keyname, KEY_VOLUMEDOWN_REMOTE))
                        m->pHandleVolume->Down();
                else if (!strcmp(ev->keyname, KEY_MUTE))
                        m->pHandleVolume->Mute();