 mmcwilliams
|
f929ea2cc2
|
No, use ffmpeg-static and ffprobe-static but explcitly whitelist the node_modules bin folder where the binaries actually sit
|
2020-04-24 17:22:58 -04:00 |
|
mmcwilliams
|
d4987ed3a3
|
Replace ffmpeg-static and ffprobe-static with ffmpeg-static-electron and ffprobe-static-electron. These will allow for packaging ffmpeg and ffprobe binaries that can be accessed from within the build. The path replace string hacks weren't cutting it.
|
2020-04-24 16:01:09 -04:00 |
|
mmcwilliams
|
da00c62db3
|
FFMPEG and FFPROBE need to be stored unpacked in asar for build.
|
2020-04-24 15:09:51 -04:00 |
sixteenmillimeter
|
01cac728f5
|
Remove ImageMagick dependency. Replace sharp with jimp (prevent linux build issues). Jimp will also perform the same composite step as convert was. Light module is still disabled globally.
|
2020-04-24 14:33:58 -04:00 |
|
sixteenmillimeter
|
1c940d6df7
|
Display export progress and time estimate while all frames are being exported
|
2020-03-09 15:46:06 -04:00 |
|
sixteenmillimeter
|
d70de98256
|
Pre-export all frames in video (with confirmation dialog). Greatly improves sequence times and reliablity in conjunction with last commit. Resolves #36 and resolves #39.
|
2020-02-21 13:34:22 -05:00 |
|
sixteenmillimeter
|
aec3e29476
|
Wait until image is loaded in a temp element and then report back to main process using ipc. This uses the "display_load" ipc channel to call back to the Display class and resolve a promise made in the .show() method. Resolves #38.
|
2020-02-21 02:28:26 -05:00 |
|
sixteenmillimeter
|
32fe873707
|
Allow for longer videos by using longer padded numbers for sequences
|
2020-02-21 01:58:56 -05:00 |
|
sixteenmillimeter
|
549cd3cc04
|
1.5.2 changes. Build includes code not in repo :(
|
2020-01-21 11:38:50 -05:00 |
|
sixteenmillimeter
|
8dc955a5e7
|
FFprobe added as static binary. Needed for filmout feature.
|
2020-01-20 11:51:15 -05:00 |
|
sixteenmillimeter
|
691e741d70
|
Add check for convert. Never used.
|
2020-01-20 01:15:20 -05:00 |
|
mmcwilliams
|
529c275c0f
|
Filmout needed update in use of dialog class. ffmpeg-static needed to reference the required module, not .path
|
2020-01-19 00:36:58 -05:00 |
|
mmcwilliams
|
b0c7e4eed4
|
Created a new, custom superior log format with timestamps and "splat()" objects. Tired of parsing json from logfiles for analysis. Now can easily grep through logfiles.
|
2020-01-14 11:51:25 -05:00 |
|
sixteenmillimeter
|
4c0aa4220c
|
Log with "simple" format, no more json in the console.
|
2020-01-09 18:05:10 -05:00 |
|
mmcwilliams
|
4c8c2b66f3
|
Serialport library was updated and changed to Promise-based returns from callbacks as was being used in the arduino lib.
|
2019-12-18 17:17:48 -05:00 |
|
mmcwilliams
|
c6ebab4032
|
Post upgrade, log library needs to be upgraded to support winston 3.x API
|
2019-12-18 16:05:58 -05:00 |
|
mmcwilliams
|
8e4c32073a
|
Sequencer now blocks system sleep while running a sequence. Made me upset last night when it happened during a filmout and I shot 1000 frames of black. Resolves #26
|
2019-10-04 14:36:26 -04:00 |
|
sixteenmillimeter
|
9b2ed018bf
|
If filmout picture source is set, set the field guide to match the aspect ratio of the image. Right now that only works if ratio is lower than the screen. Need to add case in display.html that corrects for when screen ratio is lower than image ratio.
|
2019-08-25 15:26:43 -04:00 |
|
sixteenmillimeter
|
51acbdfd30
|
Add comments to filmout lib.
|
2019-08-25 14:59:39 -04:00 |
|
mmcwilliams
|
5ce0aed2ff
|
Use module "ffmpeg-static" to use a binary of ffmpeg stored in node_modules, rather than rely on the system version.
|
2019-08-23 15:39:38 -04:00 |
|
sixteenmillimeter
|
f0c28b8624
|
Properly count number of frames in animated gifs using `identify` from imagemagick because ffprobe was failing.
|
2019-08-15 15:25:33 -04:00 |
|
mmcwilliams
|
1b83fe6937
|
Downgrade winston from 3 to 2 because it prints better in the console. Change all require statements to imports, requiring only what's used.
|
2019-08-04 19:38:45 -04:00 |
|
mmcwilliams
|
2ff98a2148
|
Refactor ffprobe into a class. Add jsdoc comments to all methods.
|
2019-08-04 18:04:06 -04:00 |
|
mmcwilliams
|
30c36baa9c
|
Add comments and switch in logger module for console.log
|
2019-08-04 17:54:38 -04:00 |
|
mmcwilliams
|
bd79025305
|
Refactored ffmpeg module into a class. Add a logger, not implemented. Not tested.
|
2019-08-04 17:42:27 -04:00 |
|
mmcwilliams
|
7c4e9d5823
|
Add jsdoc comments to ffmpeg lib. Also added types for tsc where they were implicit any type. Also added some semi-colons. Whoops.
|
2019-08-04 17:31:27 -04:00 |
|
mmcwilliams
|
5695bfd645
|
App was throwing error during filmout. Re-wrote the resizing logic so that if it can't find dimensions in the info, don't resize the image. This may lead to squashing, as I've seen in frameloom, but I suspect this problem is with the UI and the superfluous "USE FILE" button.
|
2019-08-04 17:20:45 -04:00 |
|
mmcwilliams
|
c5f3c72f73
|
All workshop work. Freeze dev on mac and test on linux
|
2019-07-29 12:45:13 -04:00 |
|
mmcwilliams
|
96d0897f65
|
Made a breaking change to the mscript module: light array is now the "meta" array to allow for types of commands other than camera movements to have associated metadata. The two driving motivations for this change are the proposed alert feature which will have a string message as its metadata and the proposed pause feature, which will have seconds as its metadata.
Updated tests as well. Still need to change behavior in the mscript.js gui lib.
|
2019-07-26 19:54:22 -04:00 |
|
mmcwilliams
|
c01f3ceff8
|
Add jsdoc comments AND semi-colons to sequencer module.
|
2019-07-26 19:03:42 -04:00 |
|
mmcwilliams
|
4023704d31
|
Added missing jsdoc comment to method "fade_rgb".
|
2019-07-26 18:57:17 -04:00 |
|
mmcwilliams
|
798e9ce1a3
|
Fixed comments in system module to reflect the fact that dependency check happens by executing 'which {cmd}' and storing the response as the absolute path to the binary. If which returns a blank string, dependency is marked not present.
|
2019-07-26 18:31:22 -04:00 |
|
mmcwilliams
|
6612ffa6d1
|
Add jsdoc comments to cmd module
|
2019-07-26 18:30:10 -04:00 |
|
mmcwilliams
|
07100a588c
|
Add jsdoc comments to remaining methods.
|
2019-07-26 18:12:06 -04:00 |
|
mmcwilliams
|
4b5dd4868b
|
Refactored mscript module into Typescript. Have not finished documentation. Typescript ompiles without errors. All mscript tests in /app pass.
|
2019-07-26 17:27:58 -04:00 |
|
mmcwilliams
|
b5da7ba233
|
Filmout supports still images. Uses FFMPEG to convert to png, still. Should use sharp and re-sample the image to the maximum allowed for the screen in the smallest dimension.
|
2019-07-07 00:02:01 -04:00 |
|
mmcwilliams
|
f8c64b45a7
|
Install sharp and animated-gif-detector
|
2019-07-06 19:53:03 -04:00 |
|
mmcwilliams
|
084916c317
|
Preview a frame using the webview. Select monitor to display images on. Wooo!
|
2019-06-26 20:08:49 -04:00 |
|
mmcwilliams
|
45f96e6537
|
Give macOS an extra 300ms to open and fullscreen a webview
|
2019-06-26 16:09:14 -04:00 |
|
mmcwilliams
|
f239f862e8
|
Fixed frame counting optimization, resolving issue #17. Also added a Siemens Star focusing screen, a middle gray metering screen and a field guide screen for use with the filmout feature. TODO: actually change monitors when selected.
|
2019-06-25 12:13:15 -04:00 |
|
mmcwilliams
|
872b46d4a5
|
Filmout display monitor size with stats
|
2019-06-24 21:11:14 -04:00 |
|
mmcwilliams
|
6b10e9c28d
|
System module phones home
|
2019-06-24 12:42:27 -04:00 |
|
mmcwilliams
|
d15fe37de5
|
Add a dependency check for the convert command
|
2019-06-24 11:37:07 -04:00 |
|
mmcwilliams
|
5014a2db38
|
Remove systeminformation module from system lib
|
2019-06-24 11:26:28 -04:00 |
|
mmcwilliams
|
6cda9aed1d
|
Beginnings of the film out display selection UI
|
2019-06-22 11:52:36 -04:00 |
|
mmcwilliams
|
9a464a2fcf
|
Unsafe-eval was throwing an error on compile
|
2019-06-22 11:52:14 -04:00 |
|
mmcwilliams
|
e25054117f
|
Only require join method from path. Don't need the whole dang thing.
|
2019-06-18 16:57:35 -04:00 |
|
mmcwilliams
|
717cf77e55
|
Rename all uses of the previously-named "digital" module to "filmout" in sequence module. Woo! Let's call that a patch.
|
2019-06-18 16:54:08 -04:00 |
|
mmcwilliams
|
ede6fcdfb8
|
Rename all uses of the previously-named "digital" module to "filmout" in proj module.
|
2019-06-18 16:52:26 -04:00 |
|
mmcwilliams
|
6fcb85bca2
|
Remove unused "digital" attribute from camera state.
|
2019-06-18 16:50:28 -04:00 |
|
mmcwilliams
|
0cff7c5794
|
Rename all uses of the previously-named "digital" module to "filmout" in cam module.
|
2019-06-18 16:49:49 -04:00 |
|
mmcwilliams
|
8ebbd0ac47
|
Remove unused modules and only require used exports within path and events.
|
2019-06-18 16:47:26 -04:00 |
|
mmcwilliams
|
49f9f7f160
|
Display will now show a meter screen (middle grey) when instructed. Not wired to anything, got distracted by the re-naming shenanigans.
|
2019-06-18 15:47:17 -04:00 |
|
mmcwilliams
|
22187777e7
|
Remove node-side digital lib and replace with filmout lib. Still remaining: rename internal uses of "dig" or "digital" to "filmout", including markup on the frontend.
|
2019-06-18 15:42:30 -04:00 |
|
mmcwilliams
|
5cd6b22ea4
|
Only use webview in full screen mode for now on all platforms. EOG is trickier and flickers the entire screen into view between frames, which is unsettling. Will look for a lower-level solution than webviews, but works for now. Also, uses real fullscreen on macOS instead of just maximizing the window.
|
2019-06-18 13:47:55 -04:00 |
|
mmcwilliams
|
32f02d42ce
|
During the film out mode, the webview now correctly handles "closed" events when the user manually closes the window. The window also now closes at the end of a sequence (caught a typo) and correctly removed the webview from the WebView object when it does not exist. Resolves #15
|
2019-06-18 13:35:50 -04:00 |
|
mmcwilliams
|
7740dc39ec
|
Include in last commit
|
2019-06-15 11:06:57 -04:00 |
|
mmcwilliams
|
5b418aeccd
|
Camera module imports intval class properly.
|
2019-06-14 11:59:47 -04:00 |
|
mmcwilliams
|
b5fbe0153b
|
Refactor intval module into Typescript.
|
2019-06-14 11:58:35 -04:00 |
|
mmcwilliams
|
da7d14e898
|
add delay to module
|
2019-06-14 11:31:27 -04:00 |
|
mmcwilliams
|
3aeb971b4d
|
Merge remote-tracking branch 'origin/master'
|
2019-06-14 11:31:13 -04:00 |
|
mmcwilliams
|
dab5c34bad
|
stash progress
|
2019-06-14 11:29:52 -04:00 |
|
mmcwilliams
|
6442d99817
|
Update delay, exec and exit usage and require statments.
|
2019-06-08 21:43:14 -04:00 |
|
mmcwilliams
|
e3d213e4f1
|
Ported ffmpeg, ffprobe, exit and exec modules to typescript
|
2019-06-08 20:51:00 -04:00 |
|
mmcwilliams
|
418670ce33
|
Time a sequence and pass back value of milliseconds back when sequence stops.
|
2019-05-28 17:48:42 -04:00 |
|
mmcwilliams
|
2e8d20f40a
|
Update comments on devices module.
|
2019-05-28 12:16:01 -04:00 |
|
mmcwilliams
|
5c9091d957
|
Can't reproduce issue #13. Appeared on installation of unknown version. Close #13 for now.
|
2019-05-28 10:33:31 -04:00 |
|
mmcwilliams
|
39301f5b59
|
FOUND THE BUG causing #3. Mscript still needs full conversion to typescript. This would have been caught on compile. Resolves #3, create a new issue for mscript refactor.
|
2019-05-28 09:06:59 -04:00 |
|
mmcwilliams
|
ad558608ee
|
All remaining dual projector, dual camera work.
|
2019-04-20 10:15:28 -04:00 |
|
mmcw-dev
|
b33ef36ab4
|
Work on multiple device UI
|
2019-04-16 10:01:42 -04:00 |
|
mmcw-dev
|
ed14564de7
|
Fix issue of false positives on detecting second cmaeras and projectors
|
2019-04-15 16:15:34 -04:00 |
|
mmcw-dev
|
52aac3f8b0
|
Settings module restores state to a default on "restore"
|
2019-04-15 16:13:28 -04:00 |
|
mmcw-dev
|
4f7dd92311
|
Update the silent log methods to return false.
|
2019-04-15 16:11:18 -04:00 |
|
mmcwilliams
|
7a52bc7c6e
|
Secondary projector and secondary camera behaviors have been added to the main process. This is not represented in the UI... yet. All renderer code is still in flux.
|
2019-04-04 18:49:07 -04:00 |
|
mmcwilliams
|
072c67fd0f
|
Update counters. Use local state within objects cam and proj instead of mcopy.state
|
2019-03-30 20:29:01 -04:00 |
|
mmcwilliams
|
1510762fbb
|
Sequencer uses class variables that are either set using arguments passed from the renderer, or uses the variables named "grid" referring to the grid.js gui.
|
2019-03-29 20:44:12 -04:00 |
|
mmcwilliams
|
429e66717d
|
Files from previous commit
|
2019-03-24 00:25:16 -04:00 |
|
mmcwilliams
|
43ee0d0672
|
Sequence now runs entirely in the main process. Renderer no longer stores the sequence, it is a for loop inside the main process.
|
2019-03-23 21:58:22 -04:00 |
|
mmcwilliams
|
11e9176cb8
|
Bump patch and add uuid types for typescript
|
2019-03-23 10:49:18 -04:00 |
|
mmcwilliams
|
4d62421446
|
Remove non-source files from src lib of system module
|
2019-03-23 10:48:43 -04:00 |
|
mmcwilliams
|
e35c41791b
|
Create a system lib that can be used in the UI and cli.
|
2019-03-22 20:29:36 -04:00 |
|
mmcwilliams
|
42691c1577
|
All work on grid + sequencer rewrite.
|
2019-03-22 17:06:57 -04:00 |
|
mmcwilliams
|
553d2bbb0d
|
Made progress on sequencer module, renamed from sequence.
|
2019-03-22 04:33:53 -04:00 |
|
mmcwilliams
|
425dd9fd6a
|
Initial updates to sequence module. Will try to simplify into a for loop, but if tests fail will re-write to a similar form as the renderer seq.js module
|
2019-03-22 03:22:33 -04:00 |
|
mmcwilliams
|
4356abc820
|
Disable light from the UI if necessary. Kind of circuitous, will refactor.
|
2019-03-21 22:55:12 -04:00 |
|
mmcwilliams
|
742adccf34
|
Took a tiny detour on the film out feature, or "digital projector". This now avoids showing a browser window fullscreen on mac, which is having performance issues when opening and then running sequences. There is a major source of lag, seemingly coming from the camera? Need to test with fake projector to see if there's a problem with the arduino lib.
|
2019-03-21 22:33:30 -04:00 |
|
mmcwilliams
|
aef8709ab0
|
Add placeholders for exec and spawn modules
|
2019-03-21 21:18:27 -04:00 |
|
mmcwilliams
|
0ff1b5ff7d
|
Refactor display module into typescript
|
2019-03-21 21:18:13 -04:00 |
|
mmcwilliams
|
48e8415ee4
|
Rename all keys to full "camera_" vs "cam_" and "projector_" vs "proj_" for consistency across the app.
Successfully separate and refactor gui.grid object to gui.
|
2019-03-21 21:02:28 -04:00 |
|
mmcwilliams
|
e5a1654341
|
Use local id string so that duplicate instances of the classes can talk to one another.
|
2019-03-21 19:45:48 -04:00 |
|
mmcwilliams
|
6d1e9ec78f
|
Print state for now. Need to store position in it? Make resetting it simple.
|
2019-03-21 19:36:37 -04:00 |
|
mmcwilliams
|
fe046027da
|
In camera and projector modules, for both main and renderer, use a string id to bind ipc paths and set up the ability to then have multiple of the proj, cam or even light class. Need to do light.
|
2019-03-21 19:34:56 -04:00 |
|
mmcwilliams
|
600a0abc72
|
Create and install main process lib to control the cmd.js module
|
2019-03-21 19:33:01 -04:00 |
|
mmcwilliams
|
fc3cc96cd8
|
Use the import Log = require() method of including log lib. This is cleaner and easier to read when parsing dependencies.
|
2019-03-21 18:03:53 -04:00 |
|
mmcwilliams
|
478799965e
|
Update log format, remove timestamp and use file "mcopy.log" in mcopy dir, not mcopy-cli.
|
2019-03-21 18:01:41 -04:00 |
|
mmcwilliams
|
099cd3052a
|
Refactor settings into Typescript class module.
Refactor devices into Typescript class module from object.
|
2019-03-21 18:00:34 -04:00 |
|
mmcwilliams
|
ea91ea5ff5
|
Remove console logging from arduino lib. Reject or throw to log errors
|
2019-03-21 15:59:50 -04:00 |
|
mmcwilliams
|
6a31eda3c4
|
Add label to cam, light and proj module logging
|
2019-03-21 15:57:16 -04:00 |
|
mmcwilliams
|
91ee19f2ab
|
Add correct alias strings to arduino lib
|
2019-03-21 15:56:33 -04:00 |
|
mmcwilliams
|
c563bf0dd3
|
Add a label argument to the log module.
|
2019-03-21 15:54:55 -04:00 |