Mirrors/lossless-cut
1
0
Fork 0
mirror of https://github.com/mifi/lossless-cut.git synced 2024-11-22 10:22:31 +01:00
Code Issues Releases Activity

improve remember convert to supported format

Browse Source 
make it so that it will also remember the choice if using hotkey (but not if reopening the dialog from the menu)
closes #1376
This commit is contained in:
Mikael Finstad 2023-01-27 23:43:27 +09:00
parent e776ac3aa2
commit 7d8e166a36
No known key found for this signature in database
GPG Key ID: 25AB36E3E81CBC26
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/App.jsx
View File

@ -1841,32 +1841,31 @@ const App = memo(() => {
loadCutSegments(newSegments, true); loadCutSegments(newSegments, true);
}, [currentApparentCutSeg.end, currentApparentCutSeg.start, filePath, loadCutSegments, mainVideoStream?.index]); }, [currentApparentCutSeg.end, currentApparentCutSeg.start, filePath, loadCutSegments, mainVideoStream?.index]);
const userHtml5ifyCurrentFile = useCallback(async () => { const userHtml5ifyCurrentFile = useCallback(async ({ ignoreRememberedValue } = {}) => {
if (!filePath) return; if (!filePath) return;
async function getHtml5ifySpeed() { let selectedOption = rememberConvertToSupportedFormat;
if (selectedOption == null || ignoreRememberedValue) {
const allHtml5ifyOptions = ['fastest', 'fastest-audio', 'fastest-audio-remux', 'fast-audio-remux', 'fast-audio', 'fast', 'slow', 'slow-audio', 'slowest']; const allHtml5ifyOptions = ['fastest', 'fastest-audio', 'fastest-audio-remux', 'fast-audio-remux', 'fast-audio', 'fast', 'slow', 'slow-audio', 'slowest'];
let relevantOptions = []; let relevantOptions = [];
if (hasAudio && hasVideo) relevantOptions = [...allHtml5ifyOptions]; if (hasAudio && hasVideo) relevantOptions = [...allHtml5ifyOptions];
else if (hasAudio) relevantOptions = [...relevantOptions, 'fast-audio-remux', 'slow-audio', 'slowest']; else if (hasAudio) relevantOptions = [...relevantOptions, 'fast-audio-remux', 'slow-audio', 'slowest'];
else if (hasVideo) relevantOptions = [...relevantOptions, 'fastest', 'fast', 'slow', 'slowest']; else if (hasVideo) relevantOptions = [...relevantOptions, 'fastest', 'fast', 'slow', 'slowest'];
const { selectedOption, remember } = await askForHtml5ifySpeed({ allowedOptions: allHtml5ifyOptions.filter((option) => relevantOptions.includes(option)), showRemember: true, initialOption: rememberConvertToSupportedFormat });
if (!selectedOption) return undefined;
console.log('Choice', { speed: selectedOption, remember }); const userResponse = await askForHtml5ifySpeed({ allowedOptions: allHtml5ifyOptions.filter((option) => relevantOptions.includes(option)), showRemember: true, initialOption: selectedOption });
console.log('Choice', userResponse);
({ selectedOption } = userResponse);
if (!selectedOption) return;
const { remember } = userResponse;
setRememberConvertToSupportedFormat(remember ? selectedOption : undefined); setRememberConvertToSupportedFormat(remember ? selectedOption : undefined);
return selectedOption;
} }
const speed = await getHtml5ifySpeed();
if (!speed) return;
if (workingRef.current) return; if (workingRef.current) return;
try { try {
setWorking(i18n.t('Converting to supported format')); setWorking(i18n.t('Converting to supported format'));
await html5ifyAndLoad(customOutDir, filePath, speed, hasVideo, hasAudio); await html5ifyAndLoad(customOutDir, filePath, selectedOption, hasVideo, hasAudio);
} catch (err) { } catch (err) {
errorToast(i18n.t('Failed to convert file. Try a different conversion')); errorToast(i18n.t('Failed to convert file. Try a different conversion'));
console.error('Failed to html5ify file', err); console.error('Failed to html5ify file', err);
@ -2150,7 +2149,7 @@ const App = memo(() => {
toggleSegmentsList, toggleSegmentsList,
toggleStreamsSelector, toggleStreamsSelector,
extractAllStreams, extractAllStreams,
convertFormatCurrentFile: userHtml5ifyCurrentFile, convertFormatCurrentFile: () => userHtml5ifyCurrentFile(),
convertFormatBatch, convertFormatBatch,
concatBatch: concatCurrentBatch, concatBatch: concatCurrentBatch,
toggleKeyframeCutMode: () => toggleKeyframeCut(true), toggleKeyframeCutMode: () => toggleKeyframeCut(true),
@ -2315,7 +2314,7 @@ const App = memo(() => {
openFilesDialog, openFilesDialog,
closeCurrentFile: () => { closeFileWithConfirm(); }, closeCurrentFile: () => { closeFileWithConfirm(); },
closeBatchFiles: () => { closeBatch(); }, closeBatchFiles: () => { closeBatch(); },
html5ify: userHtml5ifyCurrentFile, html5ify: () => userHtml5ifyCurrentFile({ ignoreRememberedValue: true }),
askSetStartTimeOffset, askSetStartTimeOffset,
extractAllStreams, extractAllStreams,
showStreamsSelector: () => setStreamsSelectorShown(true), showStreamsSelector: () => setStreamsSelectorShown(true),