Bug 939006 part.12 Sort out key names in Media Controller Keys section r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Wed, 04 Jun 2014 21:43:45 +0900
changeset 205835 72f432b2f079162e526ff931a27a368997e79dc6
parent 205834 7751a79c21bf29b5094420b11a0262d6f349989d
child 205836 cb6938a8c0f9a1f3954318672c31588117612138
push id3741
push userasasaki@mozilla.com
push dateMon, 21 Jul 2014 20:25:18 +0000
treeherdermozilla-beta@4d6f46f5af68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs939006
milestone32.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 939006 part.12 Sort out key names in Media Controller Keys section r=smaug
dom/events/KeyNameList.h
widget/shared/NativeKeyToDOMKeyName.h
--- a/dom/events/KeyNameList.h
+++ b/dom/events/KeyNameList.h
@@ -264,21 +264,98 @@ DEFINE_KEYNAME_WITH_SAME_NAME(LaunchAppl
 DEFINE_KEYNAME_WITH_SAME_NAME(BrowserBack)
 DEFINE_KEYNAME_WITH_SAME_NAME(BrowserFavorites)
 DEFINE_KEYNAME_WITH_SAME_NAME(BrowserForward)
 DEFINE_KEYNAME_WITH_SAME_NAME(BrowserHome)
 DEFINE_KEYNAME_WITH_SAME_NAME(BrowserRefresh)
 DEFINE_KEYNAME_WITH_SAME_NAME(BrowserSearch)
 DEFINE_KEYNAME_WITH_SAME_NAME(BrowserStop)
 
-DEFINE_KEYNAME_WITH_SAME_NAME(Apps)
-DEFINE_KEYNAME_WITH_SAME_NAME(List)
+/******************************************************************************
+ * Media Controller Keys
+ *****************************************************************************/
+// DEFINE_KEYNAME_WITH_SAME_NAME(AudioBalanceLeft)
+// DEFINE_KEYNAME_WITH_SAME_NAME(AudioBalanceRight)
+DEFINE_KEYNAME_WITH_SAME_NAME(AudioBassBoostDown)
+DEFINE_KEYNAME_WITH_SAME_NAME(AudioBassBoostUp)
+// DEFINE_KEYNAME_WITH_SAME_NAME(AudioFaderFront)
+// DEFINE_KEYNAME_WITH_SAME_NAME(AudioFaderRear)
+// DEFINE_KEYNAME_WITH_SAME_NAME(AudioSurroundModeNext)
+// DEFINE_KEYNAME_WITH_SAME_NAME(AVRInput)
+// DEFINE_KEYNAME_WITH_SAME_NAME(AVRPower)
+DEFINE_KEYNAME_WITH_SAME_NAME(ChannelDown)
+DEFINE_KEYNAME_WITH_SAME_NAME(ChannelUp)
+DEFINE_KEYNAME_WITH_SAME_NAME(Red) // Rename to ColorF0Red
+DEFINE_KEYNAME_WITH_SAME_NAME(Green) // Rename to ColorF1Green
+DEFINE_KEYNAME_WITH_SAME_NAME(Yellow) // Rename to ColorF2Yellow
+DEFINE_KEYNAME_WITH_SAME_NAME(Blue) // Rename to ColorF3Blue
+// DEFINE_KEYNAME_WITH_SAME_NAME(Grey) // Rename to ColorF4Grey
+// DEFINE_KEYNAME_WITH_SAME_NAME(Brown) // Rename to ColorF5Brown
+// DEFINE_KEYNAME_WITH_SAME_NAME(ClosedCaptionToggle)
+DEFINE_KEYNAME_WITH_SAME_NAME(Dimmer)
+// DEFINE_KEYNAME_WITH_SAME_NAME(DisplaySwap)
+DEFINE_KEYNAME_WITH_SAME_NAME(Exit)
+// DEFINE_KEYNAME_WITH_SAME_NAME(ClearFavorite0) // Rename to FavoriteClear0
+// DEFINE_KEYNAME_WITH_SAME_NAME(ClearFavorite1) // Rename to FavoriteClear1
+// DEFINE_KEYNAME_WITH_SAME_NAME(ClearFavorite2) // Rename to FavoriteClear2
+// DEFINE_KEYNAME_WITH_SAME_NAME(ClearFavorite3) // Rename to FavoriteClear3
+// DEFINE_KEYNAME_WITH_SAME_NAME(RecallFavorite0) // Rename to FavoriteRecall0
+// DEFINE_KEYNAME_WITH_SAME_NAME(RecallFavorite1) // Rename to FavoriteRecall1
+// DEFINE_KEYNAME_WITH_SAME_NAME(RecallFavorite2) // Rename to FavoriteRecall2
+// DEFINE_KEYNAME_WITH_SAME_NAME(RecallFavorite3) // Rename to FavoriteRecall3
+// DEFINE_KEYNAME_WITH_SAME_NAME(StoreFavorite0) // Rename to FavoriteStore0
+// DEFINE_KEYNAME_WITH_SAME_NAME(StoreFavorite1) // Rename to FavoriteStore1
+// DEFINE_KEYNAME_WITH_SAME_NAME(StoreFavorite2) // Rename to FavoriteStore2
+// DEFINE_KEYNAME_WITH_SAME_NAME(StoreFavorite3) // Rename to FavoriteStore3
+DEFINE_KEYNAME_WITH_SAME_NAME(Guide)
+// DEFINE_KEYNAME_WITH_SAME_NAME(NextDay) // Rename to GuideNextDay
+// DEFINE_KEYNAME_WITH_SAME_NAME(PrevDay) // Rename to GuidePreviousDay
 DEFINE_KEYNAME_WITH_SAME_NAME(Info)
-DEFINE_KEYNAME_WITH_SAME_NAME(Exit)
-DEFINE_KEYNAME_WITH_SAME_NAME(Zoom)
+// DEFINE_KEYNAME_WITH_SAME_NAME(InstantReplay)
+// DEFINE_KEYNAME_WITH_SAME_NAME(Link)
+// DEFINE_KEYNAME_WITH_SAME_NAME(List) // Rename to ListProgram
+DEFINE_KEYNAME_WITH_SAME_NAME(Live) // Rename to LiveContent
+// DEFINE_KEYNAME_WITH_SAME_NAME(Lock)
+DEFINE_KEYNAME_WITH_SAME_NAME(Apps) // Rename to MediaApps
+DEFINE_KEYNAME_WITH_SAME_NAME(FastFwd) // Rename to MediaFastForward
+DEFINE_KEYNAME_WITH_SAME_NAME(MediaLast)
+DEFINE_KEYNAME_WITH_SAME_NAME(MediaPause)
+DEFINE_KEYNAME_WITH_SAME_NAME(MediaPlay)
+DEFINE_KEYNAME_WITH_SAME_NAME(MediaRecord)
+DEFINE_KEYNAME_WITH_SAME_NAME(MediaRewind)
+// DEFINE_KEYNAME_WITH_SAME_NAME(MediaSkip)
+// DEFINE_KEYNAME_WITH_SAME_NAME(NextFavoriteChannel)
+// DEFINE_KEYNAME_WITH_SAME_NAME(NextUserProfile)
+// DEFINE_KEYNAME_WITH_SAME_NAME(OnDemand)
+// DEFINE_KEYNAME_WITH_SAME_NAME(PinPDown)
+// DEFINE_KEYNAME_WITH_SAME_NAME(PinPMove)
+DEFINE_KEYNAME_WITH_SAME_NAME(PinPToggle)
+// DEFINE_KEYNAME_WITH_SAME_NAME(PinPUp)
+// DEFINE_KEYNAME_WITH_SAME_NAME(PlaySpeedDown)
+// DEFINE_KEYNAME_WITH_SAME_NAME(PlaySpeedReset)
+// DEFINE_KEYNAME_WITH_SAME_NAME(PlaySpeedUp)
+DEFINE_KEYNAME_WITH_SAME_NAME(RandomToggle)
+// DEFINE_KEYNAME_WITH_SAME_NAME(RcLowBattery)
+// DEFINE_KEYNAME_WITH_SAME_NAME(RecordSpeedNext)
+// DEFINE_KEYNAME_WITH_SAME_NAME(RfBypass)
+// DEFINE_KEYNAME_WITH_SAME_NAME(ScanChannelsToggle)
+// DEFINE_KEYNAME_WITH_SAME_NAME(ScreenModeNext)
+DEFINE_KEYNAME_WITH_SAME_NAME(Settings)
+// DEFINE_KEYNAME_WITH_SAME_NAME(SplitScreenToggle)
+// DEFINE_KEYNAME_WITH_SAME_NAME(STBInput)
+// DEFINE_KEYNAME_WITH_SAME_NAME(STBPower)
+DEFINE_KEYNAME_WITH_SAME_NAME(Subtitle)
+// DEFINE_KEYNAME_WITH_SAME_NAME(Teletext)
+// DEFINE_KEYNAME_WITH_SAME_NAME(TV)
+// DEFINE_KEYNAME_WITH_SAME_NAME(TVInput)
+// DEFINE_KEYNAME_WITH_SAME_NAME(TVPower)
+// DEFINE_KEYNAME_WITH_SAME_NAME(VideoModeNext)
+// DEFINE_KEYNAME_WITH_SAME_NAME(Wink)
+DEFINE_KEYNAME_WITH_SAME_NAME(Zoom) // Rename to ZoomToggle
+
 DEFINE_KEYNAME_WITH_SAME_NAME(UpLeft)
 DEFINE_KEYNAME_WITH_SAME_NAME(UpRight)
 DEFINE_KEYNAME_WITH_SAME_NAME(DownLeft)
 DEFINE_KEYNAME_WITH_SAME_NAME(DownRight)
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadGrave)
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadAcute)
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadCircumflex)
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadTilde)
@@ -289,77 +366,15 @@ DEFINE_KEYNAME_WITH_SAME_NAME(DeadUmlaut
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadAboveRing)
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadDoubleacute)
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadCaron)
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadCedilla)
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadOgonek)
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadIota)
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadVoicedSound)
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadSemivoicedSound)
-DEFINE_KEYNAME_WITH_SAME_NAME(AudioFaderFront)
-DEFINE_KEYNAME_WITH_SAME_NAME(AudioFaderRear)
-DEFINE_KEYNAME_WITH_SAME_NAME(AudioBalanceLeft)
-DEFINE_KEYNAME_WITH_SAME_NAME(AudioBalanceRight)
-DEFINE_KEYNAME_WITH_SAME_NAME(AudioBassBoostDown)
-DEFINE_KEYNAME_WITH_SAME_NAME(AudioBassBoostUp)
-DEFINE_KEYNAME_WITH_SAME_NAME(MediaPause)
-DEFINE_KEYNAME_WITH_SAME_NAME(MediaPlay)
 DEFINE_KEYNAME_WITH_SAME_NAME(MediaTrackSkip)
 DEFINE_KEYNAME_WITH_SAME_NAME(MediaTrackStart)
 DEFINE_KEYNAME_WITH_SAME_NAME(MediaTrackEnd)
