]> _ Git - tortuga-home.git/commitdiff
projects / tortuga-home.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 71829c9)
.
authorVincent <vincent@enhydra.fr>
Fri, 24 Jan 2020 09:40:06 +0000 (10:40 +0100)
committerVincent <vincent@enhydra.fr>
Fri, 24 Jan 2020 09:40:06 +0000 (10:40 +0100)
.idea/workspace.xml patch | blob | history
config/global.php patch | blob | history
scripts/lib/remoteinfos.php patch | blob | history
scripts/lib/scenes.php patch | blob | history
scripts/lib/squeezebox.php patch | blob | history
scripts/pcgames.php patch | blob | history
scripts/squeeze.php patch | blob | history

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4a4c0f4bc69edb05efd24a4075fc0aabac65797b..ea91c5a6afb065e59279fcdfdba8da83af8fecf7 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,12 @@
   <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/global.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/global.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/remoteinfos.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/remoteinfos.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/squeezebox.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/squeezebox.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/pcgames.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/pcgames.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/squeeze.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/squeeze.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -787,14 +792,8 @@
       <workItem from="1579161178878" duration="2992000" />
       <workItem from="1579457368919" duration="5928000" />
       <workItem from="1579773474654" duration="57000" />
-      <workItem from="1579773545061" duration="601000" />
-    </task>
-    <task id="LOCAL-00231" summary=".">
-      <created>1568792710779</created>
-      <option name="number" value="00231" />
-      <option name="presentableId" value="LOCAL-00231" />
-      <option name="project" value="LOCAL" />
-      <updated>1568792710779</updated>
+      <workItem from="1579773545061" duration="651000" />
+      <workItem from="1579853532996" duration="4039000" />
     </task>
     <task id="LOCAL-00232" summary=".">
       <created>1568881166470</created>
@@ -1132,7 +1131,14 @@
       <option name="project" value="LOCAL" />
       <updated>1579628617831</updated>
     </task>
-    <option name="localTasksCounter" value="280" />
+    <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>
+    </task>
+    <option name="localTasksCounter" value="281" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1184,12 +1190,12 @@
     </state>
     <state x="720" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1577298128269" />
     <state x="960" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1579773503974" />
-    <state x="935" y="114" key="CommitChangelistDialog2" timestamp="1579628605830">
+    <state x="935" y="114" key="CommitChangelistDialog2" timestamp="1579775420826">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="701" y="114" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1577381105204" />
     <state x="701" y="127" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1575647157027" />
-    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1579628605830" />
+    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1579775420826" />
     <state x="1114" y="443" key="NewPhpFileDialog" timestamp="1578038647334">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
@@ -1199,17 +1205,17 @@
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="872" y="242" key="Vcs.Push.Dialog.v2/0.0.2560.1040@0.0.2560.1040" timestamp="1578558711439" />
-    <state x="976" y="343" key="com.intellij.ide.util.TipDialog" timestamp="1579773544720">
+    <state x="976" y="343" key="com.intellij.ide.util.TipDialog" timestamp="1579853534008">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="732" y="343" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1577380394903" />
     <state x="732" y="383" key="com.intellij.ide.util.TipDialog/0.0.1920.1160@0.0.1920.1160" timestamp="1575647093028" />
-    <state x="976" y="343" key="com.intellij.ide.util.TipDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1579773544720" />
-    <state x="976" y="257" width="607" height="536" key="find.popup" timestamp="1579506279995">
+    <state x="976" y="343" key="com.intellij.ide.util.TipDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1579853534008" />
+    <state x="977" y="257" width="607" height="536" key="find.popup" timestamp="1579857029996">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="732" y="257" width="607" height="536" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1577380471547" />
-    <state x="976" y="257" width="607" height="536" key="find.popup/0.0.2560.1040@0.0.2560.1040" timestamp="1579506279995" />
+    <state x="977" y="257" width="607" height="536" key="find.popup/0.0.2560.1040@0.0.2560.1040" timestamp="1579857029996" />
     <state x="936" y="240" key="run.anything.popup" timestamp="1578386519646">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
