From ef929023a115970ef0dc14ce12336f309971df9c Mon Sep 17 00:00:00 2001 From: realcopacetic Date: Thu, 9 May 2024 10:29:57 +0100 Subject: [PATCH] fix for trailer_autoscroll and misc bugs --- 16x9/Custom_1140_Widget_Settings.xml | 2 +- 16x9/Expressions.xml | 2 +- 16x9/Home.xml | 6 +----- 16x9/MyVideoNav.xml | 2 +- 16x9/OnLoadUnload.xml | 2 +- 16x9/Templates_Panels.xml | 5 ++++- 16x9/Timers.xml | 26 +++++++++++++------------- 16x9/Viewtype_501_Billboard.xml | 5 +++-- 16x9/Viewtype_505_Grid.xml | 2 -- README.md | 3 +++ addon.xml | 2 +- 11 files changed, 29 insertions(+), 28 deletions(-) diff --git a/16x9/Custom_1140_Widget_Settings.xml b/16x9/Custom_1140_Widget_Settings.xml index dacb4767..573fc27c 100644 --- a/16x9/Custom_1140_Widget_Settings.xml +++ b/16x9/Custom_1140_Widget_Settings.xml @@ -3,7 +3,7 @@ 3200 - + diff --git a/16x9/Expressions.xml b/16x9/Expressions.xml index 9cf16cda..0ced86b1 100644 --- a/16x9/Expressions.xml +++ b/16x9/Expressions.xml @@ -30,7 +30,7 @@ [$EXP[Background_FadeOut_Exceptions] + Skin.String(Background_Slideshow,Artists)] | Window.Next(music) Window.Previous(addonbrowser) + String.IsEmpty(Window(home).Property(Container_Addons_NonRepo)) - [Window.Previous(skinsettings) + !Window.IsVisible(1140)] | Window.Previous(interfacesettings) | Window.Previous(mediasettings) | Window.Previous(playersettings) | Window.Previous(systemsettings) | Window.Previous(servicesettings) | Window.Previous(gamesettings) | Window.Previous(pvrsettings) | Window.Previous(profiles) | Window.Previous(systeminfo) | Window.Previous(filemanager) + Window.Previous(skinsettings) | Window.Previous(interfacesettings) | Window.Previous(mediasettings) | Window.Previous(playersettings) | Window.Previous(systemsettings) | Window.Previous(servicesettings) | Window.Previous(gamesettings) | Window.Previous(pvrsettings) | Window.Previous(profiles) | Window.Previous(systeminfo) | Window.Previous(filemanager) Window.Previous(home) + Skin.HasSetting(Home_Background_Override_Enabled) + String.IsEmpty(window(home).property(Home_Widget)) Window.Previous(music) + Container.Content(playlists) + Skin.String(Background_Slideshow,Artists) Window.Previous(musicplaylisteditor) + Skin.String(Background_Slideshow,Artists) diff --git a/16x9/Home.xml b/16x9/Home.xml index 61bb9a36..dc168ac0 100644 --- a/16x9/Home.xml +++ b/16x9/Home.xml @@ -2,7 +2,7 @@ RunScript(script.skinshortcuts,type=buildxml&mainmenuID=3000&group=mainmenu|shutdownmenu) - PlayerControl(Stop) + PlayerControl(Stop) ClearProperty(Trailer_Autoplay,home) 4010 $VAR[Dark_Color] @@ -82,9 +82,5 @@ - - right - - \ No newline at end of file diff --git a/16x9/MyVideoNav.xml b/16x9/MyVideoNav.xml index 653feba9..9d94bc95 100644 --- a/16x9/MyVideoNav.xml +++ b/16x9/MyVideoNav.xml @@ -4,7 +4,7 @@ ClearProperty(OptionsMenu,home) ClearProperty(Scrollbars,home) - PlayerControl(Stop) + PlayerControl(Stop) ClearProperty(Trailer_Autoplay,home) 50 3000 diff --git a/16x9/OnLoadUnload.xml b/16x9/OnLoadUnload.xml index 65dfc3a9..520d22f9 100644 --- a/16x9/OnLoadUnload.xml +++ b/16x9/OnLoadUnload.xml @@ -43,7 +43,7 @@ - PlayerControl(Stop) + PlayerControl(Stop) ClearProperty(Trailer_Autoplay,home) SetProperty(SelectedItem,$INFO[ListItem.DBID],movieinformation) SetProperty(SelectedItem,$INFO[ListItem.Property(tmdb_id)],movieinformation) diff --git a/16x9/Templates_Panels.xml b/16x9/Templates_Panels.xml index 8a821efe..4cf6a3ea 100644 --- a/16x9/Templates_Panels.xml +++ b/16x9/Templates_Panels.xml @@ -47,6 +47,9 @@ + + + @@ -58,7 +61,7 @@ - + diff --git a/16x9/Timers.xml b/16x9/Timers.xml index 8fc03119..fe7b91f8 100644 --- a/16x9/Timers.xml +++ b/16x9/Timers.xml @@ -49,7 +49,7 @@ trailer_autoplay_home Window.Is(home) + Skin.HasSetting(Trailer_Autoplay) + !String.IsEmpty(window(home).property(Home_Widget)) + Window.IsVisible(1160) + !Player.HasMedia - String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !Player.HasVideo + !String.IsEmpty(ListItem.Trailer) + String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !Player.HasVideo SetProperty(Trailer_Autoplay,true,home) PlayMedia($ESCINFO[ListItem.Trailer],1,noresume) SetProperty(Trailer_Autoplay,true,home) @@ -71,17 +71,17 @@ widget_spotlight - Control.HasFocus(3201) | Control.HasFocus(3202) | Control.HasFocus(3203) | Control.HasFocus(3204) | Control.HasFocus(3205) | Control.HasFocus(3206) | Control.HasFocus(3207) | Control.HasFocus(3208) | Control.HasFocus(3209) - [[Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight),15) + System.IdleTime(15) + String.IsEmpty(Window(home).Property(Trailer_Autoscroll))] | [Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight),3) + System.IdleTime(3) + String.IsEqual(Window(home).Property(Trailer_Autoscroll),true)]] + !Window.IsVisible(movieinformation) + !Player.HasVideo - ClearProperty(Trailer_Autoplay,home) - Control.Move(3201,1) - Control.Move(3202,1) - Control.Move(3203,1) - Control.Move(3204,1) - Control.Move(3205,1) - Control.Move(3206,1) - Control.Move(3207,1) - Control.Move(3208,1) - Control.Move(3209,1) + [Skin.HasSetting(Widget1_AutoScroll) + Control.HasFocus(3201)] | [Skin.HasSetting(Widget2_AutoScroll) + Control.HasFocus(3202)] | [Skin.HasSetting(Widget3_AutoScroll) + Control.HasFocus(3203)] | [Skin.HasSetting(Widget4_AutoScroll) + Control.HasFocus(3204)] | [Skin.HasSetting(Widget5_AutoScroll) + Control.HasFocus(3205)] | [Skin.HasSetting(Widget6_AutoScroll) + Control.HasFocus(3206)] | [Skin.HasSetting(Widget7_AutoScroll) + Control.HasFocus(3207)] | [Skin.HasSetting(Widget8_AutoScroll) + Control.HasFocus(3208)] | [Skin.HasSetting(Widget9_AutoScroll) + Control.HasFocus(3209)] + Player.HasVideo | Window.IsVisible(movieinformation) | Window.IsVisible(shutdownmenu) | Window.IsVisible(busydialog) + [[!Skin.HasSetting(Widget1_Trailer_Autoplay) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight),8) + System.IdleTime(8)] | [Skin.HasSetting(Widget1_Trailer_Autoplay) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight),2) + System.IdleTime(2) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(trailer_autoplay_home),2)]] + !Window.IsVisible(movieinformation) + !Player.HasVideo + !Window.IsVisible(shutdownmenu) + !Window.IsVisible(busydialog) + ClearProperty(Trailer_Autoplay,home) + Control.Move(3201,1) + Control.Move(3202,1) + Control.Move(3203,1) + Control.Move(3204,1) + Control.Move(3205,1) + Control.Move(3206,1) + Control.Move(3207,1) + Control.Move(3208,1) diff --git a/16x9/Viewtype_501_Billboard.xml b/16x9/Viewtype_501_Billboard.xml index a2d273fa..062b137f 100644 --- a/16x9/Viewtype_501_Billboard.xml +++ b/16x9/Viewtype_501_Billboard.xml @@ -43,11 +43,12 @@ - + + + - Conditional Conditional Conditional diff --git a/16x9/Viewtype_505_Grid.xml b/16x9/Viewtype_505_Grid.xml index bcd0c840..b408a0ad 100644 --- a/16x9/Viewtype_505_Grid.xml +++ b/16x9/Viewtype_505_Grid.xml @@ -36,8 +36,6 @@ 180 1920 900 - PlayerControl(Stop) - ClearProperty(Trailer_Autoplay,home) ClearProperty(Widget_DBID,home) 60 diff --git a/README.md b/README.md index a8c56472..a8ce5b27 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,9 @@ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisc ### Changelog --- +**1.3.6** +- Fix for preventing widgets from auto-playing trailers when auto-scroll also enabled + **1.3.5** - Added visual listitem indicator for Collections (sets) and items with VideoVersions - Added tvchannels window diff --git a/addon.xml b/addon.xml index fad94f36..652a25ba 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - +