[PVR][input] add special case handling and default keymaps for PVR radio in visualisation/fullscreen mode

11 files changed, 136 insertions, 0 deletions

diff --git a/system/keymaps/gamepad.xml b/system/keymaps/gamepad.xml
index e1f9748ca5..a21f07098e 100644
--- a/system/keymaps/gamepad.xml
+++ b/system/keymaps/gamepad.xml
@@ -118,6 +118,14 @@
       <dpaddown>ChannelDown</dpaddown>
     </gamepad>
   </FullscreenLiveTV>
+  <FullscreenRadio>
+    <gamepad>
+      <dpadleft>PreviousChannelGroup</dpadleft>
+      <dpadright>NextChannelGroup</dpadright>
+      <dpadup>ChannelUp</dpadup>
+      <dpaddown>ChannelDown</dpaddown>
+    </gamepad>
+  </FullscreenRadio>
   <FullscreenInfo>
     <gamepad>
       <start>OSD</start>
diff --git a/system/keymaps/joystick.AppleRemote.xml b/system/keymaps/joystick.AppleRemote.xml
index 5abbafd355..f59fea277e 100644
--- a/system/keymaps/joystick.AppleRemote.xml
+++ b/system/keymaps/joystick.AppleRemote.xml
@@ -120,6 +120,14 @@
       <!-- pagedown   -->      <button id="14">ChannelDown</button>
     </joystick>
   </FullscreenLiveTV>
+  <FullscreenRadio>
+    <joystick name="AppleRemote">
+      <button id="3">ChannelDown</button>
+      <button id="4">ChannelUp</button>
+      <!-- pageup     -->      <button id="13">ChannelUp</button>
+      <!-- pagedown   -->      <button id="14">ChannelDown</button>
+    </joystick>
+  </FullscreenRadio>
   <Visualisation>
     <joystick name="AppleRemote">
       <button id="1">VolumeUp</button>
diff --git a/system/keymaps/joystick.Harmony.xml b/system/keymaps/joystick.Harmony.xml
index 6c1efd58b7..3ab4104b8e 100644
--- a/system/keymaps/joystick.Harmony.xml
+++ b/system/keymaps/joystick.Harmony.xml
@@ -181,6 +181,14 @@
       <!-- right      	-->      <button id="4">NextChannelGroup</button>
     </joystick>
   </FullscreenLiveTV>
+  <FullscreenRadio>
+    <joystick name="Harmony">
+      <!-- up       	-->      <button id="1">ChannelUp</button>
+      <!-- down      	-->      <button id="2">ChannelDown</button>
+      <!-- left       	-->      <button id="3">PreviousChannelGroup</button>
+      <!-- right      	-->      <button id="4">NextChannelGroup</button>
+    </joystick>
+  </FullscreenRadio>
   <FullscreenInfo>
     <joystick name="Harmony">
       <!-- Info  	-->      <button id="31">Back</button>
diff --git a/system/keymaps/joystick.Logitech.RumblePad.2.xml b/system/keymaps/joystick.Logitech.RumblePad.2.xml
index 70b8f305fa..5e1bb71ba0 100644
--- a/system/keymaps/joystick.Logitech.RumblePad.2.xml
+++ b/system/keymaps/joystick.Logitech.RumblePad.2.xml
@@ -80,6 +80,17 @@
     </joystick>
   </FullscreenLiveTV>
 
+  <FullscreenRadio>
+    <joystick name="Logitech Logitech Cordless RumblePad 2">
+      <altname>Logitech Cordless RumblePad 2</altname>
+      <altname>Logitech RumblePad 2 USB</altname>
+      <hat    id="1" position="left">PreviousChannelGroup</hat>
+      <hat    id="1" position="right">NextChannelGroup</hat>
+      <hat    id="1" position="up">ChannelUp</hat>
+      <hat    id="1" position="down">ChannelDown</hat>
+    </joystick>
+  </FullscreenRadio>
+
   <Visualisation>
     <joystick name="Logitech Logitech Cordless RumblePad 2">
       <altname>Logitech Cordless RumblePad 2</altname>
