Browse Source

Get rid of the old fast seek setting

pipelines/135724
Nicolas Pomepuy 5 years ago
parent
commit
2c2b7ab563
  1. 6
      application/app/src/androidTest/java/org/videolan/vlc/gui/preferences/PreferencesVideoUITest.kt
  2. 1
      application/resources/src/main/java/org/videolan/resources/VLCOptions.kt
  3. 2
      application/resources/src/main/res/values/strings.xml
  4. 6
      application/vlc-android/res/xml/preferences_video.xml

6
application/app/src/androidTest/java/org/videolan/vlc/gui/preferences/PreferencesVideoUITest.kt

@ -47,12 +47,6 @@ class PreferencesVideoUITest: BasePreferenceUITest() {
checkToggleWorks(key, settings, default = false) checkToggleWorks(key, settings, default = false)
} }
@Test
fun checkFastSeekMediaSetting() {
val key = "media_fast_seek"
checkToggleWorks(key, settings)
}
@Test @Test
fun checkVideoTitleOnTransitionSetting() { fun checkVideoTitleOnTransitionSetting() {
val key = "video_transition_show" val key = "video_transition_show"

1
application/resources/src/main/java/org/videolan/resources/VLCOptions.kt

@ -222,7 +222,6 @@ object VLCOptions {
if (noVideo) media.addOption(":no-video") if (noVideo) media.addOption(":no-video")
if (paused) media.addOption(":start-paused") if (paused) media.addOption(":start-paused")
if (!prefs.getBoolean("subtitles_autoload", true)) media.addOption(":sub-language=none") if (!prefs.getBoolean("subtitles_autoload", true)) media.addOption(":sub-language=none")
if (!benchmark && prefs.getBoolean("media_fast_seek", false)) media.addOption(":input-fast-seek")
if (hasRenderer) { if (hasRenderer) {
media.addOption(":sout-chromecast-audio-passthrough=" + prefs.getBoolean("casting_passthrough", true)) media.addOption(":sout-chromecast-audio-passthrough=" + prefs.getBoolean("casting_passthrough", true))

2
application/resources/src/main/res/values/strings.xml

@ -307,8 +307,6 @@
<string name="video_min_group_length_disable">Do not group videos</string> <string name="video_min_group_length_disable">Do not group videos</string>
<string name="video_min_group_length_folder">Group by folder</string> <string name="video_min_group_length_folder">Group by folder</string>
<string name="video_min_group_length_name">Group by name</string> <string name="video_min_group_length_name">Group by name</string>
<string name="media_fast_seek">Fast seek</string>
<string name="media_fast_seek_summary">Seeking in a media is faster but less accurate</string>
<string name="video_transition_title">Videos transition</string> <string name="video_transition_title">Videos transition</string>
<string name="video_transition_summary">Show new video title on transition</string> <string name="video_transition_summary">Show new video title on transition</string>
<string name="media_seen">Show seen video marker</string> <string name="media_seen">Show seen video marker</string>

6
application/vlc-android/res/xml/preferences_video.xml

@ -22,12 +22,6 @@
android:key="playback_speed_video" android:key="playback_speed_video"
android:summary="@string/playback_speed_summary" android:summary="@string/playback_speed_summary"
android:title="@string/playback_speed_title"/> android:title="@string/playback_speed_title"/>
<CheckBoxPreference
app:singleLineTitle="false"
android:defaultValue="false"
android:key="media_fast_seek"
android:summary="@string/media_fast_seek_summary"
android:title="@string/media_fast_seek"/>
<CheckBoxPreference <CheckBoxPreference
app:singleLineTitle="false" app:singleLineTitle="false"
android:defaultValue="true" android:defaultValue="true"

Loading…
Cancel
Save