Merge pull request #6686 from stefansaraev/oe

pick OE patches

5 files changed, 661 insertions, 3 deletions

diff --git a/system/Lircmap.xml b/system/Lircmap.xml
index 3f19a23eb7..f752aa5bcf 100644
--- a/system/Lircmap.xml
+++ b/system/Lircmap.xml
@@ -575,6 +575,7 @@
 		<mymusic>KEY_AUDIO</mymusic>
 		<mypictures>KEY_CAMERA</mypictures>
 		<mytv>KEY_TUNER</mytv>
+		<mytv>KEY_TV</mytv>
 		<teletext>KEY_TEXT</teletext>
 		<one>KEY_NUMERIC_1</one>
 		<two>KEY_NUMERIC_2</two>
diff --git a/system/keymaps/joystick.Ouya.Controller.xml b/system/keymaps/joystick.Ouya.Controller.xml
new file mode 100644
index 0000000000..347188d675
--- /dev/null
+++ b/system/keymaps/joystick.Ouya.Controller.xml
@@ -0,0 +1,334 @@
+<!-- Joystick Name: OUYA Game Controller       -->
+<!-- created by: N3MIS15 on the xbmc forum     -->
+<!-- http://forum.xbmc.org/showthread.php?tid=173516 -->
+
+<!-- Button Mappings in OpenELEC:              -->
+<!--                                           -->
+<!-- ID              Button                    -->
+<!--                                           -->
+<!-- 1               O                         -->
+<!-- 2               U                         -->
+<!-- 3               Y                         -->
+<!-- 4               A                         -->
+<!-- 5               Left Sholder              -->
+<!-- 6               Right Sholder             -->
+<!-- 7               Left Stick Button         -->
+<!-- 8               Right Stick Button        -->
+<!-- 9               D-Pad Up                  -->
+<!-- 10              D-Pad Down                -->
+<!-- 11              D-Pad Left                -->
+<!-- 12              D-Pad Right               -->
+
+<!-- Axis Mappings:                            -->
+<!--                                           -->
+<!-- ID              Button                    -->
+<!--                                           -->
+<!-- 1               Left Stick L/R            -->
+<!-- 2               Left Stick U/D            -->
+<!-- 3 limit +1      Left Trigger Pressed      -->
+<!-- 3 limit -1      Left Trigger Depressed    -->
+<!-- 4               Right Stick L/R           -->
+<!-- 5               Right Stick U/D           -->
+<!-- 6 limit +1      Right Trigger Pressed     -->
+<!-- 6 limit -1      Right Trigger Depressed   -->
+
+<keymap>
+  
+  <global>
+    <joystick name="OUYA Game Controller">
+      <button id="1">Select</button>
+      <button id="2">ContextMenu</button>
+      <button id="3">FullScreen</button>
+      <button id="4">Back</button>
+      <button id="5">Queue</button>
+      <button id="6">Playlist</button>
+      <button id="7">PreviousMenu</button>
+      <button id="8">XBMC.ActivateWindow(Home)</button>
+      <button id="9">Up</button>
+      <button id="10">Down</button>
+      <button id="11">Left</button>
+      <button id="12">Right</button>
+      <axis id="4" limit="-1">AnalogSeekBack</axis>
+      <axis id="4" limit="+1">AnalogSeekForward</axis>
+      <axis id="2" limit="-1">ScrollUp</axis>
+      <axis id="2" limit="+1">ScrollDown</axis>
+    </joystick>
+  </global>
+
+  <Home>
+  </Home>
+
+  <MyFiles>
+  </MyFiles>
+
+  <MyMusicPlaylist>
+    <joystick name="OUYA Game Controller">
+      <button id="5">Delete</button>
+    </joystick>
+  </MyMusicPlaylist>
+
+  <MyMusicFiles>
+  </MyMusicFiles>
+
+  <MyMusicLibrary>
+  </MyMusicLibrary>
+
+  <FullscreenVideo>
+    <joystick name="OUYA Game Controller">
+      <button id="1">Pause</button>
+      <button id="2">OSD</button>
+      <button id="4">Stop</button>
+      <button id="5">AspectRatio</button>
+      <button id="6">ShowSubtitles</button>
+      <button id="7">SmallStepBack</button>
+      <button id="8">Info</button>
+      <button id="9">BigStepForward</button>
+      <button id="10">BigStepBack</button>
+      <button id="11">StepBack</button>
+      <button id="12">StepForward</button>
+    </joystick>
+  </FullscreenVideo>
+
+  <FullscreenLiveTV>
+    <joystick name="OUYA Game Controller">
+      <button id="9">ChannelUp</button>
+      <button id="10">ChannelDown</button>
+      <button id="11">PreviousChannelGroup</button>
+      <button id="12">NextChannelGroup</button>
+    </joystick>
+  </FullscreenLiveTV>
+
+  <FullscreenInfo>
+    <joystick name="OUYA Game Controller">
+      <button id="2">OSD</button>
+      <button id="4">Close</button>
+      <button id="8">Close</button>
+      <axis id="3" limit="+1">AnalogRewind</axis>
+      <axis id="3" limit="-1">AnalogFastForward</axis>
+    </joystick>
+  </FullscreenInfo>
+
+  <PlayerControls>
+    <joystick name="OUYA Game Controller">
+      <button id="2">Close</button>
+      <button id="7">Close</button>
+      <button id="8">Close</button>
+    </joystick>
+  </PlayerControls>
+
+  <Visualisation>
+    <joystick name="OUYA Game Controller">
+      <button id="1">Pause</button>
+      <button id="4">Stop</button>
+      <button id="2">XBMC.ActivateWindow(MusicOSD)</button>
+      <button id="5">XBMC.ActivateWindow(VisualisationPresetList)</button>
+      <button id="6">Info</button>
+      <button id="8">XBMC.ActivateWindow(MusicOSD)</button>
+      <button id="9">SkipNext</button>
+      <button id="10">SkipPrevious</button>
+      <button id="11">PreviousPreset</button>
+      <button id="12">NextPreset</button>
+      <axis id="3" limit="+1">AnalogRewind</axis>
+      <axis id="6" limit="+1">AnalogFastForward</axis>
+    </joystick>
+  </Visualisation>
+
+  <MusicOSD>
+    <joystick name="OUYA Game Controller">
+      <button id="4">Close</button>
+      <button id="6">Info</button>
+    </joystick>
+  </MusicOSD>
+
+  <VisualisationSettings>
+    <joystick name="OUYA Game Controller">
+      <button id="4">Close</button>
+    </joystick>
+  </VisualisationSettings>
+
+  <VisualisationPresetList>
+    <joystick name="OUYA Game Controller">
+      <button id="4">Close</button>
+    </joystick>
+  </VisualisationPresetList>
+
+  <SlideShow>
+    <joystick name="OUYA Game Controller">
+      <button id="1">Pause</button>
+      <button id="4">Stop</button>
+      <button id="3">ZoomNormal</button>
+      <button id="5">Rotate</button>
+      <button id="6">CodecInfo</button>
+      <button id="11">PreviousPicture</button>
+      <button id="12">NextPicture</button>
+      <axis id="1">AnalogMove</axis>
+      <axis id="2">AnalogMove</axis>
+      <axis id="3" limit="+1">ZoomOut</axis>
+      <axis id="6" limit="+1">ZoomIn</axis>
+    </joystick>
+  </SlideShow>
+
+  <ScreenCalibration>
+    <joystick name="OUYA Game Controller">
+      <button id="2">ResetCalibration</button>
+      <button id="5">NextResolution</button>
+      <button id="6">NextCalibration</button>
+    </joystick>
+  </ScreenCalibration>
+
+  <GUICalibration>
+    <joystick name="OUYA Game Controller">
+      <button id="2">ResetCalibration</button>
+      <button id="5">NextResolution</button>
+      <button id="6">NextCalibration</button>
+    </joystick>
+  </GUICalibration>
+
+  <VideoOSD>
+    <joystick name="OUYA Game Controller">
+      <button id="2">Close</button>
+    </joystick>
+  </VideoOSD>
+
+  <VideoMenu>
+    <joystick name="OUYA Game Controller">
+      <button id="4">Stop</button>
+      <button id="2">OSD</button>
+      <button id="5">AspectRatio</button>
+      <button id="8">Info</button>
+    </joystick>
+  </VideoMenu>
+
+  <OSDVideoSettings>
+    <joystick name="OUYA Game Controller">
+      <button id="5">AspectRatio</button>
+      <button id="2">Close</button>
+    </joystick>
+  </OSDVideoSettings>
+
+  <OSDAudioSettings>
+    <joystick name="OUYA Game Controller">
+      <button id="5">AspectRatio</button>
+      <button id="2">Close</button>
+    </joystick>
+  </OSDAudioSettings>
+
+  <VideoBookmarks>
+    <joystick name="OUYA Game Controller">
+      <button id="5">Delete</button>
+    </joystick>
+  </VideoBookmarks>
+
+  <MyVideoLibrary>
+  </MyVideoLibrary>
+
+  <MyVideoFiles>
+  </MyVideoFiles>
+
+  <MyVideoPlaylist>
+    <joystick name="OUYA Game Controller">
+      <button id="5">Delete</button>
+    </joystick>
+  </MyVideoPlaylist>
+
+  <VirtualKeyboard>
+    <joystick name="OUYA Game Controller">
+      <button id="4">BackSpace</button>
+      <button id="3">Symbols</button>
+      <button id="5">Shift</button>
+      <button id="7">Enter</button>
+      <axis id="3" limit="+1">CursorLeft</axis>
+      <axis id="6" limit="+1">CursorRight</axis>
+    </joystick>
+  </VirtualKeyboard>
+
+  <ContextMenu>
+    <joystick name="OUYA Game Controller">
+      <button id="2">Close</button>
+      <button id="4">Close</button>
+    </joystick>
+  </ContextMenu>
+
+  <Scripts>
+    <joystick name="OUYA Game Controller">
+      <button id="2">Info</button>
+    </joystick>
+  </Scripts>
+
+  <Settings>
+    <joystick name="OUYA Game Controller">
+      <button id="4">PreviousMenu</button>
+    </joystick>
+  </Settings>
+
+  <AddonInformation>
+    <joystick name="OUYA Game Controller">
+      <button id="4">Close</button>
+    </joystick>
+  </AddonInformation>
+
+  <AddonSettings>
+    <joystick name="OUYA Game Controller">
+      <button id="4">Close</button>
+    </joystick>
+  </AddonSettings>
+
+  <TextViewer>
+    <joystick name="OUYA Game Controller">
+      <button id="4">Close</button>
+    </joystick>
+  </TextViewer>
+
+  <shutdownmenu>
+    <joystick name="OUYA Game Controller">
+      <button id="4">PreviousMenu</button>
+      <button id="7">PreviousMenu</button>
+    </joystick>
+  </shutdownmenu>
+
+  <submenu>
+    <joystick name="OUYA Game Controller">
+      <button id="4">PreviousMenu</button>
+    </joystick>
+  </submenu>
+
+  <MusicInformation>
+    <joystick name="OUYA Game Controller">
+      <button id="4">Close</button>
+    </joystick>
+  </MusicInformation>
+
+  <MovieInformation>
+    <joystick name="OUYA Game Controller">
+      <button id="4">Close</button>
+    </joystick>
+  </MovieInformation>
+
+  <NumericInput>
+    <joystick name="OUYA Game Controller">
+      <button id="4">BackSpace</button>
+      <button id="7">Enter</button>
+    </joystick>
+  </NumericInput>
+
+  <GamepadInput>
+    <joystick name="OUYA Game Controller">
+      <button id="7">Stop</button>
+    </joystick>
+  </GamepadInput>
+
+  <LockSettings>
+    <joystick name="OUYA Game Controller">
+      <button id="4">PreviousMenu</button>
+      <button id="7">Close</button>
+    </joystick>
+  </LockSettings>
+
+  <ProfileSettings>
+    <joystick name="OUYA Game Controller">
+      <button id="4">PreviousMenu</button>
+      <button id="7">Close</button>
+    </joystick>
+  </ProfileSettings>
+
+</keymap>
diff --git a/system/keymaps/joystick.PS4.Controller.xml b/system/keymaps/joystick.PS4.Controller.xml
new file mode 100644
index 0000000000..9634bd47c3
--- /dev/null
+++ b/system/keymaps/joystick.PS4.Controller.xml
@@ -0,0 +1,324 @@
+<!-- Joystick Name: Wireless Controller (PS4)  -->
+
+<!-- Button Mappings:                          -->
+<!--                                           -->
+<!-- ID              Button                    -->
+<!--                                           -->
+<!-- 1               Square                    -->
+<!-- 2               Cross                     -->
+<!-- 3               Circle                    -->
+<!-- 4               Triangle                  -->
+<!-- 5               L1                        -->
+<!-- 6               R1                        -->
+<!-- 7               L2                        -->
+<!-- 8               R2                        -->
+<!-- 9               Share     (not used)      -->
+<!-- 10              Options   (not used)      -->
+<!-- 11              L3                        -->
+<!-- 12              R3                        -->
+<!-- 13              PS Button (not used)      -->
+
+<!-- Hat Mappings:                             -->
+<!--                                           -->
+<!-- ID              Button                    -->
+<!--                                           -->
+<!-- 1 up            D-Pad Up                  -->
+<!-- 1 down          D-Pad Down                -->
+<!-- 1 left          D-Pad Left                -->
+<!-- 1 right         D-Pad Right               -->
+
+<!-- Axis Mappings:                            -->
+<!--                                           -->
+<!-- ID              Button                    -->
+<!--                                           -->
+<!-- 1               Left Stick L/R            -->
+<!-- 2               Left Stick U/D            -->
+<!-- 3               Right Stick L/R           -->
+<!-- 4               Right Stick U/D           -->
+
+<keymap>
+  
+  <global>
+    <joystick name="Wireless Controller">
+      <button id="2">Select</button>
+      <button id="1">ContextMenu</button>
+      <button id="4">FullScreen</button>
+      <button id="3">Back</button>
+      <button id="5">Queue</button>
+      <button id="6">Playlist</button>
+      <button id="11">PreviousMenu</button>
+      <button id="12">XBMC.ActivateWindow(Home)</button>
+      <hat    id="1" position="left">Left</hat>
+      <hat    id="1" position="right">Right</hat>
+      <hat    id="1" position="up">Up</hat>
+      <hat    id="1" position="down">Down</hat>
+      <axis limit="+1" id="3">AnalogSeekForward</axis>
+      <axis limit="-1" id="3">AnalogSeekBack</axis>
+      <axis limit="-1" id="2">ScrollUp</axis>
+      <axis limit="+1" id="2">ScrollDown</axis>
+    </joystick>
+  </global>
+
+  <Home>
+  </Home>
+
+  <MyFiles>
+  </MyFiles>
+
+  <MyMusicPlaylist>
+    <joystick name="Wireless Controller">
+      <button id="5">Delete</button>
+    </joystick>
+  </MyMusicPlaylist>
+
+  <MyMusicFiles>
+  </MyMusicFiles>
+
+  <MyMusicLibrary>
+  </MyMusicLibrary>
+
+  <FullscreenVideo>
+    <joystick name="Wireless Controller">
+      <button id="2">Pause</button>
+      <button id="1">OSD</button>
+      <button id="3">Stop</button>
+      <button id="5">AspectRatio</button>
+      <button id="6">ShowSubtitles</button>
+      <button id="11">SmallStepBack</button>
+      <button id="12">Info</button>
+      <hat    id="1" position="left">StepBack</hat>
+      <hat    id="1" position="right">StepForward</hat>
+      <hat    id="1" position="up">BigStepForward</hat>
+      <hat    id="1" position="down">BigStepBack</hat>
+    </joystick>
+  </FullscreenVideo>
+
+  <FullscreenLiveTV>
+    <joystick name="Wireless Controller">
+      <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>
+  </FullscreenLiveTV>
+
+  <FullscreenInfo>
+    <joystick name="Wireless Controller">
+      <button id="1">OSD</button>
+      <button id="3">Close</button>
+    </joystick>
+  </FullscreenInfo>
+
+  <PlayerControls>
+    <joystick name="Wireless Controller">
+      <button id="3">Close</button>
+    </joystick>
+  </PlayerControls>
+
+  <Visualisation>
+    <joystick name="Wireless Controller">
+      <button id="2">Pause</button>
+      <button id="3">Stop</button>
+      <button id="1">XBMC.ActivateWindow(MusicOSD)</button>
+      <button id="12">Info</button>
+      <button id="6">SkipNext</button>
+      <button id="5">SkipPrevious</button>
+      <button id="7">PreviousPreset</button>
+      <button id="8">NextPreset</button>
+    </joystick>
+  </Visualisation>
+
+  <MusicOSD>
+    <joystick name="Wireless Controller">
+      <button id="3">Close</button>
+      <button id="12">Info</button>
+    </joystick>
+  </MusicOSD>
+
+  <VisualisationSettings>
+    <joystick name="Wireless Controller">
+      <button id="3">Close</button>
+    </joystick>
+  </VisualisationSettings>
+
+  <VisualisationPresetList>
+    <joystick name="Wireless Controller">
+      <button id="3">Close</button>
+    </joystick>
+  </VisualisationPresetList>
+
+  <SlideShow>
+    <joystick name="Wireless Controller">
+      <button id="2">Pause</button>
+      <button id="3">Stop</button>
+      <button id="4">ZoomNormal</button>
+      <button id="5">Rotate</button>
+      <button id="6">CodecInfo</button>
+      <hat    id="1" position="left">PreviousPicture</hat>
+      <hat    id="1" position="right">NextPicture</hat>
+      <axis id="1">AnalogMove</axis>
+      <axis id="2">AnalogMove</axis>
+      <button id="7">ZoomOut</button>
+      <button id="8">ZoomIn</button>
+    </joystick>
+  </SlideShow>
+
+  <ScreenCalibration>
+    <joystick name="Wireless Controller">
+      <button id="2">ResetCalibration</button>
+      <button id="5">NextResolution</button>
+      <button id="6">NextCalibration</button>
+    </joystick>
+  </ScreenCalibration>
+
+  <GUICalibration>
+    <joystick name="Wireless Controller">
+      <button id="2">ResetCalibration</button>
+      <button id="5">NextResolution</button>
+      <button id="6">NextCalibration</button>
+    </joystick>
+  </GUICalibration>
+
+  <VideoOSD>
+    <joystick name="Wireless Controller">
+      <button id="2">Close</button>
+    </joystick>
+  </VideoOSD>
+
+  <VideoMenu>
+    <joystick name="Wireless Controller">
+      <button id="3">Stop</button>
+      <button id="2">OSD</button>
+      <button id="5">AspectRatio</button>
+      <button id="12">Info</button>
+    </joystick>
+  </VideoMenu>
+
+  <OSDVideoSettings>
+    <joystick name="Wireless Controller">
+      <button id="5">AspectRatio</button>
+      <button id="2">Close</button>
+    </joystick>
+  </OSDVideoSettings>
+
+  <OSDAudioSettings>
+    <joystick name="Wireless Controller">
+      <button id="5">AspectRatio</button>
+      <button id="2">Close</button>
+    </joystick>
+  </OSDAudioSettings>
+
+  <VideoBookmarks>
+    <joystick name="Wireless Controller">
+      <button id="5">Delete</button>
+    </joystick>
+  </VideoBookmarks>
+
+  <MyVideoLibrary>
+  </MyVideoLibrary>
+
+  <MyVideoFiles>
+  </MyVideoFiles>
+
+  <MyVideoPlaylist>
+    <joystick name="Wireless Controller">
+      <button id="5">Delete</button>
+    </joystick>
+  </MyVideoPlaylist>
+
+  <VirtualKeyboard>
+    <joystick name="Wireless Controller">
+      <button id="3">BackSpace</button>
+      <button id="4">Symbols</button>
+      <button id="5">Shift</button>
+      <button id="11">Enter</button>
+      <button id="7">CursorLeft</button>
+      <button id="8">CursorRight</button>
+    </joystick>
+  </VirtualKeyboard>
+
+  <ContextMenu>
+    <joystick name="Wireless Controller">
+      <button id="3">Close</button>
+    </joystick>
+  </ContextMenu>
+
+  <Scripts>
+  </Scripts>
+
+  <Settings>
+    <joystick name="Wireless Controller">
+      <button id="3">PreviousMenu</button>
+    </joystick>
+  </Settings>
+
+  <AddonInformation>
+    <joystick name="Wireless Controller">
+      <button id="3">Close</button>
+    </joystick>
+  </AddonInformation>
+
+  <AddonSettings>
+    <joystick name="Wireless Controller">
+      <button id="3">Close</button>
+    </joystick>
+  </AddonSettings>
+
+  <TextViewer>
+    <joystick name="Wireless Controller">
+      <button id="3">Close</button>
+    </joystick>
+  </TextViewer>
+
+  <shutdownmenu>
+    <joystick name="Wireless Controller">
+      <button id="3">PreviousMenu</button>
+    </joystick>
+  </shutdownmenu>
+
+  <submenu>
+    <joystick name="Wireless Controller">
+      <button id="3">PreviousMenu</button>
+    </joystick>
+  </submenu>
+
+  <MusicInformation>
+    <joystick name="Wireless Controller">
+      <button id="3">Close</button>
+    </joystick>
+  </MusicInformation>
+
+  <MovieInformation>
+    <joystick name="Wireless Controller">
+      <button id="3">Close</button>
+    </joystick>
+  </MovieInformation>
+
+  <NumericInput>
+    <joystick name="Wireless Controller">
+      <button id="3">BackSpace</button>
+      <button id="11">Enter</button>
+    </joystick>
+  </NumericInput>
+
+  <GamepadInput>
+    <joystick name="Wireless Controller">
+      <button id="11">Stop</button>
+    </joystick>
+  </GamepadInput>
+
+  <LockSettings>
+    <joystick name="Wireless Controller">
+      <button id="3">PreviousMenu</button>
+      <button id="11">Close</button>
+    </joystick>
+  </LockSettings>
+
+  <ProfileSettings>
+    <joystick name="Wireless Controller">
+      <button id="3">PreviousMenu</button>
+      <button id="11">Close</button>
+    </joystick>
+  </ProfileSettings>
+
+</keymap>
diff --git a/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml b/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml
index 5d65a8555e..5bc5dd4785 100644
--- a/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml
+++ b/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml
@@ -80,7 +80,6 @@
     <joystick name="/Sony PLAYSTATION\(R\)3 Controller.*">
       <altname>PLAYSTATION(R)3 Controller</altname>
       <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
       <button id="15">Select</button>
       <button id="14">Back</button>
       <button id="16">ContextMenu</button>
@@ -481,4 +480,4 @@
       <button id="3">Close</button>
     </joystick>
   </ProfileSettings>
-</keymap>
\ No newline at end of file
+</keymap>
diff --git a/system/settings/settings.xml b/system/settings/settings.xml
index 22852a2006..3400a5e982 100644
--- a/system/settings/settings.xml
+++ b/system/settings/settings.xml
@@ -93,7 +93,7 @@
       </group>
       <group id="2">
         <setting id="lookandfeel.enablerssfeeds" type="boolean" label="13305" help="36111">
-          <level>1</level>
+          <level>0</level>
           <default>true</default>
           <control type="toggle" />
         </setting>