-DEFINE_KEYNAME_WITH_SAME_NAME(Blue)
-DEFINE_KEYNAME_WITH_SAME_NAME(Brown)
-DEFINE_KEYNAME_WITH_SAME_NAME(ChannelDown)
-DEFINE_KEYNAME_WITH_SAME_NAME(ChannelUp)
-DEFINE_KEYNAME_WITH_SAME_NAME(ClearFavorite0)
-DEFINE_KEYNAME_WITH_SAME_NAME(ClearFavorite1)
-DEFINE_KEYNAME_WITH_SAME_NAME(ClearFavorite2)
-DEFINE_KEYNAME_WITH_SAME_NAME(ClearFavorite3)
-DEFINE_KEYNAME_WITH_SAME_NAME(Dimmer)
-DEFINE_KEYNAME_WITH_SAME_NAME(DisplaySwap)
-DEFINE_KEYNAME_WITH_SAME_NAME(FastFwd)
-DEFINE_KEYNAME_WITH_SAME_NAME(Green)
-DEFINE_KEYNAME_WITH_SAME_NAME(Grey)
-DEFINE_KEYNAME_WITH_SAME_NAME(Guide)
-DEFINE_KEYNAME_WITH_SAME_NAME(InstantReplay)
-DEFINE_KEYNAME_WITH_SAME_NAME(MediaLast)
-DEFINE_KEYNAME_WITH_SAME_NAME(Link)
-DEFINE_KEYNAME_WITH_SAME_NAME(Live)
-DEFINE_KEYNAME_WITH_SAME_NAME(Lock)
-DEFINE_KEYNAME_WITH_SAME_NAME(NextDay)
-DEFINE_KEYNAME_WITH_SAME_NAME(NextFavoriteChannel)
-DEFINE_KEYNAME_WITH_SAME_NAME(OnDemand)
-DEFINE_KEYNAME_WITH_SAME_NAME(PinPDown)
-DEFINE_KEYNAME_WITH_SAME_NAME(PinPMove)
-DEFINE_KEYNAME_WITH_SAME_NAME(PinPToggle)
-DEFINE_KEYNAME_WITH_SAME_NAME(PinPUp)
-DEFINE_KEYNAME_WITH_SAME_NAME(PlaySpeedDown)
-DEFINE_KEYNAME_WITH_SAME_NAME(PlaySpeedReset)
-DEFINE_KEYNAME_WITH_SAME_NAME(PlaySpeedUp)
-DEFINE_KEYNAME_WITH_SAME_NAME(PrevDay)
-DEFINE_KEYNAME_WITH_SAME_NAME(RandomToggle)
-DEFINE_KEYNAME_WITH_SAME_NAME(RecallFavorite0)
-DEFINE_KEYNAME_WITH_SAME_NAME(RecallFavorite1)
-DEFINE_KEYNAME_WITH_SAME_NAME(RecallFavorite2)
-DEFINE_KEYNAME_WITH_SAME_NAME(RecallFavorite3)
-DEFINE_KEYNAME_WITH_SAME_NAME(MediaRecord)
-DEFINE_KEYNAME_WITH_SAME_NAME(RecordSpeedNext)
-DEFINE_KEYNAME_WITH_SAME_NAME(Red)
-DEFINE_KEYNAME_WITH_SAME_NAME(MediaRewind)
-DEFINE_KEYNAME_WITH_SAME_NAME(RfBypass)
-DEFINE_KEYNAME_WITH_SAME_NAME(ScanChannelsToggle)
-DEFINE_KEYNAME_WITH_SAME_NAME(ScreenModeNext)
-DEFINE_KEYNAME_WITH_SAME_NAME(Settings)
-DEFINE_KEYNAME_WITH_SAME_NAME(SplitScreenToggle)
-DEFINE_KEYNAME_WITH_SAME_NAME(StoreFavorite0)
-DEFINE_KEYNAME_WITH_SAME_NAME(StoreFavorite1)
-DEFINE_KEYNAME_WITH_SAME_NAME(StoreFavorite2)
-DEFINE_KEYNAME_WITH_SAME_NAME(StoreFavorite3)
-DEFINE_KEYNAME_WITH_SAME_NAME(Subtitle)
-DEFINE_KEYNAME_WITH_SAME_NAME(AudioSurroundModeNext)
-DEFINE_KEYNAME_WITH_SAME_NAME(Teletext)
-DEFINE_KEYNAME_WITH_SAME_NAME(VideoModeNext)
 DEFINE_KEYNAME_WITH_SAME_NAME(DisplayWide)
