aboutsummaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/keymaps/keyboard.xml56
-rw-r--r--system/keymaps/remote.xml154
-rw-r--r--system/playercorefactory.xml3
3 files changed, 211 insertions, 2 deletions
diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml
index 5478a15787..6ddcf12e14 100644
--- a/system/keymaps/keyboard.xml
+++ b/system/keymaps/keyboard.xml
@@ -94,6 +94,12 @@
<backslash>ToggleFullScreen</backslash>
<home>FirstPage</home>
<end>LastPage</end>
+ <!-- PVR windows -->
+ <e>XBMC.ActivateWindowAndFocus(MyPVR, 31,0, 10,0)</e>
+ <h>XBMC.ActivateWindowAndFocus(MyPVR, 32,0, 11,0)</h>
+ <j>XBMC.ActivateWindowAndFocus(MyPVR, 33,0, 12,0)</j>
+ <k>XBMC.ActivateWindowAndFocus(MyPVR, 34,0, 13,0)</k>
+ <b>XBMC.ActivateWindowAndFocus(MyPVR, 35,0, 14,0)</b>
<!-- Multimedia keyboard keys -->
<browser_back>Back</browser_back>
<browser_forward/>
@@ -159,6 +165,13 @@
<backspace>Backspace</backspace>
</keyboard>
</VirtualKeyboard>
+ <MyTV>
+ <keyboard>
+ <delete>Delete</delete>
+ <m>Move</m>
+ <r>Rename</r>
+ </keyboard>
+ </MyTV>
<MyFiles>
<keyboard>
<space>Highlight</space>
@@ -220,6 +233,7 @@
<down>BigStepBack</down>
<a>AudioDelay</a>
<escape>Fullscreen</escape>
+ <c>Playlist</c>
<v>XBMC.ActivateWindow(Teletext)</v>
<up mod="ctrl">SubtitleShiftUp</up>
<down mod="ctrl">SubtitleShiftDown</down>
@@ -269,6 +283,8 @@
<o>CodecInfo</o>
<l>LockPreset</l>
<escape>FullScreen</escape>
+ <g>XBMC.ActivateWindow(PVROSDGuide)</g>
+ <c>XBMC.ActivateWindow(PVROSDChannels)</c>
</keyboard>
</Visualisation>
<MusicOSD>
@@ -458,6 +474,46 @@
<v>Back</v>
</keyboard>
</Teletext>
+ <Favourites>
+ <keyboard>
+ <backspace>Close</backspace>
+ </keyboard>
+ </Favourites>
+ <NumericInput>
+ <keyboard>
+ <backspace>Close</backspace>
+ </keyboard>
+ </NumericInput>
+ <PVROSDChannels>
+ <keyboard>
+ <backspace>Close</backspace>
+ <escape>Close</escape>
+ <c>Close</c>
+ </keyboard>
+ </PVROSDChannels>
+ <PVROSDGuide>
+ <keyboard>
+ <backspace>Close</backspace>
+ <escape>Close</escape>
+ </keyboard>
+ </PVROSDGuide>
+ <PVROSDDirector>
+ <keyboard>
+ <backspace>Close</backspace>
+ <escape>Close</escape>
+ </keyboard>
+ </PVROSDDirector>
+ <PVROSDCutter>
+ <keyboard>
+ <backspace>Close</backspace>
+ <escape>Close</escape>
+ </keyboard>
+ </PVROSDCutter>
+ <MyTVSettings>
+ <keyboard>
+ <backspace>PreviousMenu</backspace>
+ </keyboard>
+ </MyTVSettings>
<FileBrowser>
<keyboard>
<space>Highlight</space>
diff --git a/system/keymaps/remote.xml b/system/keymaps/remote.xml
index c0e06a06ba..a5e7eb1e55 100644
--- a/system/keymaps/remote.xml
+++ b/system/keymaps/remote.xml
@@ -66,8 +66,13 @@
<myvideo>XBMC.ActivateWindow(MyVideos)</myvideo>
<mymusic>XBMC.ActivateWindow(MyMusic)</mymusic>
<mypictures>XBMC.ActivateWindow(MyPictures)</mypictures>
- <mytv>XBMC.ActivateWindow(VideoLibrary,TvShows)</mytv>
- <red>XBMC.ActivateWindow(Home)</red>
+ <mytv>XBMC.ActivateWindow(MyPVR)</mytv>
+ <guide>XBMC.ActivateWindowAndFocus(MyPVR, 31,0, 10,0)</guide>
+ <livetv>XBMC.ActivateWindowAndFocus(MyPVR, 32,0, 11,0)</livetv>
+ <liveradio>XBMC.ActivateWindowAndFocus(MyPVR, 33,0, 12,0)</liveradio>
+ <recordedtv>XBMC.ActivateWindowAndFocus(MyPVR, 34,0, 13,0)</recordedtv>
+ <epgsearch>XBMC.ActivateWindowAndFocus(MyPVR, 35,0, 14,0)</epgsearch>
+ <red>XBMC.ActivateWindow(MyPVR)</red>
<green>XBMC.ActivateWindow(MyVideos)</green>
<yellow>XBMC.ActivateWindow(MyMusic)</yellow>
<blue>XBMC.ActivateWindow(MyPictures)</blue>
@@ -90,6 +95,11 @@
<hash>XBMC.ActivateWindow(Settings)</hash>
</remote>
</Home>
+ <MyTV>
+ <remote>
+ <clear>Delete</clear>
+ </remote>
+ </MyTV>
<MyFiles>
<remote>
<clear>Delete</clear>
@@ -143,10 +153,13 @@
<select>AspectRatio</select>
<title>CodecInfo</title>
<info>Info</info>
+ <guide>XBMC.ActivateWindow(PVROSDGuide)</guide>
<teletext>XBMC.ActivateWindow(Teletext)</teletext>
<subtitle>NextSubtitle</subtitle>
<star>NextSubtitle</star>
<language>AudioNextLanguage</language>
+ <playlist>Playlist</playlist>
+ <language>Language</language>
<hash>AudioNextLanguage</hash>
<pageplus>SkipNext</pageplus>
<pageminus>SkipPrevious</pageminus>
@@ -182,6 +195,8 @@
<menu>XBMC.ActivateWindow(MusicOSD)</menu>
<start>XBMC.ActivateWindow(MusicOSD)</start>
<info>Info</info>
+ <guide>XBMC.ActivateWindow(PVROSDGuide)</guide>
+ <playlist>XBMC.ActivateWindow(PVROSDChannels)</playlist>
</remote>
</Visualisation>
<MusicOSD>
@@ -343,6 +358,103 @@
<back>BackSpace</back>
</remote>
</NumericInput>
+ <Weather>
+ <remote>
+ <back>PreviousMenu</back>
+ </remote>
+ </Weather>
+ <TV>
+ <remote>
+ <red>Red</red>
+ <green>Green</green>
+ <yellow>Yellow</yellow>
+ <blue>Blue</blue>
+ </remote>
+ </TV>
+ <Settings>
+ <remote>
+ <back>PreviousMenu</back>
+ </remote>
+ </Settings>
+ <AddonBrowser>
+ <remote>
+ </remote>
+ </AddonBrowser>
+ <AddonInformation>
+ <remote>
+ <back>Close</back>
+ </remote>
+ </AddonInformation>
+ <AddonSettings>
+ <remote>
+ <back>Close</back>
+ </remote>
+ </AddonSettings>
+ <TextViewer>
+ <remote>
+ <back>Close</back>
+ </remote>
+ </TextViewer>
+ <MyPicturesSettings>
+ <remote>
+ <back>PreviousMenu</back>
+ </remote>
+ </MyPicturesSettings>
+ <MyProgramsSettings>
+ <remote>
+ <back>PreviousMenu</back>
+ </remote>
+ </MyProgramsSettings>
+ <MyWeatherSettings>
+ <remote>
+ <back>PreviousMenu</back>
+ </remote>
+ </MyWeatherSettings>
+ <MyMusicSettings>
+ <remote>
+ <back>PreviousMenu</back>
+ </remote>
+ </MyMusicSettings>
+ <SystemSettings>
+ <remote>
+ <back>PreviousMenu</back>
+ </remote>
+ </SystemSettings>
+ <MyVideosSettings>
+ <remote>
+ <back>PreviousMenu</back>
+ </remote>
+ </MyVideosSettings>
+ <NetworkSettings>
+ <remote>
+ <back>PreviousMenu</back>
+ </remote>
+ </NetworkSettings>
+ <AppearanceSettings>
+ <remote>
+ <back>PreviousMenu</back>
+ </remote>
+ </AppearanceSettings>
+ <Profiles>
+ <remote>
+ <back>PreviousMenu</back>
+ </remote>
+ </Profiles>
+ <systeminfo>
+ <remote>
+ <back>PreviousMenu</back>
+ </remote>
+ </systeminfo>
+ <shutdownmenu>
+ <remote>
+ <back>PreviousMenu</back>
+ </remote>
+ </shutdownmenu>
+ <submenu>
+ <remote>
+ <back>PreviousMenu</back>
+ </remote>
+ </submenu>
<MusicInformation>
<remote>
<info>Back</info>
@@ -392,6 +504,44 @@
<teletext>Back</teletext>
</remote>
</Teletext>
+ <Favourites>
+ <remote>
+ <back>Close</back>
+ </remote>
+ </Favourites>
+ <PVROSDChannels>
+ <remote>
+ <back>Close</back>
+ <menu>Close</menu>
+ <start>Close</start>
+ <playlist>Close</playlist>
+ </remote>
+ </PVROSDChannels>
+ <PVROSDGuide>
+ <remote>
+ <back>Close</back>
+ <menu>Close</menu>
+ <start>Close</start>
+ <guide>Close</guide>
+ </remote>
+ </PVROSDGuide>
+ <PVROSDDirector>
+ <remote>
+ <back>Close</back>
+ <menu>Close</menu>
+ </remote>
+ </PVROSDDirector>
+ <PVROSDCutter>
+ <remote>
+ <back>Close</back>
+ <menu>Close</menu>
+ </remote>
+ </PVROSDCutter>
+ <MyTVSettings>
+ <remote>
+ <back>PreviousMenu</back>
+ </remote>
+ </MyTVSettings>
<AddonSettings>
<remote>
<clear>Delete</clear>
diff --git a/system/playercorefactory.xml b/system/playercorefactory.xml
index a8dfd7dba5..76027b6315 100644
--- a/system/playercorefactory.xml
+++ b/system/playercorefactory.xml
@@ -32,5 +32,8 @@
<!-- Pass these to dvdplayer as we do not know if they are audio or video -->
<rule name="nsv" filetypes="nsv" player="DVDPlayer" />
+
+ <!-- pvr radio channels should be played by dvdplayer because they need buffering -->
+ <rule name="radio" filetypes="pvr" filename=".*/radio/.*" player="DVDPlayer" />
</rules>
</playercorefactory>