16mm
/
mcopy
1
0
Fork 0
Code Issues 14 Pull Requests Projects 2 Releases 13 Wiki Activity

Filmout needs to receive the whole state, not just the frame. Still broken.

This commit is contained in:
Matt McWilliams 2021-03-18 10:00:49 -04:00
parent 32f70be614
commit a2af605d37
8 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/data/cfg.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.6.7", "version": "1.6.8",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {

2
app/lib/filmout/index.js
View File

@ -370,12 +370,12 @@ class FilmOut {
const state = JSON.parse(JSON.stringify(this.state)); const state = JSON.parse(JSON.stringify(this.state));
let path; let path;
state.frame = arg.frame; state.frame = arg.frame;
console.dir(state);
try { try {
path = await this.ffmpeg.frame(state, { color: [255, 255, 255] }); path = await this.ffmpeg.frame(state, { color: [255, 255, 255] });
} }
catch (err) { catch (err) {
this.log.error(err, 'FILMOUT', true, true); this.log.error(err, 'FILMOUT', true, true);
;
throw err; throw err;
} }
this.ui.send('preview_frame', { path, frame: arg.frame }); this.ui.send('preview_frame', { path, frame: arg.frame });

2
app/lib/filmout/index.js.map
View File

File diff suppressed because one or more lines are too long

2
app/lib/ui/filmout.js
View File

@ -310,7 +310,7 @@ class FilmOut {
const frameStr = $('#filmout_position').val(); const frameStr = $('#filmout_position').val();
const frame = parseInt(frameStr, 10); const frame = parseInt(frameStr, 10);
this.state.frame = frame; this.state.frame = frame;
ipcRenderer.send('preview_frame', { frame }); ipcRenderer.send('preview_frame', { state: this.state });
} }
onFrame(evt, args) { onFrame(evt, args) {
const elem = $('#filmout'); const elem = $('#filmout');

2
app/lib/ui/filmout.js.map
View File

File diff suppressed because one or more lines are too long

2
app/src/lib/ui/filmout.ts
View File

@ -317,7 +317,7 @@ class FilmOut {
const frameStr : string = $('#filmout_position').val() as string; const frameStr : string = $('#filmout_position').val() as string;
const frame : number = parseInt(frameStr, 10); const frame : number = parseInt(frameStr, 10);
this.state.frame = frame; this.state.frame = frame;
ipcRenderer.send('preview_frame', { frame }); ipcRenderer.send('preview_frame', { state : this.state });
} }
onFrame (evt : any, args : any) { onFrame (evt : any, args : any) {
const elem : any = $('#filmout'); const elem : any = $('#filmout');

2
processing/mcopy/cfg.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.6.7", "version": "1.6.8",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {

3
src/filmout/index.ts
View File

@ -385,11 +385,12 @@ class FilmOut {
let path : string; let path : string;
state.frame = arg.frame; state.frame = arg.frame;
console.dir(state);
try { try {
path = await this.ffmpeg.frame(state, { color : [255, 255, 255] }); path = await this.ffmpeg.frame(state, { color : [255, 255, 255] });
} catch (err) { } catch (err) {
this.log.error(err, 'FILMOUT', true, true);; this.log.error(err, 'FILMOUT', true, true);
throw err; throw err;
} }