[keymaps] unify seek keys for FullscreenVideo and Visualisation

* left/right for StepBack/StepForward * up/down for ChapterOrBigStepForward/ChapterOrBigStepBack (FullscreenVideo) and SkipNext/SkipPrevious (Visualisation) actions
xhaggi · Feb 13, 2015 · 4f6c642 · 4f6c642
1 parent bdd23e8
commit 4f6c642
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 28 deletions.
diff --git a/system/keymaps/gamepad.xml b/system/keymaps/gamepad.xml
@@ -151,10 +151,10 @@
       <back>LockPreset</back>
       <leftanalogtrigger>AnalogRewind</leftanalogtrigger>
       <rightanalogtrigger>AnalogFastForward</rightanalogtrigger>
-      <dpadleft>SkipPrevious</dpadleft>
-      <dpadright>SkipNext</dpadright>
-      <dpadup>NextPreset</dpadup>
-      <dpaddown>PreviousPreset</dpaddown>
+      <dpadleft>StepBack</dpadleft>
+      <dpadright>StepForward</dpadright>
+      <dpadup>SkipNext</dpadup>
+      <dpaddown>SkipPrevious</dpaddown>
     </gamepad>
   </Visualisation>
   <MusicOSD>

diff --git a/system/keymaps/joystick.Harmony.xml b/system/keymaps/joystick.Harmony.xml
@@ -203,8 +203,8 @@
     <joystick name="Harmony">
       <!-- up       	-->      <button id="1">IncreaseRating</button>
       <!-- minus      	-->      <button id="2">DecreaseRating</button>
-      <!-- left       	-->      <button id="3">PreviousPreset</button>
-      <!-- right      	-->      <button id="4">NextPreset</button>
+      <!-- left       	-->      <button id="3">StepBack</button>
+      <!-- right      	-->      <button id="4">StepForward</button>
       <!-- menu       	-->      <button id="6">OSD</button>
       <!-- Prev		-->      <button id="32">LockPreset</button>
       <!-- Info  	-->      <button id="31">Info</button>

diff --git a/system/keymaps/joystick.Logitech.RumblePad.2.xml b/system/keymaps/joystick.Logitech.RumblePad.2.xml
@@ -102,10 +102,10 @@
       <button id="6">FastForward</button>
       <button id="10">OSD</button>
 
-      <hat    id="1" position="left">SkipPrevious</hat>
-      <hat    id="1" position="right">SkipNext</hat>
-      <hat    id="1" position="up">NextPreset</hat>
-      <hat    id="1" position="left">PreviousPreset</hat>
+      <hat    id="1" position="left">StepBack</hat>
+      <hat    id="1" position="right">StepForward</hat>
+      <hat    id="1" position="up">SkipNext</hat>
+      <hat    id="1" position="down">SkipPrevious</hat>
     </joystick>
   </Visualisation>
 

diff --git a/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml b/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
@@ -394,8 +394,8 @@
       <axis id="3" limit="-1">AnalogFastForward</axis>
       <hat id="1" position="up">SkipNext</hat>
       <hat id="1" position="down">SkipPrevious</hat>
-      <hat id="1" position="left">PreviousPreset</hat>
-      <hat id="1" position="right">NextPreset</hat>
+      <hat id="1" position="left">StepBack</hat>
+      <hat id="1" position="right">StepForward</hat>
     </joystick>
     <joystick family="Xbox 360 Controller (xpad)">
       <button id="1">Pause</button>

diff --git a/system/keymaps/joystick.PS3.Remote.Keyboard.xml b/system/keymaps/joystick.PS3.Remote.Keyboard.xml
@@ -72,8 +72,8 @@
       <button id="1">Info</button>
       <button id="2">Pause</button>
       <button id="3">Stop</button>
-      <hat    id="1" position="left">SkipPrevious</hat>
-      <hat    id="1" position="right">SkipNext</hat>
+      <hat    id="1" position="left">StepBack</hat>
+      <hat    id="1" position="right">StepForward</hat>
       <hat    id="1" position="up">IncreaseRating</hat>
       <hat    id="1" position="down">DecreaseRating</hat>
     </joystick>

diff --git a/system/keymaps/joystick.WiiRemote.xml b/system/keymaps/joystick.WiiRemote.xml
@@ -122,13 +122,13 @@
     <joystick name="WiiRemote">
       <button id="1">Pause</button>
       <button id="2">Stop</button>
-      <button id="3">SkipNext</button>
-      <button id="4">SkipPrevious</button>
+      <button id="3">StepForward</button>
+      <button id="4">StepBack</button>
       <button id="5">OSD</button>
       <button id="6">Info</button>
       <button id="8">ActivateWindow(music)</button>
-      <button id="10">IncreaseRating</button>
-      <button id="11">DecreaseRating</button>
+      <button id="10">SkipNext</button>
+      <button id="11">SkipPrevious</button>
     </joystick>
   </Visualisation>
   <MusicOSD>

diff --git a/system/keymaps/joystick.xml.sample b/system/keymaps/joystick.xml.sample
@@ -178,8 +178,8 @@
       <axis id="3" limit="-1">AnalogFastForward</axis>
       <hat id="1" position="up">SkipNext</hat>
       <hat id="1" position="down">SkipPrevious</hat>
-      <hat id="1" position="left">PreviousPreset</hat>
-      <hat id="1" position="right">NextPreset</hat>
+      <hat id="1" position="left">StepBack</hat>
+      <hat id="1" position="right">StepForward</hat>
     </joystick>
   </Visualisation>
   <MusicOSD>

diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml
@@ -311,10 +311,10 @@
       <p>ActivateWindow(VisualisationPresetList)</p>
       <v>ActivateWindow(VisualisationSettings)</v>
       <n>ActivateWindow(MusicPlaylist)</n>
-      <left>SkipPrevious</left>
-      <right>SkipNext</right>
-      <up>IncreaseRating</up>
-      <down>DecreaseRating</down>      <!--<back>NextPreset</back>!-->
+      <left>StepBack</left>
+      <right>StepForward</right>
+      <up>SkipNext</up>
+      <down>SkipPrevious</down>
       <o>CodecInfo</o>
       <l>LockPreset</l>
       <escape>FullScreen</escape>

diff --git a/system/keymaps/remote.xml b/system/keymaps/remote.xml
@@ -226,10 +226,10 @@
   </PlayerControls>
   <Visualisation>
     <remote>
-      <left>PreviousPreset</left>
-      <right>NextPreset</right>
-      <up>IncreaseRating</up>
-      <down>DecreaseRating</down>
+      <left>StepBack</left>
+      <right>StepForward</right>
+      <up>SkipNext</up>
+      <down>SkipPrevious</down>
       <back>Back</back>
       <title>CodecInfo</title>
       <select>ActivateWindow(VisualisationPresetList)</select>

diff --git a/system/keymaps/touchscreen.xml b/system/keymaps/touchscreen.xml
@@ -22,6 +22,14 @@
       <swipe direction="left" pointers="2">SmallStepBack</swipe>
     </touch>
   </FullScreenVideo>
+  <Visualisation>
+    <touch>
+      <swipe direction="left">StepBack</swipe>
+      <swipe direction="right">StepForward</swipe>
+      <swipe direction="up">SkipNext</swipe>
+      <swipe direction="down">SkipPrevious</swipe>
+    </touch>
+  </Visualisation>
   <SlideShow>
     <touch>
       <zoom>ZoomGesture</zoom>