Skip to content
Snippets Groups Projects
Commit 8c88b12c authored by Nicolas Pomepuy's avatar Nicolas Pomepuy
Browse files

Add a setting to disable the force SMB 1 option + fix custom libvlc option bug

parent 1650a659
No related branches found
No related tags found
1 merge request!804Add a setting to disable the force SMB 1 option + fix custom libvlc option bug
Pipeline #39370 passed with stage
in 3 minutes and 29 seconds
...@@ -772,5 +772,7 @@ ...@@ -772,5 +772,7 @@
<string name="timeout_normal">Normal</string> <string name="timeout_normal">Normal</string>
<string name="timeout_long">Long</string> <string name="timeout_long">Long</string>
<string name="video_hud_timeout">Video player controls hiding delay</string> <string name="video_hud_timeout">Video player controls hiding delay</string>
<string name="prefersmbv1">Prefer SMB 1</string>
<string name="prefersmbv1_summary">Uncheck this setting if you have some difficulties browsing your SMB server</string>
</resources> </resources>
...@@ -148,8 +148,7 @@ class PreferencesAdvanced : BasePreferenceFragment(), SharedPreferences.OnShared ...@@ -148,8 +148,7 @@ class PreferencesAdvanced : BasePreferenceFragment(), SharedPreferences.OnShared
activity?.let { Toast.makeText(it, R.string.network_caching_popup, Toast.LENGTH_SHORT).show() } activity?.let { Toast.makeText(it, R.string.network_caching_popup, Toast.LENGTH_SHORT).show() }
} }
} }
VLCInstance.restart() restartLibVLC()
(activity as? PreferencesActivity)?.restartMediaPlayer()
} }
"custom_libvlc_options" -> { "custom_libvlc_options" -> {
try { try {
...@@ -160,12 +159,16 @@ class PreferencesAdvanced : BasePreferenceFragment(), SharedPreferences.OnShared ...@@ -160,12 +159,16 @@ class PreferencesAdvanced : BasePreferenceFragment(), SharedPreferences.OnShared
} finally { } finally {
(activity as? PreferencesActivity)?.restartMediaPlayer() (activity as? PreferencesActivity)?.restartMediaPlayer()
} }
restartLibVLC()
} }
// No break because need VLCInstance.restart(); "opengl", "chroma_format", "deblocking", "enable_frame_skip", "enable_time_stretching_audio", "enable_verbose_mode", "prefer_smbv1" -> {
"opengl", "chroma_format", "deblocking", "enable_frame_skip", "enable_time_stretching_audio", "enable_verbose_mode" -> { restartLibVLC()
VLCInstance.restart()
(activity as? PreferencesActivity)?.restartMediaPlayer()
} }
} }
} }
fun restartLibVLC() {
VLCInstance.restart()
(activity as? PreferencesActivity)?.restartMediaPlayer()
}
} }
...@@ -11,6 +11,13 @@ ...@@ -11,6 +11,13 @@
android:summary="@string/network_caching_summary" android:summary="@string/network_caching_summary"
android:title="@string/network_caching"/> android:title="@string/network_caching"/>
<CheckBoxPreference
app:singleLineTitle="false"
android:defaultValue="true"
android:key="prefer_smbv1"
android:summary="@string/prefersmbv1_summary"
android:title="@string/prefersmbv1"/>
<Preference <Preference
android:enabled="true" android:enabled="true"
android:key="dump_media_db" android:key="dump_media_db"
......
...@@ -150,8 +150,7 @@ class PreferencesAdvanced : BasePreferenceFragment(), SharedPreferences.OnShared ...@@ -150,8 +150,7 @@ class PreferencesAdvanced : BasePreferenceFragment(), SharedPreferences.OnShared
UiTools.snacker(requireView(), R.string.network_caching_popup) UiTools.snacker(requireView(), R.string.network_caching_popup)
} }
} }
VLCInstance.restart() restartLibVLC()
(activity as? PreferencesActivity)?.restartMediaPlayer()
} }
// No break because need VLCInstance.restart(); // No break because need VLCInstance.restart();
"custom_libvlc_options" -> { "custom_libvlc_options" -> {
...@@ -163,12 +162,16 @@ class PreferencesAdvanced : BasePreferenceFragment(), SharedPreferences.OnShared ...@@ -163,12 +162,16 @@ class PreferencesAdvanced : BasePreferenceFragment(), SharedPreferences.OnShared
} finally { } finally {
(activity as? PreferencesActivity)?.restartMediaPlayer() (activity as? PreferencesActivity)?.restartMediaPlayer()
} }
restartLibVLC()
} }
"opengl", "chroma_format", "deblocking", "enable_frame_skip", "enable_time_stretching_audio", "enable_verbose_mode" -> { "opengl", "chroma_format", "deblocking", "enable_frame_skip", "enable_time_stretching_audio", "enable_verbose_mode", "prefer_smbv1" -> {
VLCInstance.restart() VLCInstance.restart()
(activity as? PreferencesActivity)?.restartMediaPlayer() (activity as? PreferencesActivity)?.restartMediaPlayer()
} }
} }
} }
fun restartLibVLC() {
VLCInstance.restart()
(activity as? PreferencesActivity)?.restartMediaPlayer()
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment