.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a83b2bda93a346befff97cbaf8ae23014e0c7540..70c131019e2e443024b9f801a97d1a80626f48d4 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,9 +6,15 @@
   <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/music.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/music.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/cron/cron.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/cron/cron.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$/config/bureau.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/bureau.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/lit.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/lit.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/remote.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/remote.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/sdb.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/sdb.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/js/home.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/home.js" afterDir="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/remoteinfos.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/remoteinfos.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/mediarasp.php" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/style/remote.less" beforeDir="false" afterPath="$PROJECT_DIR$/style/remote.less" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -1365,7 +1371,7 @@
       <workItem from="1772370387714" duration="7090000" />
       <workItem from="1773390371781" duration="506000" />
       <workItem from="1774028822942" duration="792000" />
-      <workItem from="1774430967346" duration="5227000" />
+      <workItem from="1774430967346" duration="6009000" />
     </task>
     <task id="LOCAL-00502" summary=".">
       <created>1641726946298</created>
@@ -1710,7 +1716,7 @@
       <option name="project" value="LOCAL" />
       <updated>1687259667913</updated>
     </task>
-    <option name="localTasksCounter" value="639" />
+    <option name="localTasksCounter" value="640" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/config/bureau.php b/config/bureau.php
index 93e88fc6ee19fb70f9ecbd76309b524cffa4d2a2..af6c292bcc0748da301cb984675c0d51c5b0b13f 100644 (file)
--- a/config/bureau.php
+++ b/config/bureau.php
@@ -2,7 +2,6 @@
 config('ROOM_NAME', 'Bureau');
 config('ROOM', 'bureau');
 config('SQUEEZEBOX_PLAYER', 'Bureau');
-config('VIDEOPLAYER', 'mediarasp');
 config('VOLUME_DEVICE', 'harmony');
 config('VOLUME_STEP', 3);
 config('SLEEPTYPE', 'screensaver');

diff --git a/config/lit.php b/config/lit.php
index 0ba1cd40c2122c89df16ee3f0df0f39135bf5baa..533ec843f6c4cec3e49255f81a3e398bbd002bd7 100644 (file)
--- a/config/lit.php
+++ b/config/lit.php
@@ -1,8 +1,6 @@
 <?php
 config('ROOM_NAME', 'Lit');
 config('ROOM', 'chambre');
-config('VIDEOPLAYER', 'mediarasp-small');
-config('TVPLAYER', 'mediarasp-small');
 config('HIDEMASK_TIMEOUT', 250);
 config('VOLUME_STEP',5);
 

diff --git a/config/remote.php b/config/remote.php
index c9a33ac3397b65f3985d6f41d147153d655c7210..0c127a8b776a682d9054ef47746a95d58ccee49b 100644 (file)
--- a/config/remote.php
+++ b/config/remote.php
@@ -62,47 +62,8 @@ $bricksSqueezebox = ['type' => 'squeezebox', 'width' => 6, 'height' => 4, 'brick
     ['type' => 'remote-light-down', 'width' => 1, 'height' => 1, 'top' => 2, 'left' => 5],
 ]];
 
