diff options
author | xhaggi <sascha.woo@gmail.com> | 2015-02-11 16:16:47 +0100 |
---|---|---|
committer | xhaggi <sascha.woo@gmail.com> | 2015-02-13 11:12:06 +0100 |
commit | 8a29212bfba3dca6cc4bd44a007d5793ca5fc6cc (patch) | |
tree | 4014db35b35c508a0cd02bed61d14c9c31f41db5 | |
parent | 4f6c642ae76b3326b492287cce29f8afddfc9d9a (diff) |
[seek] use setting to turn off delay instead of validate enabled seek steps
-rw-r--r-- | system/settings/settings.xml | 2 | ||||
-rw-r--r-- | xbmc/utils/SeekHandler.cpp | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/system/settings/settings.xml b/system/settings/settings.xml index a6d2d97380..15754d7e6a 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -416,7 +416,7 @@ <level>2</level> <default>1000</default> <constraints> - <minimum>500</minimum> + <minimum label="231">0</minimum> <!-- None --> <step>250</step> <maximum>3000</maximum> </constraints> diff --git a/xbmc/utils/SeekHandler.cpp b/xbmc/utils/SeekHandler.cpp index 3018c0b2f9..22668a9ed4 100644 --- a/xbmc/utils/SeekHandler.cpp +++ b/xbmc/utils/SeekHandler.cpp @@ -108,14 +108,6 @@ void CSeekHandler::Seek(bool forward, float amount, float duration /* = 0 */, bo g_infoManager.SetSeeking(true); m_seekStep = 0; m_analogSeek = analogSeek; - - if (!analogSeek) - { - // don't apply a seek delay if only one seek step for the given direction exists - if ((m_backwardSeekSteps.size() == 1 && forward == false) || - (m_forwardSeekSteps.size() == 1 && forward == true)) - m_seekDelay = 0; - } } // calculate our seek amount |