Add check for convert. Never used.

app/lib/ffmpeg/index.js

@@ -14,6 +14,7 @@ class FFMPEG {
     constructor(sys) {
         this.id = 'ffmpeg';
         this.bin = sys.deps.ffmpeg;
+        this.convert = sys.deps.convert;
         this.TMPDIR = path_1.join(sys.tmp, 'mcopy_digital');
         this.init();
     }
@@ -75,7 +76,7 @@ class FFMPEG {
         });
         //
         cmd = `${this.bin} -y -i "${video}" -vf "select='gte(n\\,${frameNum})'${scale}" -vframes 1 -compression_algo raw -pix_fmt rgb24 "${tmpoutput}"`;
-        cmd2 = `convert "${tmpoutput}" -resize ${w}x${h} -size ${w}x${h} xc:"rgb(${rgb[0]},${rgb[1]},${rgb[2]})" +swap -compose Darken -composite "${tmpoutput}"`;
+        cmd2 = `${this.convert} "${tmpoutput}" -resize ${w}x${h} -size ${w}x${h} xc:"rgb(${rgb[0]},${rgb[1]},${rgb[2]})" +swap -compose Darken -composite "${tmpoutput}"`;
         //ffmpeg -i "${video}" -ss 00:00:07.000 -vframes 1 "export-${time}.jpg"
         //ffmpeg -i "${video}" -compression_algo raw -pix_fmt rgb24 "export-%05d.tiff"
         //-vf "select=gte(n\,${frame})" -compression_algo raw -pix_fmt rgb24 "export-${padded}.png"
@@ -88,7 +89,7 @@ class FFMPEG {
         }
         if (output && output.stdout)
             this.log.info(`"${output.stdout}"`);
-        if (rgb[0] !== 255 || rgb[1] !== 255 || rgb[2] !== 255) {
+        if (this.convert && (rgb[0] !== 255 || rgb[1] !== 255 || rgb[2] !== 255)) {
             try {
                 this.log.info(cmd2);
                 output2 = await exec_1.exec(cmd2);

app/lib/ui/filmout.js

@@ -158,6 +158,7 @@ class FilmOut {
                 displayName = pathStr.split('/').pop();
                 elem.val(displayName);
                 $('#filmout_file').val(displayName);
+                this.useFile();
             }
         });
     }
@@ -185,6 +186,7 @@ class FilmOut {
             $('#projector_type_digital').prop('checked', 'checked');
             $('#digital').removeClass('active');
         }
+        //cancel video
     }
     onFilmout(evt, args) {
         let state;

app/lib/ui/index.js

@@ -52,7 +52,7 @@ gui.notify = function (title, message) {
 				}
 				return resolve(true);
 		});
