.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 62ad3759e93cccd87d5173687474f7df255c2395..0055270c71b48797da906aacc6cfda297fbe958e 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +3,7 @@
   <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$/config/bureau.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/bureau.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/bureausun.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/bureausun.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/mediarasp.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/mediarasp.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -837,14 +836,8 @@
       <workItem from="1592379506437" duration="1336000" />
       <workItem from="1592546736447" duration="1681000" />
       <workItem from="1593068187054" duration="1636000" />
-      <workItem from="1593180432819" duration="583000" />
-    </task>
-    <task id="LOCAL-00280" summary=".">
-      <created>1579775430862</created>
-      <option name="number" value="00280" />
-      <option name="presentableId" value="LOCAL-00280" />
-      <option name="project" value="LOCAL" />
-      <updated>1579775430862</updated>
+      <workItem from="1593180432819" duration="646000" />
+      <workItem from="1593196376687" duration="1472000" />
     </task>
     <task id="LOCAL-00281" summary=".">
       <created>1579858821017</created>
@@ -1182,7 +1175,14 @@
       <option name="project" value="LOCAL" />
       <updated>1593086276651</updated>
     </task>
-    <option name="localTasksCounter" value="329" />
+    <task id="LOCAL-00329" summary=".">
+      <created>1593181059848</created>
+      <option name="number" value="00329" />
+      <option name="presentableId" value="LOCAL-00329" />
+      <option name="project" value="LOCAL" />
+      <updated>1593181059849</updated>
+    </task>
+    <option name="localTasksCounter" value="330" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1236,11 +1236,11 @@
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="960" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1585852940968" />
-    <state x="701" y="75" width="1170" height="972" key="CommitChangelistDialog2" timestamp="1593086272091">
-      <screen x="0" y="0" width="1920" height="1160" />
+    <state x="935" y="114" width="1170" height="972" key="CommitChangelistDialog2" timestamp="1593181051405">
+      <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="701" y="75" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1593086272091" />
-    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1592548742823" />
+    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1593181051405" />
     <state x="1060" y="275" key="FileChooserDialogImpl" timestamp="1590912263817">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
@@ -1262,10 +1262,10 @@
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="1456" y="240" key="com.intellij.ide.util.TipDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1586418523328" />
-    <state x="977" y="257" width="607" height="536" key="find.popup" timestamp="1593068905381">
+    <state x="977" y="257" width="607" height="536" key="find.popup" timestamp="1593196601394">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
-    <state x="977" y="257" width="607" height="536" key="find.popup/0.0.2560.1040@0.0.2560.1040" timestamp="1593068905381" />
+    <state x="977" y="257" width="607" height="536" key="find.popup/0.0.2560.1040@0.0.2560.1040" timestamp="1593196601394" />
   </component>
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />

diff --git a/scripts/lib/mediarasp.php b/scripts/lib/mediarasp.php
index e6af88e44692e4fbdacbfc12f1c0716643690864..b8aea7dfd380a2e34471b0c6687e090acd41fcb3 100644 (file)
--- a/scripts/lib/mediarasp.php
+++ b/scripts/lib/mediarasp.php
@@ -317,6 +317,7 @@ function mediaRaspCommons($device)
 {
     global $squeezeboxPlayers;
     if ($device == 'salon') {
+        stopSqueezebox('Salon');
         harmonyActivity('media');
     } else if ($device == 'bureau') {
         execScene('bureau/media/play');

diff --git a/scripts/lib/squeezebox.php b/scripts/lib/squeezebox.php
index 155cc70dfbe0ace24afddc7cb1d6ab7f09dc4d35..bc1e36c82015d496cb6e2cf7ff0d4a740e9296ea 100644 (file)
--- a/scripts/lib/squeezebox.php
+++ b/scripts/lib/squeezebox.php
@@ -222,7 +222,7 @@ function checkSpottyLogin($force = false)
 
     $accounts = [
         //SQUEEZEBOX_SPOTIFY_USERNAME => SQUEEZEBOX_SPOTIFY_PASSWORD,
-        'v12l' => 'Lr8ka&7cs@fc%lW7',
+        'v12l' => 'UZfARnm9oFcoz%fZDg',
         'jrme75009' => 'tortuga5009',
     ];