Final test on RPI4

Author: formix

lib/index.mjs

@@ -20,7 +20,7 @@ export class VlcPlayer {
 
     /**
      * Open the VLC media player with an empty playlist. VLC will not take
-     * over the display until the first media is added to the playlist.
+     * over the display until the first media is enqueueed to the playlist.
      */
     async open() {
         return new Promise((resolve, reject) => {
@@ -38,13 +38,12 @@ export class VlcPlayer {
             if (this._verbose) {
                 this._vlc.stderr.on("data", data => process.stderr.write(data));
             }
-            this._writecmd = promisify(this._vlc.stdin.write);
             return resolve();
         });
     }
 
     /**
-     * Start playing after being paused or add the given file at the end of
+     * Start playing after being paused or enqueue the given file at the end of
      * the playlist and start playing it. If the file is already in the
      * playlist, jump to that media position in the playlist instead.
      * 
@@ -56,7 +55,7 @@ export class VlcPlayer {
         }
         else {
             if (!this._playlist.has(mediaPath)) {
-                await this.add(mediaPath);
+                await this.enqueue(mediaPath);
             }
             let index = this._playlist.get(mediaPath);
             await this.exec(`goto ${index}`);
@@ -71,25 +70,20 @@ export class VlcPlayer {
     }
 
     /**
-     * Add the specified media at the end of the playlist. Pause the media
-     * if it is the first one.
+     * Enqueue the specified media at the end of the playlist.
      * 
      * @param {string} mediaPath The path of the media to play.
      */
-    async add(mediaPath) {
+    async enqueue(mediaPath) {
         if (!fs.existsSync(mediaPath)) {
             throw new Error(`Media '${mediaPath}' not found.`);
         }
         if (this._playlist.has(mediaPath)) {
             throw new Error(`Media '${mediaPath}' already in the playlist.`);
         }
-        let firstFile = this._playlistIndex === 3;
         this._playlist.set(mediaPath, this._playlistIndex);
         this._playlistIndex++;
-        await this.exec(`add ${mediaPath}`);
-        if (firstFile) {
-            await this.exec("pause");
-        }
+        await this.exec(`enqueue ${mediaPath}`);
     }
 
     /**
@@ -125,17 +119,16 @@ export class VlcPlayer {
      * 
      * @param {string} command - The command to execute.
      */
-    async exec(command) {
-        if (!command) {
-            throw new Error("The command parameter must be provided.");
-        }
-        let retries = 0;
-        let writeSuccess = false;
-        while (!writeSuccess && retries < 10) {
-            if (retries > 0) await _msleep(50);
-            retries++;
-            writeSuccess = await this._writecmd(`${command}\n`);
-        }
+    exec(command) {
+        return new Promise((resolve, reject) => {
+            if (!command) {
+                return reject("The command parameter must be provided.");
+            }
+            this._vlc.stdin.write(`${command}\n`, err => {
+                if (err) reject(err);
+                return resolve();
+            });
+        });
     }
 }
 

package-lock.json

@@ -1,18 +1,18 @@
-import { VlcPlayer, sleep } from "vlcplayer"
+import { VlcPlayer, sleep } from "../lib/index.mjs";
 
-let mediasHome = "/var/medias/";
+let mediasHome = "/var/xcape/videos/";
 const VIDEOS = {
-    BadWeather: `${mediasHome}2019_sc02_067_v001_BUFFER1-1080.mp4`, // 20 seconds
-    Tornado: `${mediasHome}2019_sc02_067_v001_TRIGGER1-1080.mp4`,   // 20 seconds
-    Flying: `${mediasHome}2019_sc02_067_v001_BUFFER2-1080.mp4`,     // 20 seconds
-    FallDown: `${mediasHome}2019_sc02_067_v001_TRIGGER2-1080.mp4`,  // 13 seconds
-    CropField: `${mediasHome}2019_sc02_067_v001_BUFFER3-1080.mp4`   // 20 seconds
+    BadWeather: `${mediasHome}Wizard-of-Oz-Tornado-2019_sc02_067_v001_BUFFER1-1080.mp4`, // 20 seconds
+    Tornado: `${mediasHome}Wizard-of-Oz-Tornado-2019_sc02_067_v001_TRIGGER1-1080.mp4`,   // 20 seconds
+    Flying: `${mediasHome}Wizard-of-Oz-Tornado-2019_sc02_067_v001_BUFFER2-1080.mp4`,     // 20 seconds
+    FallDown: `${mediasHome}Wizard-of-Oz-Tornado-2019_sc02_067_v001_TRIGGER2-1080.mp4`,  // 13 seconds
+    CropField: `${mediasHome}Wizard-of-Oz-Tornado-2019_sc02_067_v001_BUFFER3-1080.mp4`   // 20 seconds
 };
 
 let player = new VlcPlayer();
 await player.open();
 for (let key in VIDEOS) {
-    await player.add(VIDEOS[key]);
+    await player.enqueue(VIDEOS[key]);
 }
 await player.play(VIDEOS.BadWeather);
 await player.repeat("on");