-$bricksMediarasp = ['type' => 'mediarasp', 'width' => 7, 'height' => 4, 'bricks' => [
-    ['type' => 'remote-volume', 'width' => 1, 'height' => 3, 'top' => 0, 'left' => 0],
-    ['type' => 'remote-subtitles', 'width' => 1, 'height' => 3, 'top' => 0, 'left' => 6],
-    ['type' => 'remote-rew', 'width' => 1, 'height' => 1, 'top' => 0, 'left' => 1],
-    ['type' => 'remote-playpause', 'width' => 2, 'height' => 1, 'top' => 0, 'left' => 2],
-    ['type' => 'remote-fwd', 'width' => 1, 'height' => 1, 'top' => 0, 'left' => 4],
-    ['type' => 'remote-stop', 'width' => 1, 'height' => 1, 'top' => 0, 'left' => 5],
-    ['type' => 'remote-infos', 'width' => 4, 'height' => 2, 'top' => 1, 'left' => 1],
-    ['type' => 'remote-light-up', 'width' => 1, 'height' => 1, 'top' => 1, 'left' => 5],
-    ['type' => 'remote-light-down', 'width' => 1, 'height' => 1, 'top' => 2, 'left' => 5],
-    ['type' => 'remote-timeline', 'width' => 7, 'height' => 1, 'top' => 3, 'left' => 0],
-]];
-
-$bricksRaspberryCast = ['type' => 'raspberrycast', 'width' => 6, 'height' => 4, 'bricks' => [
-    ['type' => 'remote-volume', 'width' => 1, 'height' => 3, 'top' => 0, 'left' => 0],
-    ['type' => 'remote-rew', 'width' => 1, 'height' => 1, 'top' => 0, 'left' => 1],
-    ['type' => 'remote-playpause', 'width' => 2, 'height' => 1, 'top' => 0, 'left' => 2],
-    ['type' => 'remote-fwd', 'width' => 1, 'height' => 1, 'top' => 0, 'left' => 4],
-    ['type' => 'remote-stop', 'width' => 1, 'height' => 1, 'top' => 0, 'left' => 5],
-    ['type' => 'remote-infos', 'width' => 4, 'height' => 2, 'top' => 1, 'left' => 1],
-    ['type' => 'remote-light-up', 'width' => 1, 'height' => 1, 'top' => 1, 'left' => 5],
-    ['type' => 'remote-light-down', 'width' => 1, 'height' => 1, 'top' => 2, 'left' => 5],
-    ['type' => 'remote-timeline', 'width' => 6, 'height' => 1, 'top' => 3, 'left' => 0],
-]];
-
-$bricksOMXRaspTV = ['type' => 'omxtv', 'width' => 6, 'height' => 4, 'bricks' => [
-    ['type' => 'remote-volume', 'width' => 1, 'height' => 3, 'top' => 0, 'left' => 0],
-    ['type' => 'remote-rew', 'width' => 1, 'height' => 1, 'top' => 0, 'left' => 1],
-    ['type' => 'remote-playpause', 'width' => 2, 'height' => 1, 'top' => 0, 'left' => 2],
-    ['type' => 'remote-fwd', 'width' => 1, 'height' => 1, 'top' => 0, 'left' => 4],
-    ['type' => 'remote-stop', 'width' => 1, 'height' => 1, 'top' => 0, 'left' => 5],
-    ['type' => 'remote-pip', 'width' => 4, 'height' => 2, 'top' => 1, 'left' => 1],
-    ['type' => 'remote-light-up', 'width' => 1, 'height' => 1, 'top' => 1, 'left' => 5],
-    ['type' => 'remote-light-down', 'width' => 1, 'height' => 1, 'top' => 2, 'left' => 5],
-    ['type' => 'remote-timeline', 'width' => 6, 'height' => 1, 'top' => 3, 'left' => 0],
-]];
 
 $shortcuts['remote-squeezebox'] = [['type' => 'bricks', 'bricks' => $bricksSqueezebox]];
-$shortcuts['remote-raspberrycast'] = [['type' => 'bricks', 'bricks' => $bricksRaspberryCast]];
-$shortcuts['remote-mediarasp'] = [['type' => 'bricks', 'bricks' => $bricksMediarasp]];
 $shortcuts['remote-freebox'] = [['type' => 'bricks', 'bricks' => $bricksFreebox]];
-$shortcuts['remote-omxtv'] = [['type' => 'bricks', 'bricks' => $bricksOMXRaspTV]];
 $shortcuts['remote-shield'] = [['type' => 'bricks', 'bricks' => $bricksShield]];
 $shortcuts['remote-shieldmedia'] = [['type' => 'bricks', 'bricks' => $bricksShieldMedia]];
\ No newline at end of file

diff --git a/config/sdb.php b/config/sdb.php
index 5546b4751ace558a75080f6aa614f9e3d35cf8b8..fe32823f494bf6bfc74e0105313375e36c5b2def 100644 (file)
--- a/config/sdb.php
+++ b/config/sdb.php
@@ -6,8 +6,6 @@ config('SLEEPSCREEN', 30);
 config('SCREENSAVER_BRIGHTNESS', 100);
 config('SLEEPTYPE', 'screensaver');
 config('SCREENSAVER', 'weatherstation');
-config('VIDEOPLAYER', 'mediarasp-small');
-config('TVPLAYER', 'mediarasp-small');
 config('VOLUME', 60);
 config('VOLUME_DEVICE', 'Squeezebox');
 config('VOLUME_STEP', 3);

diff --git a/js/home.js b/js/home.js
index f67c47683784543e17268f00b3f3eda9871697dd..4495737437fa5197d4155f8ab00d9a6a3579e2f5 100644 (file)
--- a/js/home.js
+++ b/js/home.js
@@ -216,36 +216,6 @@ $(function () {
         return false;
     });
 
