From 63a4b4a0d299f732742fe8db38c17db009254e13 Mon Sep 17 00:00:00 2001 From: Vincent Date: Tue, 3 Nov 2020 10:45:46 +0100 Subject: [PATCH] . --- .idea/workspace.xml | 38 +++++++++++++++++++------------ config/media.php | 2 +- scripts/cron/cron.php | 7 +++--- scripts/domoticz_device_event.php | 4 ++-- scripts/ecomode.php | 4 ++-- scripts/lib/harmony.php | 4 ++-- scripts/lib/mediarasp.php | 2 +- scripts/lib/scenes.php | 4 ++-- scripts/lib/shield.php | 6 ++--- scripts/lib/squeezebox.php | 4 ++-- scripts/pcgames.php | 2 +- scripts/share.php | 2 +- scripts/squeeze.php | 2 +- 13 files changed, 44 insertions(+), 37 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 7628581..976b62d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,10 +3,18 @@ - + + - + + + + + + + + @@ -1294,12 +1302,12 @@ - + - + @@ -1321,11 +1329,11 @@ - + - + diff --git a/config/media.php b/config/media.php index e9381ea..476cc22 100644 --- a/config/media.php +++ b/config/media.php @@ -11,7 +11,7 @@ if ($device == 'salon') { $shortcuts['media'][] = array('type' => 'netflix', 'url' => 'scripts/netflix.php?id=home', 'label' => ''); } if ($device == 'salon' || $device == 'bureau') { - $shortcuts['media'][] = ['label' => 'Nintendo Switch', 'type' => 'harmonyactivity', 'activity' => 'nintendo-switch']; + $shortcuts['media'][] = ['label' => 'Nintendo Switch', 'type' => 'harmonyactivity', 'activity' => 'tv']; $shortcuts['media'][] = ['label' => 'Jeux PC', 'type' => 'ajax', 'url' => '/scripts/pcgames.php']; $shortcuts['media'][] = ['label' => 'Vidéo web', 'type' => 'raspberrycast']; } diff --git a/scripts/cron/cron.php b/scripts/cron/cron.php index 5ca5e3a..06865ff 100644 --- a/scripts/cron/cron.php +++ b/scripts/cron/cron.php @@ -352,12 +352,11 @@ function cronHarmony($cronmin) } if ($currentActivity == 'tv') { - setPlaying('freebox', 'salon'); - } else if ($currentActivity == 'musique-radio') { + setPlaying('mycanal', 'salon'); + } else if ($currentActivity == 'musique') { setPlaying('squeezebox', 'salon'); } else if ($currentActivity == 'poweroff' || $currentActivity == 'off') { - setPlaying('freebox', 'salon'); - } else if ($currentActivity == 'media') { + setPlaying('mycanal', 'salon'); } } diff --git a/scripts/domoticz_device_event.php b/scripts/domoticz_device_event.php index 025e5bb..a7209f7 100644 --- a/scripts/domoticz_device_event.php +++ b/scripts/domoticz_device_event.php @@ -33,7 +33,7 @@ if ($_GET['device'] == 480) { off('salon'); break; case 'Move': - if (getCurrentHarmonyActivity() != 'musique-radio') { + if (getCurrentHarmonyActivity() != 'musique') { _remoteCmd('pause', 'salon'); } break; @@ -46,7 +46,7 @@ if ($_GET['device'] == 480) { case 'Tap': if (getCurrentHarmonyActivity() == 'poweroff') { squeezePlayByName('FIP', $squeezeboxPlayers['Salon']); - } else if (getCurrentHarmonyActivity() == 'musique-radio') { + } else if (getCurrentHarmonyActivity() == 'musique') { stopHarmony(); } break; diff --git a/scripts/ecomode.php b/scripts/ecomode.php index 27adc5d..0dfb7c7 100644 --- a/scripts/ecomode.php +++ b/scripts/ecomode.php @@ -1,11 +1,11 @@ 0) { sleep($wait); } - if ($activity == 'tv' || $activity == 'media' || $activity == 'shield') { + if ($activity == 'tv' ) { runAtEnd('sleep(5);harmonyDeviceCommand(\'videoprojecteur-epson\', \'power-on\');'); } return $res; diff --git a/scripts/lib/mediarasp.php b/scripts/lib/mediarasp.php index 1150ef8..b816261 100644 --- a/scripts/lib/mediarasp.php +++ b/scripts/lib/mediarasp.php @@ -320,7 +320,7 @@ function mediaRaspCommons($device) global $squeezeboxPlayers; if ($device == 'salon') { stopSqueezebox('Salon'); - harmonyActivity('media'); + harmonyActivity('tv'); } else if ($device == 'bureau') { execScene('bureau/media/play'); stopSqueezebox($squeezeboxPlayers['Bureau']); diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php index e2453ba..7b1a97a 100644 --- a/scripts/lib/scenes.php +++ b/scripts/lib/scenes.php @@ -378,7 +378,7 @@ $scenes = [ ['type' => 'function', 'function' => 'chemineeOff', 'args' => ['salon']], ], 'salon/media/play' => [ - ['type' => 'function', 'function' => 'harmonyActivity', 'args' => ['media']], + ['type' => 'function', 'function' => 'harmonyActivity', 'args' => ['tv']], ], 'salon/fan/on' => [ ['type' => 'domoticz', 'device' => '478', 'command' => true], @@ -572,7 +572,7 @@ $scenes = [ ['type' => 'hue', 'group' => 17, 'scene' => ['on' => false, 'brightness' => 0, 'effect' => 'none']], ], 'sdb/radio/sync/salon' => [ - ['type' => 'function', 'function' => 'harmonyActivity', 'args' => ["musique-radio"]], + ['type' => 'function', 'function' => 'harmonyActivity', 'args' => ["musique"]], ['type' => 'function', 'function' => 'squeezeRequest', 'args' => ['sync ' . $squeezeboxPlayers['Salon'], $squeezeboxPlayers['Salle de bains']], 'wait' => 1], ['type' => 'function', 'function' => 'squeezeRequest', 'args' => ['power 1', $squeezeboxPlayers['Salon']]], ['type' => 'function', 'function' => 'squeezeRequest', 'args' => ['play', $squeezeboxPlayers['Salon']]] diff --git a/scripts/lib/shield.php b/scripts/lib/shield.php index 3f43945..0f22b85 100644 --- a/scripts/lib/shield.php +++ b/scripts/lib/shield.php @@ -84,7 +84,7 @@ function shieldNetflix($id = null, $device = null) $device=getDevice($device); if($device==='salon'){ - harmonyActivity('shield'); + harmonyActivity('tv'); } $url = 'http://www.netflix.com/'; @@ -160,7 +160,7 @@ function shieldMyCanal($channel = false, $type = 'live', $device = null) } $device=getDevice($device); if($device==='salon'){ - harmonyActivity('shield'); + harmonyActivity('tv'); } setPlaying('mycanal', $device); _adb('shell am start', '-a android.intent.action.VIEW -f 0x10808000 -d ' . $url . ' com.canal.android.canal/com.canal.app.common.legacy.DeepLinkActivity'); @@ -171,7 +171,7 @@ function shieldKodi($file,$device=null) shieldHome(); $device=getDevice($device); if($device==='salon'){ - harmonyActivity('shield'); + harmonyActivity('tv'); } _adb('shell am start', '-a android.intent.action.VIEW -d \'"' . shieldNormalizeURL($file) . '"\' -n org.xbmc.kodi/.Splash'); } diff --git a/scripts/lib/squeezebox.php b/scripts/lib/squeezebox.php index 81a6561..f066659 100644 --- a/scripts/lib/squeezebox.php +++ b/scripts/lib/squeezebox.php @@ -92,7 +92,7 @@ function squeezePlayByName($musicName, $player, $volume = null, $playIfSync = tr } if ($player == $squeezeboxPlayers['Salon']) { - harmonyActivity('musique-radio'); + harmonyActivity('musique'); } if ($player == $squeezeboxPlayers['Salle de bains']) { execScene('sdb/ampli/on'); @@ -152,7 +152,7 @@ function isMacAddress($mac) function synchroSoiree() { - harmonyActivity('musique-radio'); + harmonyActivity('musique'); $devices = ['WC', 'Chambre', 'Bureau', 'Cuisine']; $salon = _player('Salon'); diff --git a/scripts/pcgames.php b/scripts/pcgames.php index 856df2c..bc2418e 100644 --- a/scripts/pcgames.php +++ b/scripts/pcgames.php @@ -2,7 +2,7 @@ require_once "import.php"; if (config('DEVICE') == 'salon') { - harmonyActivity('media'); + harmonyActivity('tv'); } sshCommand('killall fbi', null, false, true); diff --git a/scripts/share.php b/scripts/share.php index 2ad2b08..df77d88 100644 --- a/scripts/share.php +++ b/scripts/share.php @@ -13,7 +13,7 @@ function shareIntent($content, $device = null) $u = parse_url($content); if ($u['host'] == 'open.spotify.com') { if ($device == 'salon') { - harmonyActivity('musique-radio'); + harmonyActivity('musique'); } $p = explode('/', trim($u['path'], '/')); $spotify = 'spotify:' . implode(':', $p); diff --git a/scripts/squeeze.php b/scripts/squeeze.php index 5629c10..5341b25 100644 --- a/scripts/squeeze.php +++ b/scripts/squeeze.php @@ -8,7 +8,7 @@ if (isset($_GET['requests'])) { if (!in_array('stop', $requests) || isset($_GET['name'])) { if ($_GET['player'] == 'Salon') { - print_r(harmonyActivity("musique-radio")); + print_r(harmonyActivity("musique")); } elseif ($_GET['player'] == 'Salle de bains') { execScene('sdb/ampli/on'); } -- 2.39.5