aboutsummaryrefslogtreecommitdiff
path: root/subsonic-android/res
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2013-07-11 22:00:54 -0700
committerScott Jackson <daneren2005@gmail.com>2013-07-11 22:00:54 -0700
commit9f7aa3bc5cec9cb697d8cd064c26355d1a0f2038 (patch)
treeb0843bba4f7e16626acf7b5f58a1909b56e378e6 /subsonic-android/res
parent06f4da82e83a428b2a4440fef5f8ed110a09ebfb (diff)
downloaddsub-9f7aa3bc5cec9cb697d8cd064c26355d1a0f2038.tar.gz
dsub-9f7aa3bc5cec9cb697d8cd064c26355d1a0f2038.tar.bz2
dsub-9f7aa3bc5cec9cb697d8cd064c26355d1a0f2038.zip
Added HLS video streaming as option for video player
Diffstat (limited to 'subsonic-android/res')
-rw-r--r--subsonic-android/res/values/arrays.xml2
-rw-r--r--subsonic-android/res/values/strings.xml1
2 files changed, 3 insertions, 0 deletions
diff --git a/subsonic-android/res/values/arrays.xml b/subsonic-android/res/values/arrays.xml
index daca9b8b..d6541f9f 100644
--- a/subsonic-android/res/values/arrays.xml
+++ b/subsonic-android/res/values/arrays.xml
@@ -139,11 +139,13 @@
<string-array name="videoPlayerValues">
<item>raw</item>
+ <item>hls</item>
<item>transcode</item>
<item>flash</item>
</string-array>
<string-array name="videoPlayerNames">
<item>@string/settings.video_raw</item>
+ <item>@string/settings.video_hls</item>
<item>@string/settings.video_transcode</item>
<item>@string/settings.video_flash</item>
</string-array>
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index e02383b0..39cdf075 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -318,6 +318,7 @@
<string name="settings.video_title">Video</string>
<string name="settings.video_player">Video Player</string>
<string name="settings.video_raw">Raw (Requires Subsonic 4.8+)</string>
+ <string name="settings.video_hls">HTTP Live Stream (HLS) (Requires Subsonic 4.8+)</string>
<string name="settings.video_transcode">Direct Transcode (Requires video -> mp4 or similar setup on Server)</string>
<string name="settings.video_flash">Flash (Requires Plugin)</string>