diff --git a/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml b/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
index 4a1fe438a5..22bcd95545 100644
--- a/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
+++ b/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
@@ -397,6 +397,53 @@
       <hat id="1" position="right">NextChannelGroup</hat>
     </joystick>
   </FullscreenLiveTV>
+  <FullscreenRadio>
+    <joystick name="Controller (XBOX 360 For Windows)">
+      <altname>Afterglow Gamepad for Xbox 360 (Controller)</altname>
+      <altname>Controller (Gamepad F310)</altname>
+      <altname>Controller (Gamepad for Xbox 360)</altname>
+      <altname>Controller (Rumble Gamepad F510)</altname>
+      <altname>Controller (Wireless Gamepad F710)</altname>
+      <altname>Controller (Xbox 360 Wireless Receiver for Windows)</altname>
+      <altname>Controller (Xbox wireless receiver for windows)</altname>
+      <altname>Controller (XBOX360 GAMEPAD)</altname>
+      <altname>Controller (Batarang wired controller (XBOX))</altname>
+      <altname>Wireless Gamepad F710 (Controller)</altname>
+      <altname>XBOX 360 For Windows</altname>
+      <altname>XBOX 360 For Windows (Controller)</altname>
+      <altname>Xbox 360 Wireless Controller</altname>
+      <altname>Xbox Receiver for Windows (Wireless Controller)</altname>
+      <altname>Xbox wireless receiver for windows (Controller)</altname>
+      <altname>Gamepad F310 (Controller)</altname>
+      <button id="11">ChannelUp</button>
+      <button id="12">ChannelDown</button>
+      <button id="13">PreviousChannelGroup</button>
+      <button id="14">NextChannelGroup</button>
+      <hat id="1" position="up">ChannelUp</hat>
+      <hat id="1" position="down">ChannelDown</hat>
+      <hat id="1" position="left">PreviousChannelGroup</hat>
+      <hat id="1" position="right">NextChannelGroup</hat>
+    </joystick>
+    <joystick name="Microsoft X-Box 360 pad">
+      <altname>BigBen Interactive XBOX 360 Controller</altname>
+      <altname>Generic X-Box pad</altname>
+      <altname>Logitech Chillstream Controller</altname>
+      <altname>Mad Catz Wired Xbox 360 Controller</altname>
+      <altname>Mad Catz Wired Xbox 360 Controller (SFIV)</altname>
+      <altname>Pelican 'TSZ' Wired Xbox 360 Controller</altname>
+      <altname>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</altname>
+      <altname>Xbox 360 Wireless Receiver</altname>
+      <altname>Xbox 360 Wireless Receiver (XBOX)</altname>
+      <button id="12">PreviousChannelGroup</button>
+      <button id="13">NextChannelGroup</button>
+      <button id="14">ChannelUp</button>
+      <button id="15">ChannelDown</button>
+      <hat id="1" position="up">ChannelUp</hat>
+      <hat id="1" position="down">ChannelDown</hat>
+      <hat id="1" position="left">PreviousChannelGroup</hat>
+      <hat id="1" position="right">NextChannelGroup</hat>
+    </joystick>
+  </FullscreenRadio>
   <FullscreenInfo>
     <joystick name="Controller (XBOX 360 For Windows)">
       <altname>Afterglow Gamepad for Xbox 360 (Controller)</altname>
diff --git a/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml b/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml
index 56b6c9925b..e2697e84dc 100644
--- a/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml
+++ b/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml
@@ -140,6 +140,17 @@
       <button id="16">PreviousChannelGroup</button>
     </joystick>
   </FullscreenLiveTV>
+  <FullscreenRadio>
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <altname>Microsoft X-Box pad (Japan)</altname> 
+      <button id="13">ChannelUp</button>
+      <button id="14">NextChannelGroup</button>
+      <button id="15">ChannelDown</button>
+      <button id="16">PreviousChannelGroup</button>
+    </joystick>
+  </FullscreenRadio>
   <FullscreenInfo>
     <joystick name="Microsoft Xbox Controller S">
       <altname>Mad Catz MicroCON</altname>
diff --git a/system/keymaps/joystick.PS3.Remote.Keyboard.xml b/system/keymaps/joystick.PS3.Remote.Keyboard.xml
index 571c46a235..5b0c15ba2f 100644
--- a/system/keymaps/joystick.PS3.Remote.Keyboard.xml
+++ b/system/keymaps/joystick.PS3.Remote.Keyboard.xml
@@ -112,6 +112,15 @@
     </joystick>
   </FullscreenLiveTV>
 
+  <FullscreenRadio>
+    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
+      <hat    id="1" position="left">PreviousChannelGroup</hat>
+      <hat    id="1" position="right">NextChannelGroup</hat>
+      <hat    id="1" position="up">ChannelUp</hat>
+      <hat    id="1" position="down">ChannelDown</hat>
+    </joystick>
+  </FullscreenRadio>
+
   <VideoOSD>
     <joystick name="PLAYSTATION(R)3 Remote Keyboard">
       <altname>PS3 Remote Keyboard</altname>
diff --git a/system/keymaps/joystick.WiiRemote.xml b/system/keymaps/joystick.WiiRemote.xml
index 2244063638..aedeec5c47 100644
--- a/system/keymaps/joystick.WiiRemote.xml
+++ b/system/keymaps/joystick.WiiRemote.xml
@@ -107,6 +107,12 @@
       <button id="4">ChannelUp</button>
     </joystick>
   </FullscreenLiveTV>
+  <FullscreenRadio>
+    <joystick name="WiiRemote">
+      <button id="3">ChannelDown</button>
+      <button id="4">ChannelUp</button>
+    </joystick>
+  </FullscreenRadio>
   <FullscreenInfo>
     <joystick name="WiiRemote">
       <button id="5">CodecInfo</button>
diff --git a/system/keymaps/joystick.xml.sample b/system/keymaps/joystick.xml.sample
index 197ed8a58a..001e5e2903 100644
--- a/system/keymaps/joystick.xml.sample
+++ b/system/keymaps/joystick.xml.sample
@@ -134,6 +134,18 @@
       <hat id="1" position="right">NextChannelGroup</hat>
     </joystick>
   </FullscreenLiveTV>
+  <FullscreenRadio>
+    <joystick>
+      <button id="11">ChannelUp</button>
+      <button id="12">ChannelDown</button>
+      <button id="13">PreviousChannelGroup</button>
+      <button id="14">NextChannelGroup</button>
+      <hat id="1" position="up">ChannelUp</hat>
+      <hat id="1" position="down">ChannelDown</hat>
+      <hat id="1" position="left">PreviousChannelGroup</hat>
+      <hat id="1" position="right">NextChannelGroup</hat>
+    </joystick>
+  </FullscreenRadio>
   <FullscreenInfo>
     <joystick>
       <button id="2">Close</button>
diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml
index efc26aecbb..c162aa867d 100644
--- a/system/keymaps/keyboard.xml
+++ b/system/keymaps/keyboard.xml
@@ -529,6 +529,14 @@
       <down>ChannelDown</down>
     </keyboard>
   </FullscreenLiveTV>
+  <FullscreenRadio>
+    <keyboard>
+      <left>PreviousChannelGroup</left>
+      <right>NextChannelGroup</right>
+      <up>ChannelUp</up>
+      <down>ChannelDown</down>
+    </keyboard>
+  </FullscreenRadio>
   <PVROSDChannels>
     <keyboard>
       <backspace>Close</backspace>
diff --git a/system/keymaps/remote.xml b/system/keymaps/remote.xml
index d0957e2c6a..30591f2ec0 100644
--- a/system/keymaps/remote.xml
+++ b/system/keymaps/remote.xml
@@ -542,6 +542,14 @@
       <down>ChannelDown</down>
     </remote>
   </FullscreenLiveTV>
+  <FullscreenRadio>
+    <remote>
+      <left>StepBack</left>
+      <right>StepForward</right>
+      <up>ChannelUp</up>
+      <down>ChannelDown</down>
+    </remote>
+  </FullscreenRadio>
   <PVROSDChannels>
     <remote>
       <back>Close</back>