diff --git a/config/global.php b/config/global.php
index fef2bc283495abdab29b1ac95d48cb7bbcef5e64..5c7ec3898310569dc243f83a03cd0f20db930e4f 100644 (file)
--- a/config/global.php
+++ b/config/global.php
@@ -54,7 +54,7 @@ $directories = array('Séries TV' => array('dir' => 'Series', 'context' => 'tvsh
     'X' => array('dir' => 'Z/X', 'context' => 'movie', 'id' => 'x')
 );
 
-$videoExt = ['mkv', 'mp4', 'avi', 'ogv', 'ts', 'm2ts', 'mpg', 'm4v', 'flv', 'f4v', 'mov', 'mpg', 'mpeg'];
+$videoExt = ['mkv', 'mp4', 'avi', 'ogv', 'ts', 'm2ts', 'mpg', 'm4v', 'flv', 'f4v', 'mov', 'mpg', 'mpeg','divx'];
 
 profile('Set globals', __FILE__, __LINE__);
 
diff --git a/scripts/lib/remoteinfos.php b/scripts/lib/remoteinfos.php
index 827d071dbbb2738614ee0259a1a323275b430fd4..70b67fba043ec6adde872ede3da3a43d717a2339 100644 (file)
--- a/scripts/lib/remoteinfos.php
+++ b/scripts/lib/remoteinfos.php
@@ -47,10 +47,12 @@ function mediaraspRemoteInfos()
     $res['time'] = '';
     $res['title'] = '';
     $res['artwork'] = '';
+    $res['status']='';
 
     $d = getDevice();
     $playlist = simplexml_load_string(VLCCmd(['query' => 'requests/playlist.xml'], $d));
-    $status = simplexml_load_string(VLCCmd(['query' => 'requests/status.xml'], $d));
+    $s = (string)VLCCmd(['query' => 'requests/status.xml'], $d);
+    $status = simplexml_load_string($s);
 
     $leaf = $playlist->xpath('//leaf[@current="current"]');
     if (count($leaf) > 0) {
@@ -62,6 +64,7 @@ function mediaraspRemoteInfos()
     $res['can_seek'] = true;
     $res['duration'] = intval((string)$status->xpath('//length')[0]);
     $res['time'] = intval((string)$status->xpath('//time')[0]);
+    $res['status'] = $s;
 
     $playing = getPlaying();
     $e = explode(':', $playing, 3);
diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 2c3207e776ea835abce34d6550ad1ed077cb7291..0eb5ec32cf0907d20930f02fd9845d051035183e 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -420,21 +420,12 @@ $scenes = [
         ['type' => 'function', 'function' => 'sleepPC', 'args' => ['avion']],
     ],
     'bureau/media/play' => [
-        ['type' => 'function', 'function' => 'bureauMediaOn'],
         ['type' => 'scene', 'scene' => 'bureau/screen/down'],
         ['type' => 'scene', 'scene' => 'bureau/rideaux/close'],
         ['type' => 'scene', 'scene' => 'bureau/off'],
         ['type' => 'function', 'function' => 'bureauAuto', 'args' => [false]],
         ['type' => 'ir', 'room' => 'bureau', 'device' => 'Projector', 'command' => 'PowerOn'],
     ],
-    'bureau/media/on' => [
-        ['type' => 'insteon', 'command' => '0?1139=I=0=0'],
-        ['type' => 'domoticz', 'device' => '559', 'command' => true, 'priority' => true],
-    ],
-    'bureau/media/off' => [
-        ['type' => 'insteon', 'command' => '0?1339=I=0=0'],
-        ['type' => 'domoticz', 'device' => '559', 'command' => false, 'priority' => true],
-    ],
     'bureau/screen/down' => [
         ['type' => 'domoticz', 'device' => '1', 'command' => true, 'priority' => true],
     ],
@@ -549,7 +540,6 @@ $scenes = [
         ['type' => 'domoticz', 'device' => '478', 'command' => false, 'priority' => true],
     ],
     'ecomode/basic' => [
-        ['type' => 'scene', 'scene' => 'bureau/media/off'],// Media bureau
         ['type' => 'scene', 'scene' => 'salon/freebox/off'],
         ['type' => 'scene', 'scene' => 'sdb/ampli/off'],
         ['type' => 'scene', 'scene' => 'chambre/raspberry/off'],
@@ -904,12 +894,4 @@ function _wcVMCOff($timeout)
     if (getState('wcTimeout') == $rand) {
         insteonCommand('0?1334=I=0=0');
     }
-}
-
-function bureauMediaOn()
-{
-    execScene('bureau/media/on');
-    if (!isAlive('bureau')) {
-        sleep(60);
-    }
 }
\ No newline at end of file
diff --git a/scripts/lib/squeezebox.php b/scripts/lib/squeezebox.php
index 1f066753bca08807512b34a449607c7da79a4676..4b1932e85f227c3bd8908995bfe9169ad1256c91 100644 (file)
--- a/scripts/lib/squeezebox.php
+++ b/scripts/lib/squeezebox.php
@@ -87,10 +87,6 @@ function squeezePlayByName($musicName, $player, $volume = null, $playIfSync = tr
     if ($player == $squeezeboxPlayers['Salle de bains']) {
         execScene('sdb/ampli/on');
     }
-    if ($player == $squeezeboxPlayers['Bureau']) {
-        bureauMediaOn();
-    }
-
     squeezeRequest('pause', $player);
     if (null !== $volume) {
         if (config('VOLUME_DEVICE') == 'SqueezeboxPlayer') {
diff --git a/scripts/pcgames.php b/scripts/pcgames.php
index 69cf55d3f3a661118f230453327f68d2970286c3..856df2c2efb301a760b79e21e59bf1ef0c34f128 100644 (file)
--- a/scripts/pcgames.php
+++ b/scripts/pcgames.php
@@ -3,8 +3,6 @@ require_once "import.php";
 
 if (config('DEVICE') == 'salon') {
     harmonyActivity('media');
-} else if (config('DEVICE') == 'bureau') {
-    bureauMediaOn();
 }
 
 sshCommand('killall fbi', null, false, true);
diff --git a/scripts/squeeze.php b/scripts/squeeze.php
index a8abfebb06faac2d8c014e83cb6c9332723c85d0..897941e5b44251516ee886e1c20bd8cd8ed66c1e 100644 (file)
--- a/scripts/squeeze.php
+++ b/scripts/squeeze.php
@@ -11,8 +11,6 @@ if (!in_array('stop', $requests) || isset($_GET['name'])) {
         print_r(harmonyActivity("musique-radio"));
     } elseif ($_GET['player'] == 'Salle de bains') {
         execScene('sdb/ampli/on');
-    } else if ($_GET['player'] == 'Bureau') {
-        bureauMediaOn();
     }
     setPlaying('squeezebox');
 } else {
Unnamed repository; edit this file 'description' to name the repository.