-    $(document).on(clickevent, '.media', function () {
-        displayLoader($(this));
-        if (CONFIG.VIDEOPLAYER === 'mediarasp-small') {
-            stopSqueeze();
-            screenOn(true);
-            resize();
-            videoPlaying = true;
-            $("#scrollholder").scrollLeft(0);
-            screenOn(true);
-        }
-
-        var href = $(this).attr('href');
-        var attr;
-        if (href.indexOf('://') === -1) {
-            attr = '&file=' + encodeURIComponent('/nas' + href);
-        } else {
-            attr = '&url=' + encodeURIComponent(href);
-        }
-        if (CONFIG.VIDEOPLAYER === 'mediarasp-small') {
-            attr += '&small=1';
-        }
-
-        $.get('/scripts/mediarasp.php?action=play&device=' + CONFIG.VIDEOPLAYER_DEVICE + attr, function () {
-            window.location = '#/section/remote';
-            hideLoader();
-        }).fail(function () {
-            hideLoader();
-        });
-        return false;
-    });
 
     $(document).on(clickevent, '.harmonyactivity', function () {
         displayLoader($(this));
@@ -257,18 +227,6 @@ $(function () {
         return false;
     });
 
-    $(document).on(clickevent, '.raspberrycast', function () {
-        var url = window.prompt('Entrer l\'URL de la vidéo', '');
-        if (url == null || url == '') {
-            return false;
-        }
-
-        $.get('/scripts/mediarasp.php?action=play&device=' + CONFIG.DEVICE + '&cast=' + encodeURIComponent(url), function () {
-            window.location = '#/section/remote'
-        });
-        return false;
-    });
-
     $(document).on(clickevent, '[data-screenoff]', function () {
         screenOff();
         return true;
@@ -991,8 +949,6 @@ function updateRemote() {
 function getRemoteUpdateTime(data) {
     if (!data) {
         return 1000;
-    } else if (data.type === 'mediarasp') {
-        return 5000;
     } else if (data.type === 'squeezebox') {
         return 2000;
     }

diff --git a/scripts/lib/lib.php b/scripts/lib/lib.php
index 1982403f0f3786cc0761d29ba0be9335025186e8..3cc12ccd53ba6593c96af4eb1884ad4ebe155bdd 100644 (file)
--- a/scripts/lib/lib.php
+++ b/scripts/lib/lib.php
@@ -15,7 +15,6 @@ require_once ROOT . '/scripts/lib/hue.php';
 require_once ROOT . '/scripts/lib/harmony.php';
 require_once ROOT . '/scripts/lib/scenes.php';
 require_once ROOT . '/scripts/lib/squeezebox.php';
-require_once ROOT . '/scripts/lib/mediarasp.php';
 require_once ROOT . '/scripts/lib/http.php';
 require_once ROOT . '/scripts/lib/pc.php';
 require_once ROOT . '/scripts/lib/time.php';

diff --git a/scripts/lib/remoteinfos.php b/scripts/lib/remoteinfos.php
index a50a57bc8b4bcbc0b43376c1c913c364ce19eb2d..c4041b78218e83469b5993c1c197b015339f3950 100644 (file)
--- a/scripts/lib/remoteinfos.php
+++ b/scripts/lib/remoteinfos.php
@@ -18,17 +18,14 @@ function remoteInfos()
         $res = squeezeboxRemoteInfos();
     } else {
         if (config('TVPLAYER') === 'shield') {
-                $res = ['type' => 'shield', 'can_seek' => false];
+            $res = ['type' => 'shield', 'can_seek' => false];
         } else {
-            if (($p === 'netflix' || $p === 'tv' || $p==='amazonprime') && config('TVPLAYER') === 'shield') {
+            if (($p === 'netflix' || $p === 'tv' || $p === 'amazonprime') && config('TVPLAYER') === 'shield') {
                 $res = ['type' => 'shield', 'can_seek' => false];
             } else {
-                if ($p == 'mediarasp' || $p === 'shieldmedia') {
-                    if (config('VIDEOPLAYER') === 'shield') {
-                        $res = ['type' => 'shieldmedia', 'can_seek' => false];
-                    } else {
-                        $res = mediaraspRemoteInfos();
-                    }
+                if ($p === 'shieldmedia') {
+                    $res = ['type' => 'shieldmedia', 'can_seek' => false];
+
                 } else {
                     $res = ['type' => $p, 'can_seek' => false];
                 }
@@ -63,54 +60,9 @@ function remoteProgress($progress)
     $p = $e[0];
     if ($p == 'squeezebox') {
         return squeezeboxRemoteProgress($progress);
-    } else if ($p == 'mediarasp') {
-        return mediaraspRemoteProgress($progress);
     }
 }
 
-function mediaraspRemoteInfos()
-{
-    global $directories;
-
-    $res['type'] = 'mediarasp';
-    $res['can_seek'] = false;
-    $res['duration'] = '';
-    $res['time'] = '';
-    $res['title'] = '';
-    $res['artwork'] = '';
-    $res['status'] = '';
-
-    $d = getDevice();
-    $playlist = simplexml_load_string(VLCCmd(['query' => 'requests/playlist.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) {
-        $source = str_replace('file://', '', (string)$leaf[0]['uri']);
-    } else {
-        return $res;
-    }
-
-    $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);
-
-    if (count($e) === 3 && $e[0] === 'mediarasp' && $e[1] === 'cast') {
-        $meta = getYoutubeDLMeta($e[2]);
-        $res['title'] = $meta['title'];
-        $res['artwork'] = $meta['thumbnail'];
-    } else {
-        $res = array_merge($res, getTitleAndArtwork($source));
-    }
-
-    return $res;
-}
-
 function getTitleAndArtwork($source)
 {
     global $directories;
@@ -181,12 +133,3 @@ function squeezeboxRemoteProgress($progress)
     }
     return $infos;
 }
-
-function mediaraspRemoteProgress($progress)
-{
-    $infos = mediaraspRemoteInfos();
-    $infos['time'] = $progress * $infos['duration'];
-
-    VLCCmd(['command' => 'seek', 'val' => ($progress * 100) . '%']);
-    return $infos;
-}
\ No newline at end of file

diff --git a/scripts/mediarasp.php b/scripts/mediarasp.php
deleted file mode 100644 (file)
index d5fecb3..0000000
--- a/scripts/mediarasp.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-require_once 'import.php';
-
-if (!isset($_GET['device'])) {
-    $_GET['device'] = config('DEVICE');
-}
-
-if ($_GET['action'] == 'play') {
-    if (isset($_GET['file'])) {
-        mediaRaspPlayMovie($_GET['file'], $_GET['device']);
-    } else if (isset($_GET['url'])) {
-        mediaRaspPlayStream($_GET['url'], $_GET['device']);
-    } else if (isset($_GET['cast'])) {
-        mediaRaspPlayCast($_GET['cast'], $_GET['device']);
-    }
-    echo getPlaying($_GET['device']);
-}
-
-if (isset($_GET['small']) && $_GET['small'] == 1) {
-    sleep(3);
-    moveVLC(false);
-}
\ No newline at end of file

diff --git a/style/remote.less b/style/remote.less
index 528c5bbcee2daca3a6fcc6eb026035208bab7224..94b4c53a4c5c0e5d2e15ca185896a103734685a9 100644 (file)
--- a/style/remote.less
+++ b/style/remote.less
@@ -5,31 +5,6 @@
        top: 0;
        left: 0;
 
-       &[data-type="mediarasp"],&[data-type="raspberrycast"] {
-               .brick {
-                       .c {
-                               .remote-infos {
-                                       padding: 0;
-
-                                       .h {
-                                               height: 100%;
-                                               background-size: cover;
-                                               border-radius: 5px;
-
-                                               .title {
-                                                       bottom: 10%;
-                                                       color: #fff;
-                                                       mix-blend-mode: exclusion;
-                                                       max-width: 80%;
-                                                       left: 10%;
-                                                       white-space: normal;
-                                               }
-                                       }
-                               }
-                       }
-               }
-       }
-
        .brick {
                overflow: hidden;
                position: absolute;

diff --git a/style/style.css b/style/style.css
index 938c07203bd189286ba702048e637c06cd80fcf6..336de34a6582b7126f0e93363b6d8b9fb714c365 100644 (file)
--- a/style/style.css
+++ b/style/style.css
@@ -535,25 +535,6 @@ section .col > .info.lock .icon {
   top: 0;
   left: 0;
 }
-.bricks[data-type="mediarasp"] .brick .c .remote-infos,
-.bricks[data-type="raspberrycast"] .brick .c .remote-infos {
-  padding: 0;
-}
-.bricks[data-type="mediarasp"] .brick .c .remote-infos .h,
-.bricks[data-type="raspberrycast"] .brick .c .remote-infos .h {
-  height: 100%;
-  background-size: cover;
-  border-radius: 5px;
-}
-.bricks[data-type="mediarasp"] .brick .c .remote-infos .h .title,
-.bricks[data-type="raspberrycast"] .brick .c .remote-infos .h .title {
-  bottom: 10%;
-  color: #fff;
-  mix-blend-mode: exclusion;
-  max-width: 80%;
-  left: 10%;
-  white-space: normal;
-}
 .bricks .brick {
   overflow: hidden;
   position: absolute;