diff options
| -rw-r--r-- | xbmc/settings/AdvancedSettings.cpp | 7 | ||||
| -rw-r--r-- | xbmc/settings/AdvancedSettings.h | 3 | ||||
| -rw-r--r-- | xbmc/utils/SeekHandler.cpp | 9 |
3 files changed, 1 insertions, 18 deletions
diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp index d49da594de..250dd6401b 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -131,9 +131,6 @@ void CAdvancedSettings::Initialize() m_videoSubsDelayRange = 60; m_videoAudioDelayRange = 10; - m_videoSmallStepBackSeconds = 7; - m_videoSmallStepBackTries = 3; - m_videoSmallStepBackDelay = 300; m_videoUseTimeSeeking = true; m_videoTimeSeekForward = 30; m_videoTimeSeekBackward = -30; @@ -563,10 +560,6 @@ void CAdvancedSettings::ParseSettingsFile(const std::string &file) XMLUtils::GetInt(pElement, "ignoresecondsatstart", m_videoIgnoreSecondsAtStart, 0, 900); XMLUtils::GetFloat(pElement, "ignorepercentatend", m_videoIgnorePercentAtEnd, 0, 100.0f); - XMLUtils::GetInt(pElement, "smallstepbackseconds", m_videoSmallStepBackSeconds, 1, INT_MAX); - XMLUtils::GetInt(pElement, "smallstepbacktries", m_videoSmallStepBackTries, 1, 10); - XMLUtils::GetInt(pElement, "smallstepbackdelay", m_videoSmallStepBackDelay, 100, 5000); //MS - XMLUtils::GetBoolean(pElement, "usetimeseeking", m_videoUseTimeSeeking); XMLUtils::GetInt(pElement, "timeseekforward", m_videoTimeSeekForward, 0, 6000); XMLUtils::GetInt(pElement, "timeseekbackward", m_videoTimeSeekBackward, -6000, 0); diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h index 9194adb50c..e5ec2c4227 100644 --- a/xbmc/settings/AdvancedSettings.h +++ b/xbmc/settings/AdvancedSettings.h @@ -149,9 +149,6 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler float m_videoSubsDelayRange; float m_videoAudioDelayRange; - int m_videoSmallStepBackSeconds; - int m_videoSmallStepBackTries; - int m_videoSmallStepBackDelay; bool m_videoUseTimeSeeking; int m_videoTimeSeekForward; int m_videoTimeSeekBackward; diff --git a/xbmc/utils/SeekHandler.cpp b/xbmc/utils/SeekHandler.cpp index 05a7d76ad3..3018c0b2f9 100644 --- a/xbmc/utils/SeekHandler.cpp +++ b/xbmc/utils/SeekHandler.cpp @@ -219,6 +219,7 @@ bool CSeekHandler::OnAction(const CAction &action) switch (action.GetID()) { + case ACTION_SMALL_STEP_BACK: case ACTION_STEP_BACK: { Seek(false, action.GetAmount(), action.GetRepeat()); @@ -253,14 +254,6 @@ bool CSeekHandler::OnAction(const CAction &action) g_infoManager.SetDisplayAfterSeek(); return true; } - case ACTION_SMALL_STEP_BACK: - { - int orgpos = (int)g_application.GetTime(); - int jumpsize = g_advancedSettings.m_videoSmallStepBackSeconds; // secs - int setpos = (orgpos > jumpsize) ? orgpos - jumpsize : 0; - g_application.SeekTime((double)setpos); - return true; - } case ACTION_ANALOG_SEEK_FORWARD: case ACTION_ANALOG_SEEK_BACK: { |