.

diff --git a/scripts/lib/mediarasp.php b/scripts/lib/mediarasp.php
index e731d299845a4c4a9f492544f89116048bb3a312..299726d0fd6e043100ad33f6dc240ac75e9427a7 100644 (file)
--- a/scripts/lib/mediarasp.php
+++ b/scripts/lib/mediarasp.php
@@ -147,11 +147,11 @@ function remoteCmdMedia($cmd, $device = null, $playing = null)
         'info' => 'z',
         'direction-left' => 'down',
         'direction-right' => 'up',
-        'subtitles-toggle' => 's',
-        'subtitles-stream-next' => 'm',
-        'subtitles-stream-prev' => 'n',
-        'subtitles-increase-delay' => 'f',
-        'subtitles-decrease-delay' => 'd'];
+        'subtitles-toggle' => 'subtitles-toggle',
+        'subtitles-stream-next' => 'subtitles-stream-next',
+        'subtitles-stream-prev' => 'subtitles-stream-prev',
+        'subtitles-increase-delay' => 'subtitles-increase-delay',
+        'subtitles-decrease-delay' => 'subtitles-decrease-delay'];
 
 
     if ($device == 'bureau') {
@@ -168,7 +168,17 @@ function remoteCmdMedia($cmd, $device = null, $playing = null)
 
 
     if (null === $playing || $playing == 'mediarasp') {
-        if ($key == 'rewind' || $key == 'fast-rewind' || $key == 'forward' || $key == 'fast-forward') {
+        if ($key == 'subtitles-toggle') {
+            sendHotKey('shift+v');
+        } else if ($key == 'subtitles-stream-next') {
+            sendHotKey('v');
+        } else if ($key == 'subtitles-stream-prev') {
+            sendHotKey('alt+v');
+        } else if ($key == 'subtitles-increase-delay') {
+            sendHotKey('h', 10);
+        } else if ($key == 'subtitles-decrease-delay') {
+            sendHotKey('g', 10);
+        } else if ($key == 'rewind' || $key == 'fast-rewind' || $key == 'forward' || $key == 'fast-forward') {
             if ($key == 'rewind' || $key == 'forward') {
                 $amount = 15;
             } else if ($key == 'fast-rewind' || $key == 'fast-forward') {
@@ -205,6 +215,12 @@ function remoteCmdMedia($cmd, $device = null, $playing = null)
     return true;
 }
 
+function sendHotKey($key, $times = 1, $device = null)
+{
+    $keys = str_repeat(' key ' . $key, $times);
+    return sshCommand('DISPLAY=:0 xdotool getactivewindow' . $keys, $device, true, false);
+}
+
 function remoteCmdSalonMusique($cmd)
 {
     switch ($cmd) {
@@ -247,7 +263,6 @@ function mediaRaspPlayMovie($movie, $device = null)
         }
     }
 
-
     try {
         raspberryCast('video', $device, ['control' => 'stop']);
     } catch (Exception $e) {
@@ -427,8 +442,8 @@ function VLCCmd($params, $device = null, $timeout = 5)
     } else {
         $query = 'requests/status.xml';
     }
-    $url='http://' . $d['host'] . ':8754/' . $query;
-   // echo $url.': '.print_r($params,true);
+    $url = 'http://' . $d['host'] . ':8754/' . $query;
+    // echo $url.': '.print_r($params,true);
     $client = getMediaRaspClient();
     try {
         $response = $client->get($url, ['query' => $params, 'timeout' => $timeout, 'auth' => ['', 'atacama']]);

diff --git a/tools/jarvis/commands b/tools/jarvis/commands
index f802ed32ccd054c987096ee7f56c6ca2f9da97c2..3a6165c88461c98513a5141a0676f1df6b71b595 100644 (file)
--- a/tools/jarvis/commands
+++ b/tools/jarvis/commands
@@ -19,5 +19,5 @@ ENCORE*==jv_repeat_last_command
 *SENS*VIE*==say "42"
 *RADIO*SALON*==say "D'accord, je mets FIP" && jv_curl "https://entree.home.tortuga.enhydra.fr/scripts/squeeze.php?player=Salon&name=FIP"
 *INFO*==say "D'accord, j'allume franceinfo: (BFM, j'aime pas trop)" && jv_curl "https://entree.home.tortuga.enhydra.fr/scripts/squeeze.php?player=Salon&name=France%20Info"
-*ALERTE*==say "J'ai envoyé une notification lumineuse dans la maison" && jv_curl "https://entree.home.tortuga.enhydra.fr/scripts/light.php?scene=home/alert&im"
+*ALERT*==say "J'ai envoyé une notification lumineuse dans la maison" && jv_curl "https://entree.home.tortuga.enhydra.fr/scripts/light.php?scene=home/alert&im"
 *REPLAY*==say "Ok, par contre, seul celui d'Arte passe des choses intéressantes. Je dis ça ..." && jv_curl "https://entree.home.tortuga.enhydra.fr/scripts/light.php?scene=home/alert&im"