diff options
| author | Martijn Kaijser <martijn@xbmc.org> | 2016-04-02 08:06:02 +0200 |
|---|---|---|
| committer | Martijn Kaijser <martijn@xbmc.org> | 2016-04-02 08:06:02 +0200 |
| commit | 929077f3da6a752f8e5521d4698ee27a44f736a3 (patch) | |
| tree | bb09c6440d19b42b0b7b45357fca95c075936d0b | |
| parent | 0436322e75e271bd57a5c1597240f8fe0ef8add3 (diff) | |
| parent | 4f69431b6d8d72c49ce8e5d6734e856ae8e4fd1f (diff) | |
Merge pull request #9498 from OpenELEC/KEY_EPG
add support for KEY_EPG found on various remotes
| -rw-r--r-- | system/keymaps/keyboard.xml | 2 | ||||
| -rw-r--r-- | xbmc/input/XBMC_keysym.h | 1 | ||||
| -rw-r--r-- | xbmc/input/XBMC_keytable.cpp | 1 | ||||
| -rw-r--r-- | xbmc/input/XBMC_vkeys.h | 1 | ||||
| -rw-r--r-- | xbmc/input/linux/LinuxInputDevices.cpp | 1 |
5 files changed, 6 insertions, 0 deletions
diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml index 49d6fb89ef..9d0979dd00 100644 --- a/system/keymaps/keyboard.xml +++ b/system/keymaps/keyboard.xml @@ -95,6 +95,7 @@ <sleep>ActivateWindow(shutdownmenu)</sleep> <!-- PVR windows --> <e>ActivateWindow(TVGuide)</e> + <epg>ActivateWindow(TVGuide)</epg> <h>ActivateWindow(TVChannels)</h> <j>ActivateWindow(RadioChannels)</j> <k>ActivateWindow(TVRecordings)</k> @@ -221,6 +222,7 @@ <keyboard> <e>PreviousMenu</e> <t>ShowTimerRule</t> + <epg>PreviousMenu</epg> </keyboard> </TVGuide> <MyRadioChannels> diff --git a/xbmc/input/XBMC_keysym.h b/xbmc/input/XBMC_keysym.h index 89c21f5c60..e7410ec432 100644 --- a/xbmc/input/XBMC_keysym.h +++ b/xbmc/input/XBMC_keysym.h @@ -229,6 +229,7 @@ typedef enum { XBMCK_FAVORITES = 0x14d, XBMCK_HOMEPAGE = 0x14e, XBMCK_CONFIG = 0x14f, + XBMCK_EPG = 0x150, // Add any other keys here diff --git a/xbmc/input/XBMC_keytable.cpp b/xbmc/input/XBMC_keytable.cpp index 4d05464722..14fd3840a8 100644 --- a/xbmc/input/XBMC_keytable.cpp +++ b/xbmc/input/XBMC_keytable.cpp @@ -243,6 +243,7 @@ static const XBMCKEYTABLE XBMCKeyTable[] = , { XBMCK_FAVORITES, 0, 0, XBMCVK_FAVORITES, "favorites" } , { XBMCK_HOMEPAGE , 0, 0, XBMCVK_HOMEPAGE, "homepage" } , { XBMCK_CONFIG, 0, 0, XBMCVK_CONFIG, "config" } +, { XBMCK_EPG , 0, 0, XBMCVK_EPG, "epg" } }; static int XBMCKeyTableSize = sizeof(XBMCKeyTable)/sizeof(XBMCKEYTABLE); diff --git a/xbmc/input/XBMC_vkeys.h b/xbmc/input/XBMC_vkeys.h index af114c976e..4e3787c283 100644 --- a/xbmc/input/XBMC_vkeys.h +++ b/xbmc/input/XBMC_vkeys.h @@ -221,6 +221,7 @@ typedef enum { XBMCVK_FAVORITES = 0xE9, XBMCVK_HOMEPAGE = 0xEA, XBMCVK_CONFIG = 0xEB, + XBMCVK_EPG = 0xEC, XBMCVK_LAST = 0xFF } XBMCVKey; diff --git a/xbmc/input/linux/LinuxInputDevices.cpp b/xbmc/input/linux/LinuxInputDevices.cpp index b97a40ecd8..5486e28589 100644 --- a/xbmc/input/linux/LinuxInputDevices.cpp +++ b/xbmc/input/linux/LinuxInputDevices.cpp @@ -273,6 +273,7 @@ KeyMap keyMap[] = { { KEY_FILE , XBMCK_LAUNCH_FILE_BROWSER}, { KEY_SELECT , XBMCK_RETURN }, { KEY_CONFIG , XBMCK_CONFIG }, + { KEY_EPG , XBMCK_EPG }, // The Little Black Box Remote Additions { 384 , XBMCK_LEFT }, // Red { 378 , XBMCK_RIGHT }, // Green |