.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 318a3e1ceae3cd30f3dad222153bc1a9d4c0e6a6..90f04ed987163268a5dd341bf2cc72b1bfe2f61a 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/squeezebox.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/squeezebox.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/global.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/global.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/lib.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/lib.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -1055,14 +1056,7 @@
       <workItem from="1640268793915" duration="1273000" />
       <workItem from="1640350194276" duration="1281000" />
       <workItem from="1640525538886" duration="429000" />
-      <workItem from="1640605282180" duration="113000" />
-    </task>
-    <task id="LOCAL-00449" summary=".">
-      <created>1612793716184</created>
-      <option name="number" value="00449" />
-      <option name="presentableId" value="LOCAL-00449" />
-      <option name="project" value="LOCAL" />
-      <updated>1612793716185</updated>
+      <workItem from="1640605282180" duration="3527000" />
     </task>
     <task id="LOCAL-00450" summary=".">
       <created>1612986006478</created>
@@ -1400,7 +1394,14 @@
       <option name="project" value="LOCAL" />
       <updated>1640525937690</updated>
     </task>
-    <option name="localTasksCounter" value="498" />
+    <task id="LOCAL-00498" summary=".">
+      <created>1640605498962</created>
+      <option name="number" value="00498" />
+      <option name="presentableId" value="LOCAL-00498" />
+      <option name="project" value="LOCAL" />
+      <updated>1640605498962</updated>
+    </task>
+    <option name="localTasksCounter" value="499" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/config/global.php b/config/global.php
index 5346bdec20efa6efcb0b35ac811b05ca45055ddc..fa7de0da8f9250c0488ba20df27f938a9a65d5cc 100644 (file)
--- a/config/global.php
+++ b/config/global.php
@@ -33,7 +33,8 @@ $squeezeboxPlayers = array(
     //'WC' => '00:04:20:2a:05:2e',
     //'WC' => 'b8:27:eb:78:f6:88',
     // 'WC' => 'a6:ce:85:78:33:a4',
-    'Cuisine' => 'b8:27:eb:ec:71:34',
+    //'Cuisine' => 'b8:27:eb:ec:71:34',
+    'Cuisine' => '00:04:20:2a:05:2e',
     'Lit Jérôme' => 'b8:27:eb:62:d3:ce',
     'Lit Vincent' => 'b8:27:eb:40:0e:e9',
     'WC' => 'b8:27:eb:f6:1d:30',

diff --git a/scripts/lib/lib.php b/scripts/lib/lib.php
index a529cbd80070e35fec5d1ffac86f1da3d724ce72..3fc781075c3049b6113d941b9c6342b9a4f3e1de 100644 (file)
--- a/scripts/lib/lib.php
+++ b/scripts/lib/lib.php
@@ -478,6 +478,7 @@ function volume($volume, $increase = '', $device = null)
             $cmd = 'amixer -c 0 -M -- sset PCM playback ' . round(max(0, min(100, $volume))) . '%' . $increase;
             return sshCommand($cmd, $device);
         case 'squeezeboplayer':
+        case 'squeezeboxplayer':
         case 'squeezebox':
             return squeezeVolume($volume, $increase, config('SQUEEZEBOX_PLAYER'));
         case 'harmony':