diff --git a/src/renderer.jsx b/src/renderer.jsx index ef4b8af6..8fbf97c8 100644 --- a/src/renderer.jsx +++ b/src/renderer.jsx @@ -59,7 +59,7 @@ function shortStep(dir) { function withBlur(cb) { return (e) => { e.target.blur(); - cb(); + cb(e); }; } @@ -84,6 +84,7 @@ const getInitialLocalState = () => ({ cutStartTimeManual: undefined, cutEndTimeManual: undefined, fileFormat: undefined, + detectedFileFormat: undefined, rotation: 360, cutProgress: undefined, startTimeOffset: 0, @@ -127,7 +128,7 @@ class App extends React.Component { return; } setFileNameTitle(filePath); - this.setState({ filePath, html5FriendlyPath, fileFormat }); + this.setState({ filePath, html5FriendlyPath, fileFormat, detectedFileFormat: fileFormat }); } catch (err) { if (err.code === 1 || err.code === 'ENOENT') { errorToast('Unsupported file'); @@ -481,7 +482,7 @@ class App extends React.Component { console.error('stderr:', err.stderr); if (err.code === 1 || err.code === 'ENOENT') { - errorToast('Whoops! ffmpeg was unable to cut this video. It may be of an unknown format or codec combination'); + errorToast(`Whoops! ffmpeg was unable to cut this video. Try each the following things before attempting to cut again:\n1. Select a different output format from the ${fileFormat} button (matroska takes almost everything).\n2. toggle the button "all" to "ps"`); return; } @@ -578,10 +579,12 @@ class App extends React.Component { render() { const { working, filePath, duration: durationRaw, cutProgress, currentTime, playing, - fileFormat, playbackRate, keyframeCut, includeAllStreams, stripAudio, captureFormat, + fileFormat, detectedFileFormat, playbackRate, keyframeCut, includeAllStreams, stripAudio, captureFormat, helpVisible, currentSeg, cutSegments, autoMerge, } = this.state; + const selectableFormats = ['mov', 'mp4', 'matroska'].filter(f => f !== detectedFileFormat); + const duration = durationRaw || 1; const currentTimePos = currentTime !== undefined && `${(currentTime / duration) * 100}%`; @@ -757,9 +760,11 @@ class App extends React.Component {
- - {fileFormat || 'FMT'} - + {round(playbackRate, 1) || 1} diff --git a/src/util.js b/src/util.js index 42f2d646..3ad679cc 100644 --- a/src/util.js +++ b/src/util.js @@ -65,7 +65,7 @@ const toast = swal.mixin({ toast: true, position: 'top', showConfirmButton: false, - timer: 3000, + timer: 5000, }); const errorToast = title => toast.fire({