Merge pull request #2809 from jmarshallnz/no_skip_for_you

[dvd/omxplayer] don't override NextItem/PreviousItem with chapter skipping

2 files changed, 0 insertions, 44 deletions

diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp
index f21677b040..6486d92aca 100644
--- a/xbmc/cores/dvdplayer/DVDPlayer.cpp
+++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -3672,28 +3672,6 @@ bool CDVDPlayer::OnAction(const CAction &action)
     }
   }
 
-  switch (action.GetID())
-  {
-    case ACTION_NEXT_ITEM:
-      if(GetChapterCount() > 0)
-      {
-        m_messenger.Put(new CDVDMsgPlayerSeekChapter(GetChapter()+1));
-        g_infoManager.SetDisplayAfterSeek();
-        return true;
-      }
-      else
-        break;
-    case ACTION_PREV_ITEM:
-      if(GetChapterCount() > 0)
-      {
-        m_messenger.Put(new CDVDMsgPlayerSeekChapter(GetChapter()-1));
-        g_infoManager.SetDisplayAfterSeek();
-        return true;
-      }
-      else
-        break;
-  }
-
   // return false to inform the caller we didn't handle the message
   return false;
 }
diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp
index 94cbd9211d..0f579cf4a7 100644
--- a/xbmc/cores/omxplayer/OMXPlayer.cpp
+++ b/xbmc/cores/omxplayer/OMXPlayer.cpp
@@ -3834,28 +3834,6 @@ bool COMXPlayer::OnAction(const CAction &action)
     }
   }
 
-  switch (action.GetID())
-  {
-    case ACTION_NEXT_ITEM:
-      if(GetChapterCount() > 0)
-      {
-        m_messenger.Put(new CDVDMsgPlayerSeekChapter(GetChapter()+1));
-        g_infoManager.SetDisplayAfterSeek();
-        return true;
-      }
-      else
-        break;
-    case ACTION_PREV_ITEM:
-      if(GetChapterCount() > 0)
-      {
-        m_messenger.Put(new CDVDMsgPlayerSeekChapter(GetChapter()-1));
-        g_infoManager.SetDisplayAfterSeek();
-        return true;
-      }
-      else
-        break;
-  }
-
   // return false to inform the caller we didn't handle the message
   return false;
 }