diff --git a/components/ItemGrid/LoadVideoContentTask.bs b/components/ItemGrid/LoadVideoContentTask.bs index 576fcba64..52d192350 100644 --- a/components/ItemGrid/LoadVideoContentTask.bs +++ b/components/ItemGrid/LoadVideoContentTask.bs @@ -115,6 +115,15 @@ sub LoadItems_AddVideoContent(video as object, mediaSourceId as dynamic, audio_s end if end if + if isValid(meta.json.extratype) + if LCase(meta.json.extratype) = "trailer" + if isValidAndNotEmpty(meta.json.parentlogoitemid) + logoLookupID = meta.json.parentlogoitemid + video.extraType = "trailer" + end if + end if + end if + logoImageExists = api.items.HeadImageURLByName(logoLookupID, "logo") if logoImageExists video.logoImage = api.items.GetImageURL(logoLookupID, "logo", 0, { "maxHeight": 65, "maxWidth": 300, "quality": "90" }) diff --git a/components/video/VideoPlayerView.bs b/components/video/VideoPlayerView.bs index 4b5d6ccba..e5ede3bc1 100644 --- a/components/video/VideoPlayerView.bs +++ b/components/video/VideoPlayerView.bs @@ -487,8 +487,8 @@ sub onVideoContentLoaded() if isValidAndNotEmpty(videoContent[0].logoImage) m.osd.logoImage = videoContent[0].logoImage - ' Don't show both the logo and the video title if this isn't an episode - if m.top.content.contenttype <> 4 + ' Don't show both the logo and the video title if this isn't an episode or trailer + if m.top.content.contenttype <> 4 and videoContent[0].extraType <> "trailer" m.osd.itemTitleText = string.EMPTY end if end if diff --git a/source/static/whatsNew/1.0.6.json b/source/static/whatsNew/1.0.6.json index 21b64afb5..a1c7f32c3 100644 --- a/source/static/whatsNew/1.0.6.json +++ b/source/static/whatsNew/1.0.6.json @@ -14,5 +14,9 @@ { "description": "Fix episode list vVideo codec display when video is not media stream 0", "author": "1hitsong" + }, + { + "description": "Use movie logo in OSD when playing trailer", + "author": "1hitsong" } ] \ No newline at end of file