.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 414ff1415ab847289007429edca7b10750dd673a..6df3d85cdbe6a7392fbe3ad3125ddec19eee7413 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,17 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change beforePath="$PROJECT_DIR$/.idea/sqldialects.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/sqldialects.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/freebox.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/ical.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/klarstein.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/kodi.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/lib.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/lib.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/omxplay.php" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/music.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/music.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/scripts/lib/scenes.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/scenes.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/switchbot.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/tmdb.php" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/squeezebox.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/squeezebox.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -1372,7 +1365,7 @@
       <workItem from="1772370387714" duration="7090000" />
       <workItem from="1773390371781" duration="506000" />
       <workItem from="1774028822942" duration="792000" />
-      <workItem from="1774430967346" duration="2946000" />
+      <workItem from="1774430967346" duration="3270000" />
     </task>
     <task id="LOCAL-00502" summary=".">
       <created>1641726946298</created>
@@ -1717,7 +1710,7 @@
       <option name="project" value="LOCAL" />
       <updated>1687259667913</updated>
     </task>
-    <option name="localTasksCounter" value="633" />
+    <option name="localTasksCounter" value="634" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/config/music.php b/config/music.php
index 52d40f7b684196829dbcc285a1e5eddf34ea8358..27c1de2a07da43164f721f4cacf3479cff25f271 100644 (file)
--- a/config/music.php
+++ b/config/music.php
@@ -110,22 +110,11 @@ function audioElement($subitem, $app = 'favorites')
 $shortcuts['music'] = [
     ['type' => 'volume', 'volume' => config('VOLUME_STEP'), 'increase' => '+', 'label' => '<i class="fa fa-volume-up"></i>'],
     ['type' => 'volume', 'volume' => config('VOLUME_STEP'), 'increase' => '-', 'label' => '<i class="fa fa-volume-down"></i>'],
-    ['type' => 'sub', 'label' => 'Synchro', 'sub' => 'synchro'],
     ['type' => 'sub', 'label' => 'Radios', 'sub' => 'radio'],
     ['type' => 'sub', 'label' => 'Musique', 'sub' => 'playlists'],
     ['type' => 'sub', 'label' => 'Ambiance', 'sub' => 'ambiance'],
 ];
 
-$shortcuts['sub-synchro'] = [
-    ['type' => 'back', 'label' => 'Synchro'],
-    ['type' => 'light', 'scene' => 'home/music/synchro/soiree', 'label' => 'Soirée'],
-    ['type' => 'light', 'scene' => 'home/music/synchro/salon-cuisine', 'label' => 'Salon Cuisine'],
-    ['type' => 'light', 'scene' => 'home/music/synchro/chambre-sdb', 'label' => 'Chambre SDB'],
-    ['type' => 'light', 'scene' => 'home/music/synchro/all', 'label' => 'Tout'],
-    ['type' => 'light', 'scene' => 'home/music/synchro/bureau-wc', 'label' => 'Bureau WC'],
-    ['type' => 'light', 'scene' => 'home/music/synchro/off', 'label' => 'Off'],
-];
-
 if ($podcasts !== false) {
     $shortcuts['music'][] = ['type' => 'sub', 'label' => 'Podcasts', 'sub' => 'podcasts'];
 }
\ No newline at end of file

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 20425462c0b6cb20e3b058efbce169cec4b2f085..3d26a4505c8da6cbe40b16b9e2b818e515924333 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -290,24 +290,6 @@ $scenes = [
         ['type' => 'ecomode', 'mode' => '1'],
         ['type' => 'scene', 'scene' => 'sdb/hotwater/auto'],
     ],
-    'home/music/synchro/soiree' => [
-        ['type' => 'function', 'function' => 'syncMusic', 'args' => [['Salon', 'Cuisine', 'Bureau', 'WC']]],
-    ],
-    'home/music/synchro/salon-cuisine' => [
-        ['type' => 'function', 'function' => 'syncMusic', 'args' => [['Salon', 'Cuisine']]],
-    ],
-    'home/music/synchro/all' => [
-        ['type' => 'function', 'function' => 'syncMusic', 'args' => [['Salon', 'Cuisine', 'Bureau', 'WC', 'Chambre', 'SDB']]],
-    ],
-    'home/music/synchro/chambre-sdb' => [
-        ['type' => 'function', 'function' => 'syncMusic', 'args' => [['Chambre', 'SDB']]],
-    ],
-    'home/music/synchro/bureau-wc' => [
-        ['type' => 'function', 'function' => 'syncMusic', 'args' => [['Bureau', 'WC']]],
-    ],
-    'home/music/synchro/off' => [
-        ['type' => 'function', 'function' => 'stopAllSqueezebox'],
-    ],
     'salon/projector/on' => [
         ['type' => 'function', 'function' => 'epson', 'args' => [true, true]],
     ],

diff --git a/scripts/lib/squeezebox.php b/scripts/lib/squeezebox.php
index 21c782efd3fa7a3af0993353d81db3bfbe34fe40..f2e646406570bf800a5b8ad9e544ab9b4825995d 100644 (file)
--- a/scripts/lib/squeezebox.php
+++ b/scripts/lib/squeezebox.php
@@ -267,56 +267,7 @@ function isMacAddress($mac)
     return (preg_match('/([a-fA-F0-9]{2}[:|\-]?){6}/', $mac) == 1);
 }
 
-function synchroSoiree()
-{
-    syncMusic(['Salon', 'WC', 'Chambre', 'Bureau', 'Cuisine']);
-}
-
-
-function syncMusic($players)
-{
-    global $squeezeboxPlayers;
-    $first = true;
-
-    foreach ($players as $player) {
-        $player = _player($player);
-        if ($player === $squeezeboxPlayers['WC']) {
-
-        }
-        squeezePlayerOn($player);
-        if ($first) {
-            $firstPlayer = $player;
-            $first = false;
-            continue;
-        }
-        squeezeRequest('sync ' . $player, $firstPlayer);
-        squeezeRequest('power 1', $player);
-        squeezeAddSynced($player);
-    }
-    squeezeRequest('play', $firstPlayer);
-}
 
-function squeezeAddSynced($player)
-{
-    $player = _player($player);
-    $synced = getState('squeezesynced', []);
-    if (!in_array($player, $synced)) {
-        $synced[] = $player;
-    }
-    setState('squeezesynced', $synced);
-}
-
-function squeezeEmptySynced()
-{
-    setState('squeezesynced', []);
-}
-
-function isSynced($player)
-{
-    $player = _player($player);
-    $synced = getState('squeezesynced', []);
-    return in_array($player, $synced);
-}
 
 function getSqueezeFavorites($root = 0, $app = 'favorites', $level = 0)
 {