-	})
+	});
 };
 gui.updateCam = async function (t) {
 	'use strict';

app/src/lib/ui/filmout.ts

@@ -162,6 +162,8 @@ class FilmOut {
 			displayName = pathStr.split('/').pop();
 			elem.val(displayName);
 			$('#filmout_file').val(displayName);
+
+			this.useFile();
 		}
 	}
 	useFile () {
@@ -188,6 +190,7 @@ class FilmOut {
 			$('#projector_type_digital').prop('checked', 'checked');
 			$('#digital').removeClass('active');
 		}
+		//cancel video
 	}
 	onFilmout (evt : any, args : any) {
 		let state : any;

cli/lib/ffmpeg/index.js

@@ -14,6 +14,7 @@ class FFMPEG {
     constructor(sys) {
         this.id = 'ffmpeg';
         this.bin = sys.deps.ffmpeg;
+        this.convert = sys.deps.convert;
         this.TMPDIR = path_1.join(sys.tmp, 'mcopy_digital');
         this.init();
     }
@@ -75,7 +76,7 @@ class FFMPEG {
         });
         //
         cmd = `${this.bin} -y -i "${video}" -vf "select='gte(n\\,${frameNum})'${scale}" -vframes 1 -compression_algo raw -pix_fmt rgb24 "${tmpoutput}"`;
-        cmd2 = `convert "${tmpoutput}" -resize ${w}x${h} -size ${w}x${h} xc:"rgb(${rgb[0]},${rgb[1]},${rgb[2]})" +swap -compose Darken -composite "${tmpoutput}"`;
+        cmd2 = `${this.convert} "${tmpoutput}" -resize ${w}x${h} -size ${w}x${h} xc:"rgb(${rgb[0]},${rgb[1]},${rgb[2]})" +swap -compose Darken -composite "${tmpoutput}"`;
         //ffmpeg -i "${video}" -ss 00:00:07.000 -vframes 1 "export-${time}.jpg"
         //ffmpeg -i "${video}" -compression_algo raw -pix_fmt rgb24 "export-%05d.tiff"
         //-vf "select=gte(n\,${frame})" -compression_algo raw -pix_fmt rgb24 "export-${padded}.png"
@@ -88,7 +89,7 @@ class FFMPEG {
         }
         if (output && output.stdout)
             this.log.info(`"${output.stdout}"`);
-        if (rgb[0] !== 255 || rgb[1] !== 255 || rgb[2] !== 255) {
+        if (this.convert && (rgb[0] !== 255 || rgb[1] !== 255 || rgb[2] !== 255)) {
             try {
                 this.log.info(cmd2);
                 output2 = await exec_1.exec(cmd2);

src/ffmpeg/index.ts

@@ -13,6 +13,7 @@ import { exit } from 'exit';
 
 class FFMPEG {
 	private bin : string;
+	private convert : string;
 	private log : any;
 	private id : string = 'ffmpeg';
 	private TMPDIR : string;
@@ -25,6 +26,7 @@ class FFMPEG {
 	 **/
 	constructor (sys : any) {
 		this.bin = sys.deps.ffmpeg;
+		this.convert = sys.deps.convert;
 		this.TMPDIR = join(sys.tmp, 'mcopy_digital');
 		this.init();
 	}
@@ -93,7 +95,7 @@ class FFMPEG {
 		});
 	//
 		cmd = `${this.bin} -y -i "${video}" -vf "select='gte(n\\,${frameNum})'${scale}" -vframes 1 -compression_algo raw -pix_fmt rgb24 "${tmpoutput}"`;
-		cmd2 = `convert "${tmpoutput}" -resize ${w}x${h} -size ${w}x${h} xc:"rgb(${rgb[0]},${rgb[1]},${rgb[2]})" +swap -compose Darken -composite "${tmpoutput}"`;
+		cmd2 = `${this.convert} "${tmpoutput}" -resize ${w}x${h} -size ${w}x${h} xc:"rgb(${rgb[0]},${rgb[1]},${rgb[2]})" +swap -compose Darken -composite "${tmpoutput}"`;
 
 		//ffmpeg -i "${video}" -ss 00:00:07.000 -vframes 1 "export-${time}.jpg"
 		//ffmpeg -i "${video}" -compression_algo raw -pix_fmt rgb24 "export-%05d.tiff"
@@ -107,7 +109,7 @@ class FFMPEG {
 		}
 		if (output && output.stdout) this.log.info(`"${output.stdout}"`);
 
-		if (rgb[0] !== 255 || rgb[1] !== 255 || rgb[2] !== 255) {
+		if (this.convert && (rgb[0] !== 255 || rgb[1] !== 255 || rgb[2] !== 255)) {
 			try {
 				this.log.info(cmd2);
 				output2 = await exec(cmd2);

src/filmout/index.ts

@@ -202,6 +202,7 @@ class FilmOut {
 		this.state.enabled = true;
 		return await this.ui.send(this.id, { valid : true, state : JSON.stringify(this.state) });
 	}
+
 	/**
 	 * Return true if gif is animated, false if it is a still
 	 *