aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/nodes/RecordingBox/RecordingView.tsx
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/views/nodes/RecordingBox/RecordingView.tsx')
-rw-r--r--src/client/views/nodes/RecordingBox/RecordingView.tsx23
1 files changed, 16 insertions, 7 deletions
diff --git a/src/client/views/nodes/RecordingBox/RecordingView.tsx b/src/client/views/nodes/RecordingBox/RecordingView.tsx
index 640e4f5f2..1e9ce22f1 100644
--- a/src/client/views/nodes/RecordingBox/RecordingView.tsx
+++ b/src/client/views/nodes/RecordingBox/RecordingView.tsx
@@ -71,13 +71,21 @@ export function RecordingView(props: IRecordingViewProps) {
inputPaths.push(name)
});
- console.log(videoFiles)
+ console.log(videoFiles)
+
+ const data = await Networking.UploadSegmentsAndConcatenate(videoFiles)
+ console.log('data', data)
+ const result = data[0].result
+ if (!(result instanceof Error)) { // convert this screenshotBox into normal videoBox
+ props.setResult(result, trackScreen)
+ } else {
+ alert("video conversion failed");
+ }
// const inputListName = 'order.txt';
// fs.writeFileSync(inputListName, inputPaths.join('\n'));
-
// var merge = ffmpeg();
// merge.input(inputListName)
// .inputOptions(['-f concat', '-safe 0'])
@@ -345,16 +353,17 @@ export function RecordingView(props: IRecordingViewProps) {
<span className="checkmark"></span>
Track Screen
</label>
- </div>)}
-
- </div>
+ </div>)}
- <ProgressBar
+ </div>
+
+ </div>
+
+ <ProgressBar
videos={videos}
setVideos={setVideos}
// playSegment={playSegment}
/>
- </div>
</div>
</div>)
} \ No newline at end of file