-DEFINE_KEYNAME_WITH_SAME_NAME(Wink)
-DEFINE_KEYNAME_WITH_SAME_NAME(Yellow)
 
 #undef DEFINE_KEYNAME_WITH_SAME_NAME
 #undef DEFINE_KEYNAME_INTERNAL
--- a/widget/shared/NativeKeyToDOMKeyName.h
+++ b/widget/shared/NativeKeyToDOMKeyName.h
@@ -896,32 +896,113 @@ KEY_MAP_GTK     (BrowserSearch, GDK_Sear
 KEY_MAP_QT      (BrowserSearch, Qt::Key_Search)
 KEY_MAP_ANDROID (BrowserSearch, AKEYCODE_SEARCH)
 
 // BrowserStop
 KEY_MAP_WIN     (BrowserStop, VK_BROWSER_STOP)
 KEY_MAP_GTK     (BrowserStop, GDK_Stop)
 KEY_MAP_QT      (BrowserStop, Qt::Key_Stop)
 
+/******************************************************************************
+ * Media Controller Keys
+ ******************************************************************************/
+// AudioBassBoostDown
+KEY_MAP_QT      (AudioBassBoostDown, Qt::Key_BassDown)
+
+// AudioBassBoostUp
+KEY_MAP_QT      (AudioBassBoostUp, Qt::Key_BassUp)
+
+// ChannelDown
+KEY_MAP_ANDROID (ChannelDown, AKEYCODE_CHANNEL_DOWN)
+
+// ChannelUp
+KEY_MAP_ANDROID (ChannelUp, AKEYCODE_CHANNEL_UP)
+
+// Red
+KEY_MAP_GTK     (Red, GDK_Red)
+KEY_MAP_ANDROID (Red, AKEYCODE_PROG_RED)
+
+// Green
+KEY_MAP_GTK     (Green, GDK_Green)
+KEY_MAP_ANDROID (Green, AKEYCODE_PROG_GREEN)
+
+// Yellow
+KEY_MAP_GTK     (Yellow, GDK_Yellow)
+KEY_MAP_ANDROID (Yellow, AKEYCODE_PROG_YELLOW)
+
+// Blue
+KEY_MAP_GTK     (Blue, GDK_Blue)
+KEY_MAP_ANDROID (Blue, AKEYCODE_PROG_BLUE)
+
+// Dimmer
+KEY_MAP_GTK     (Dimmer, GDK_BrightnessAdjust)
+KEY_MAP_QT      (Dimmer, Qt::Key_BrightnessAdjust)
+
+// Exit
+KEY_MAP_ANDROID (Exit, AKEYCODE_HOME)
+
+// Guide
+KEY_MAP_ANDROID (Guide, AKEYCODE_GUIDE)
+
+// Info
+KEY_MAP_ANDROID (Info, AKEYCODE_INFO)
+
+// Live
+KEY_MAP_ANDROID (Live, AKEYCODE_TV)
 
 // Apps
 KEY_MAP_ANDROID (Apps, AKEYCODE_APP_SWITCH)
 
-// List
+// FastFwd
+KEY_MAP_QT      (FastFwd, Qt::Key_AudioForward)
+KEY_MAP_ANDROID (FastFwd, AKEYCODE_MEDIA_FAST_FORWARD)
+
+// MediaLast
+KEY_MAP_QT      (MediaLast, Qt::Key_MediaLast)
+
+// MediaPause
+KEY_MAP_GTK     (MediaPause, GDK_AudioPause)
+KEY_MAP_QT      (MediaPause, Qt::Key_MediaPause)
+KEY_MAP_ANDROID (MediaPause, AKEYCODE_MEDIA_PAUSE)
+
+// MediaPlay
+KEY_MAP_GTK     (MediaPlay, GDK_AudioPlay)
+KEY_MAP_QT      (MediaPlay, Qt::Key_MediaPlay)
+KEY_MAP_ANDROID (MediaPlay, AKEYCODE_MEDIA_PLAY)
 
-// Info
-KEY_MAP_ANDROID (Info, AKEYCODE_INFO)
+// MediaRecord
+KEY_MAP_GTK     (MediaRecord, GDK_AudioRecord)
+KEY_MAP_QT      (MediaRecord, Qt::Key_MediaRecord)
+KEY_MAP_ANDROID (MediaRecord, AKEYCODE_MEDIA_RECORD)
+
+// MediaRewind
+KEY_MAP_GTK     (MediaRewind, GDK_AudioRewind)
+KEY_MAP_QT      (MediaRewind, Qt::Key_AudioRewind)
+KEY_MAP_ANDROID (MediaRewind, AKEYCODE_MEDIA_REWIND)
 
-// Exit
-KEY_MAP_ANDROID (Exit, AKEYCODE_HOME)
+// PinPToggle
+KEY_MAP_ANDROID (PinPToggle, AKEYCODE_WINDOW)
+
+// RandomToggle
+KEY_MAP_GTK     (RandomToggle, GDK_AudioRandomPlay)
+KEY_MAP_QT      (RandomToggle, Qt::Key_AudioRandomPlay)
+
+// Settings
+KEY_MAP_ANDROID (Settings, AKEYCODE_SETTINGS)
+
+// Subtitle
+KEY_MAP_GTK     (Subtitle, GDK_Subtitle)
+KEY_MAP_QT      (Subtitle, Qt::Key_Subtitle)
+KEY_MAP_ANDROID (Subtitle, AKEYCODE_CAPTIONS)
 
 // Zoom
 KEY_MAP_WIN     (Zoom, VK_ZOOM)
 KEY_MAP_QT      (Zoom, Qt::Key_Zoom)
 
+
 // UpLeft
 
 // UpRight
 
 // DownLeft
 
 // DownRight
 
@@ -984,186 +1065,24 @@ KEY_MAP_QT      (DeadIota, Qt::Key_Dead_
 // DeadVoicedSound
 KEY_MAP_GTK     (DeadVoicedSound, GDK_dead_voiced_sound)
 KEY_MAP_QT      (DeadVoicedSound, Qt::Key_Dead_Voiced_Sound)
 
 // DeadSemivoicedSound
 KEY_MAP_GTK     (DeadSemivoicedSound, GDK_dead_semivoiced_sound)
 KEY_MAP_QT      (DeadSemivoicedSound, Qt::Key_Dead_Semivoiced_Sound)
 
-// AudioFaderFront
-
-// AudioFaderRear
-
-// AudioBalanceLeft
-
-// AudioBalanceRight
-
-// AudioBassBoostDown
-KEY_MAP_QT      (AudioBassBoostDown, Qt::Key_BassDown)
-
-// AudioBassBoostUp
-KEY_MAP_QT      (AudioBassBoostUp, Qt::Key_BassUp)
-
-// MediaPause
-KEY_MAP_GTK     (MediaPause, GDK_AudioPause)
-KEY_MAP_QT      (MediaPause, Qt::Key_MediaPause)
-KEY_MAP_ANDROID (MediaPause, AKEYCODE_MEDIA_PAUSE)
-
-// MediaPlay
-KEY_MAP_GTK     (MediaPlay, GDK_AudioPlay)
-KEY_MAP_QT      (MediaPlay, Qt::Key_MediaPlay)
-KEY_MAP_ANDROID (MediaPlay, AKEYCODE_MEDIA_PLAY)
-
 // MediaTrackSkip
 
 // MediaTrackStart
 
 // MediaTrackEnd
 
-// Blue
-KEY_MAP_GTK     (Blue, GDK_Blue)
-KEY_MAP_ANDROID (Blue, AKEYCODE_PROG_BLUE)
-
-// Brown
-
-// ChannelDown
-KEY_MAP_ANDROID (ChannelDown, AKEYCODE_CHANNEL_DOWN)
-
-// ChannelUp
-KEY_MAP_ANDROID (ChannelUp, AKEYCODE_CHANNEL_UP)
-
-// ClearFavorite0
-
-// ClearFavorite1
-
-// ClearFavorite2
-
-// ClearFavorite3
-
-// Dimmer
-KEY_MAP_GTK     (Dimmer, GDK_BrightnessAdjust)
-KEY_MAP_QT      (Dimmer, Qt::Key_BrightnessAdjust)
-
-// DisplaySwap
-
-// FastFwd
-KEY_MAP_QT      (FastFwd, Qt::Key_AudioForward)
-KEY_MAP_ANDROID (FastFwd, AKEYCODE_MEDIA_FAST_FORWARD)
-
-// Green
-KEY_MAP_GTK     (Green, GDK_Green)
-KEY_MAP_ANDROID (Green, AKEYCODE_PROG_GREEN)
-
-// Grey
-
-// Guide
-KEY_MAP_ANDROID (Guide, AKEYCODE_GUIDE)
-
-// InstantReplay
-
-// MediaLast
-KEY_MAP_QT      (MediaLast, Qt::Key_MediaLast)
-
-// Link
-
-// Live
-KEY_MAP_ANDROID (Live, AKEYCODE_TV)
-
-// Lock
-
-// NextDay
-
-// NextFavoriteChannel
-
-// OnDemand
-
-// PinPDown
-
-// PinPMove
-
-// PinPToggle
-KEY_MAP_ANDROID (PinPToggle, AKEYCODE_WINDOW)
-
-// PinPUp
-
-// PlaySpeedDown
-
-// PlaySpeedReset
-
-// PlaySpeedUp
-
-// PrevDay
-
-// RandomToggle
-KEY_MAP_GTK     (RandomToggle, GDK_AudioRandomPlay)
-KEY_MAP_QT      (RandomToggle, Qt::Key_AudioRandomPlay)
-
-// RecallFavorite0
-
-// RecallFavorite1
-
-// RecallFavorite2
-
-// RecallFavorite3
-
-// MediaRecord
-KEY_MAP_GTK     (MediaRecord, GDK_AudioRecord)
-KEY_MAP_QT      (MediaRecord, Qt::Key_MediaRecord)
-KEY_MAP_ANDROID (MediaRecord, AKEYCODE_MEDIA_RECORD)
-
-// RecordSpeedNext
-
-// Red
-KEY_MAP_GTK     (Red, GDK_Red)
-KEY_MAP_ANDROID (Red, AKEYCODE_PROG_RED)
-
-// MediaRewind
-KEY_MAP_GTK     (MediaRewind, GDK_AudioRewind)
-KEY_MAP_QT      (MediaRewind, Qt::Key_AudioRewind)
-KEY_MAP_ANDROID (MediaRewind, AKEYCODE_MEDIA_REWIND)
-
-// RfBypass
-
-// ScanChannelsToggle
-
-// ScreenModeNext
-
-// Settings
-KEY_MAP_ANDROID (Settings, AKEYCODE_SETTINGS)
-
-// SplitScreenToggle
-
-// StoreFavorite0
-
-// StoreFavorite1
-
-// StoreFavorite2
-
-// StoreFavorite3
-
-// Subtitle
-KEY_MAP_GTK     (Subtitle, GDK_Subtitle)
-KEY_MAP_QT      (Subtitle, Qt::Key_Subtitle)
-KEY_MAP_ANDROID (Subtitle, AKEYCODE_CAPTIONS)
-
-// AudioSurroundModeNext
-
-// Teletext
-
-// VideoModeNext
-
 // DisplayWide
 
-// Wink
-
-// Yellow
-KEY_MAP_GTK     (Yellow, GDK_Yellow)
-KEY_MAP_ANDROID (Yellow, AKEYCODE_PROG_YELLOW)
-
 #undef KEY_MAP_WIN
 #undef KEY_MAP_WIN_JPN
 #undef KEY_MAP_WIN_KOR
 #undef KEY_MAP_WIN_OTH
 #undef KEY_MAP_COCOA
 #undef KEY_MAP_GTK
 #undef KEY_MAP_QT
 #undef KEY_MAP_ANDROID