Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Drop special casing for page up/down in dvdplayer and handle this by …

…keymap
  • Loading branch information...
commit 72ae0599b30ef48a0c3a49455955b3c76f75d026 1 parent d681bb2
@elupus elupus authored
View
4 system/keymaps/keyboard.xml
@@ -223,6 +223,8 @@
<v>XBMC.ActivateWindow(Teletext)</v>
<up mod="ctrl">SubtitleShiftUp</up>
<down mod="ctrl">SubtitleShiftDown</down>
+ <pageup>SkipNext</pageup>
+ <pagedown>SkipPrevious</pagedown>
</keyboard>
</FullscreenVideo>
<VideoTimeSeek>
@@ -371,6 +373,8 @@
<escape>Fullscreen</escape>
<return>Select</return>
<enter>Select</enter> <!-- backspace>Fullscreen</backspace -->
+ <pageup>SkipNext</pageup>
+ <pagedown>SkipPrevious</pagedown>
</keyboard>
</VideoMenu>
<OSDVideoSettings>
View
6 xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -3307,14 +3307,12 @@ bool CDVDPlayer::OnAction(const CAction &action)
switch (action.GetID())
{
case ACTION_NEXT_ITEM:
- case ACTION_PAGE_UP:
THREAD_ACTION(action);
CLog::Log(LOGDEBUG, " - pushed next in menu, stream will decide");
pStream->OnNext();
g_infoManager.SetDisplayAfterSeek();
return true;
case ACTION_PREV_ITEM:
- case ACTION_PAGE_DOWN:
THREAD_ACTION(action);
CLog::Log(LOGDEBUG, " - pushed prev in menu, stream will decide");
pStream->OnPrevious();
@@ -3417,14 +3415,12 @@ bool CDVDPlayer::OnAction(const CAction &action)
switch (action.GetID())
{
case ACTION_NEXT_ITEM:
- case ACTION_PAGE_UP:
m_messenger.Put(new CDVDMsg(CDVDMsg::PLAYER_CHANNEL_NEXT));
g_infoManager.SetDisplayAfterSeek();
return true;
break;
case ACTION_PREV_ITEM:
- case ACTION_PAGE_DOWN:
m_messenger.Put(new CDVDMsg(CDVDMsg::PLAYER_CHANNEL_PREV));
g_infoManager.SetDisplayAfterSeek();
return true;
@@ -3445,7 +3441,6 @@ bool CDVDPlayer::OnAction(const CAction &action)
switch (action.GetID())
{
case ACTION_NEXT_ITEM:
- case ACTION_PAGE_UP:
if(GetChapterCount() > 0)
{
m_messenger.Put(new CDVDMsgPlayerSeekChapter(GetChapter()+1));
@@ -3455,7 +3450,6 @@ bool CDVDPlayer::OnAction(const CAction &action)
else
break;
case ACTION_PREV_ITEM:
- case ACTION_PAGE_DOWN:
if(GetChapterCount() > 0)
{
m_messenger.Put(new CDVDMsgPlayerSeekChapter(GetChapter()-1));

2 comments on commit 72ae059

@FernetMenta
Collaborator

Should we do the same change for remote.xml?

@elupus
Collaborator

If applicable, yea.

Please sign in to comment.
Something went wrong with that request. Please try again.