Merge pull request #2027 from jellyfin/2.2.z

Makefile

@@ -3,7 +3,7 @@
 # If you want to get_images, you'll also need convert from ImageMagick
 ##########################################################################
 
-VERSION := 2.2.1
+VERSION := 2.2.2
 
 ## usage
 

components/ItemGrid/ItemGrid.bs

@@ -302,7 +302,7 @@ sub setTvShowsOptions(options)
         { "Title": tr("TITLE"), "Name": "SortName" },
         { "Title": tr("IMDB_RATING"), "Name": "CommunityRating" },
         { "Title": tr("DATE_ADDED"), "Name": "DateCreated" },
-        { "Title": tr("DATE_PLAYED"), "Name": "DatePlayed" },
+        { "Title": tr("DATE_PLAYED"), "Name": "SeriesDatePlayed" },
         { "Title": tr("OFFICIAL_RATING"), "Name": "OfficialRating" },
         { "Title": tr("RELEASE_DATE"), "Name": "PremiereDate" },
         { "Title": tr("Random"), "Name": "Random" },

components/video/VideoPlayerView.bs

@@ -9,6 +9,7 @@ sub init()
     m.top.getScene().findNode("overhang").visible = false
     userSettings = m.global.session.user.settings
     m.currentItem = m.global.queueManager.callFunc("getCurrentItem")
+    m.originalClosedCaptionState = invalid
 
     m.top.id = m.currentItem.id
     m.top.seekMode = "accurate"
@@ -461,7 +462,12 @@ sub onVideoContentLoaded()
         availableSubtitleTrackIndex = availSubtitleTrackIdx(selectedSubtitle.Track.TrackName)
         if availableSubtitleTrackIndex <> -1
             if not selectedSubtitle.IsEncoded
-                m.top.globalCaptionMode = "On"
+                if selectedSubtitle.IsForced
+                    ' If IsForced, make sure to remember the Roku global setting so we
+                    ' can set it back when the video is done playing.
+                    m.originalClosedCaptionState = m.top.globalCaptionMode
+                    m.top.globalCaptionMode = "On"
+                end if
                 m.top.subtitleTrack = m.top.availableSubtitleTracks[availableSubtitleTrackIndex].TrackName
             end if
         end if
@@ -697,6 +703,12 @@ sub ReportPlayback(state = "update" as string)
         m.bufferCheckTimer.duration = 30
     end if
 
+    if (state = "stop" or state = "finished") and m.originalClosedCaptionState <> invalid
+        m.log.debug("ReportPlayback() setting", m.top.globalCaptionMode, "back to", m.originalClosedCaptionState)
+        m.top.globalCaptionMode = m.originalClosedCaptionState
+        m.originalClosedCaptionState = invalid
+    end if
+
     ' Report playstate via worker task
     playstateTask = m.global.playstateTask
     playstateTask.setFields({ status: state, params: params })

manifest

@@ -3,7 +3,7 @@
 title=Jellyfin
 major_version=2
 minor_version=2
-build_version=1
+build_version=2
 
 ### Main Menu Icons / Channel Poster Artwork
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "jellyfin-roku",
   "type": "module",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "Roku app for Jellyfin media server",
   "dependencies": {
     "@rokucommunity/bslib": "0.1.1",