|
30 | 30 | end function |
31 | 31 |
|
32 | 32 | sub AddVideoContent(video as object, mediaSourceId as dynamic, audio_stream_idx = 1 as integer, subtitle_idx = -1 as integer, playbackPosition = -1 as integer, forceTranscoding = false as boolean, showIntro = true as boolean, allowResumeDialog = true as boolean) |
| 33 | + globalUser = m.global.user |
33 | 34 | video.content = createObject("RoSGNode", "ContentNode") |
34 | 35 | meta = ItemMetaData(video.id) |
35 | 36 | if not isValid(meta) |
|
90 | 91 | params = { |
91 | 92 | ids: video.Id |
92 | 93 | } |
93 | | - url = Substitute("Users/{0}/Items/", m.global.user.id) |
| 94 | + url = Substitute("Users/{0}/Items/", globalUser.id) |
94 | 95 | resp = APIRequest(url, params) |
95 | 96 | data = getJson(resp) |
96 | 97 | for each item in data.Items |
|
100 | 101 | params = { |
101 | 102 | ids: m.series_id |
102 | 103 | } |
103 | | - url = Substitute("Users/{0}/Items/", m.global.user.id) |
| 104 | + url = Substitute("Users/{0}/Items/", globalUser.id) |
104 | 105 | resp = APIRequest(url, params) |
105 | 106 | data = getJson(resp) |
106 | 107 | for each item in data.Items |
|
117 | 118 | params = { |
118 | 119 | ids: video.Id |
119 | 120 | } |
120 | | - url = Substitute("Users/{0}/Items/", m.global.user.id) |
| 121 | + url = Substitute("Users/{0}/Items/", globalUser.id) |
121 | 122 | resp = APIRequest(url, params) |
122 | 123 | data = getJson(resp) |
123 | 124 | for each item in data.Items |
|
128 | 129 | params = { |
129 | 130 | ids: m.season_id |
130 | 131 | } |
131 | | - url = Substitute("Users/{0}/Items/", m.global.user.id) |
| 132 | + url = Substitute("Users/{0}/Items/", globalUser.id) |
132 | 133 | resp = APIRequest(url, params) |
133 | 134 | data = getJson(resp) |
134 | 135 | for each item in data.Items |
|
138 | 139 | params = { |
139 | 140 | ids: m.series_id |
140 | 141 | } |
141 | | - url = Substitute("Users/{0}/Items/", m.global.user.id) |
| 142 | + url = Substitute("Users/{0}/Items/", globalUser.id) |
142 | 143 | resp = APIRequest(url, params) |
143 | 144 | data = getJson(resp) |
144 | 145 | for each item in data.Items |
|
155 | 156 | params = { |
156 | 157 | ids: video.Id |
157 | 158 | } |
158 | | - url = Substitute("Users/{0}/Items/", m.global.user.id) |
| 159 | + url = Substitute("Users/{0}/Items/", globalUser.id) |
159 | 160 | resp = APIRequest(url, params) |
160 | 161 | data = getJson(resp) |
161 | 162 | for each item in data.Items |
|
225 | 226 | end if |
226 | 227 |
|
227 | 228 | subtitles = sortSubtitles(meta.id, m.playbackInfo.MediaSources[0].MediaStreams) |
228 | | - if m.global.user.settings.playbackSubsOnlyText = true |
| 229 | + if globalUser.settings.playbackSubsOnlyText = true |
229 | 230 | safesubs = [] |
230 | 231 | for each subtitle in subtitles["all"] |
231 | 232 | if subtitle["IsTextSubtitleStream"] |
|
260 | 261 | ' Find first video stream - MediaStreams[0] might be subtitle/audio |
261 | 262 | videoStream = getFirstVideoStream(m.playbackInfo.MediaSources[0].MediaStreams) |
262 | 263 | if isValid(videoStream) and isValid(videoStream.codec) |
263 | | - tryDirectPlay = m.global.user.settings.playbackTryDirectH264ProfileLevel = true and videoStream.codec = "h264" |
264 | | - tryDirectPlay = tryDirectPlay or (m.global.user.settings.playbackTryDirectHevcProfileLevel = true and videoStream.codec = "hevc") |
| 264 | + tryDirectPlay = globalUser.settings.playbackTryDirectH264ProfileLevel = true and videoStream.codec = "h264" |
| 265 | + tryDirectPlay = tryDirectPlay or (globalUser.settings.playbackTryDirectHevcProfileLevel = true and videoStream.codec = "hevc") |
265 | 266 | else |
266 | 267 | tryDirectPlay = false |
267 | 268 | end if |
|
0 commit comments