From 90c6a962ae93a958ffc701d192c18a157d5ea836 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 2 Jan 2024 18:41:13 +0100 Subject: [PATCH] . --- .idea/dataSources.local.xml | 2 +- .../7a96a13f-795b-43c9-b1de-56e65d9fcf95.xml | 2 +- .idea/workspace.xml | 16 ++++++++++++++-- scripts/lib/lib.php | 2 +- scripts/lib/off.php | 2 +- scripts/lib/scenes.php | 2 +- scripts/lib/shield.php | 4 ++-- 7 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml index b5f2ef1..a9a7d7e 100644 --- a/.idea/dataSources.local.xml +++ b/.idea/dataSources.local.xml @@ -1,6 +1,6 @@ - + " diff --git a/.idea/dataSources/7a96a13f-795b-43c9-b1de-56e65d9fcf95.xml b/.idea/dataSources/7a96a13f-795b-43c9-b1de-56e65d9fcf95.xml index 43b3454..2b169be 100644 --- a/.idea/dataSources/7a96a13f-795b-43c9-b1de-56e65d9fcf95.xml +++ b/.idea/dataSources/7a96a13f-795b-43c9-b1de-56e65d9fcf95.xml @@ -1,6 +1,6 @@ - + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a021ecf..ba78ca5 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,8 +5,13 @@ + + + + + diff --git a/scripts/lib/lib.php b/scripts/lib/lib.php index fd94442..ed4f5a0 100644 --- a/scripts/lib/lib.php +++ b/scripts/lib/lib.php @@ -651,5 +651,5 @@ function gloria() return false; } $h = intval(date('H')); - return $h >= 12 && $h <= 17; + return $h >= 12 && $h <= 16; } diff --git a/scripts/lib/off.php b/scripts/lib/off.php index 029359f..e3f1f2c 100644 --- a/scripts/lib/off.php +++ b/scripts/lib/off.php @@ -39,8 +39,8 @@ function offSalon() function offBureau() { - stopHarmony(); execScene('bureau/media/stop'); + stopHarmony(); shieldKillAll('bureau'); shieldSleep('bureau'); } diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php index fa410e7..5e444bc 100644 --- a/scripts/lib/scenes.php +++ b/scripts/lib/scenes.php @@ -996,7 +996,7 @@ function wcMusic($volume) $d = date('w'); if ($d == 4) { $music = 'New Morning'; - } else if ($d == 3) { + } else if ($d == 2) { $music = 'Radio Michel'; } else if ($d == 5) { $music = 'Samba'; diff --git a/scripts/lib/shield.php b/scripts/lib/shield.php index 20f48aa..63dfc8f 100644 --- a/scripts/lib/shield.php +++ b/scripts/lib/shield.php @@ -50,10 +50,10 @@ function shieldRunActivity($device = null, $force = false) if ($onlySound) { harmonyActivity(HARMONY_MUSIQUE); } else { - harmonyActivity(HARMONY_TV); if (getState('bureauPlaying', '0') === '0') { execScene('bureau/media/play'); } + harmonyActivity(HARMONY_TV); } } } @@ -320,7 +320,7 @@ function shieldGetApps() function shieldPlayingVideo($device = null) { - $videoApps = ['kodi', 'vlc', 'mycanal', 'amazonprime', 'netflix', 'arte', 'francetv', 'gamecast', 'twitch', 'youtube', 'dailymotion', 'vimeo', 'steamlink']; + $videoApps = ['kodi', 'vlc', 'mycanal', 'amazonprime', 'netflix', 'arte', 'francetv', 'gamecast', 'twitch', 'youtube', 'dailymotion', 'vimeo', 'steamlink', 'plex']; return in_array(shieldGetCurrentApp($device), $videoApps); } -- 2.39.5