The swiss army knife of lossless video/audio editing
export improvements
Mikael Finstad4b175b684380
diff --git a/src/App.jsx b/src/App.jsxindex 12b885f3..4d68f562 100644--- a/src/App.jsx+++ b/src/App.jsx@@ -2430,7 +2430,7 @@ const App = memo(() => {cleanupFilesDialog={cleanupFilesDialog}captureSnapshot={captureSnapshot}onExportPress={onExportPress}- selectedSegments={selectedSegments}+ segmentsToExport={segmentsToExport}seekAbs={seekAbs}currentSegIndexSafe={currentSegIndexSafe}cutSegments={cutSegments}@@ -2496,7 +2496,7 @@ const App = memo(() => {/></SideSheet>- <ExportConfirm filePath={filePath} areWeCutting={areWeCutting} nonFilteredSegments={nonFilteredSegments} selectedSegments={selectedSegments} willMerge={willMerge} visible={exportConfirmVisible} onClosePress={closeExportConfirm} onExportConfirm={onExportConfirm} renderOutFmt={renderOutFmt} outputDir={outputDir} numStreamsTotal={numStreamsTotal} numStreamsToCopy={numStreamsToCopy} setStreamsSelectorShown={setStreamsSelectorShown} outFormat={fileFormat} setOutSegTemplate={setOutSegTemplate} outSegTemplate={outSegTemplateOrDefault} generateOutSegFileNames={generateOutSegFileNames} currentSegIndexSafe={currentSegIndexSafe} getOutSegError={getOutSegError} />+ <ExportConfirm filePath={filePath} areWeCutting={areWeCutting} nonFilteredSegments={nonFilteredSegments} selectedSegments={selectedSegments} segmentsToExport={segmentsToExport} willMerge={willMerge} visible={exportConfirmVisible} onClosePress={closeExportConfirm} onExportConfirm={onExportConfirm} renderOutFmt={renderOutFmt} outputDir={outputDir} numStreamsTotal={numStreamsTotal} numStreamsToCopy={numStreamsToCopy} setStreamsSelectorShown={setStreamsSelectorShown} outFormat={fileFormat} setOutSegTemplate={setOutSegTemplate} outSegTemplate={outSegTemplateOrDefault} generateOutSegFileNames={generateOutSegFileNames} currentSegIndexSafe={currentSegIndexSafe} getOutSegError={getOutSegError} /><HelpSheetvisible={helpVisible}diff --git a/src/BottomBar.jsx b/src/BottomBar.jsxindex b394c95a..c56b3583 100644--- a/src/BottomBar.jsx+++ b/src/BottomBar.jsx@@ -31,7 +31,7 @@ const leftRightWidth = 100;const BottomBar = memo(({zoom, setZoom, timelineToggleComfortZoom,isRotationSet, rotation, areWeCutting, increaseRotation, cleanupFilesDialog,- captureSnapshot, onExportPress, selectedSegments, hasVideo,+ captureSnapshot, onExportPress, segmentsToExport, hasVideo,seekAbs, currentSegIndexSafe, cutSegments, currentCutSeg, setCutStart, setCutEnd,setCurrentSegIndex, cutStartTimeManual, setCutStartTimeManual, cutEndTimeManual, setCutEndTimeManual,jumpTimelineStart, jumpTimelineEnd, jumpCutEnd, jumpCutStart, startTimeOffset, setCutTime, currentApparentCutSeg,@@ -360,7 +360,7 @@ const BottomBar = memo(({{!simpleMode && <ToggleExportConfirm style={{ marginRight: 5 }} />}- <ExportButton size={1.3} selectedSegments={selectedSegments} areWeCutting={areWeCutting} onClick={onExportPress} />+ <ExportButton size={1.3} segmentsToExport={segmentsToExport} areWeCutting={areWeCutting} onClick={onExportPress} /></div></>);diff --git a/src/ExportConfirm.jsx b/src/ExportConfirm.jsxindex 70c5cff7..a1bab57d 100644--- a/src/ExportConfirm.jsx+++ b/src/ExportConfirm.jsx@@ -41,7 +41,7 @@ const warningStyle = { color: '#faa', fontSize: '80%' };const HelpIcon = ({ onClick }) => <IoIosHelpCircle size={20} role="button" onClick={withBlur(onClick)} style={{ cursor: 'pointer', verticalAlign: 'middle', marginLeft: 5 }} />;const ExportConfirm = memo(({- areWeCutting, selectedSegments, willMerge, visible, onClosePress, onExportConfirm,+ areWeCutting, selectedSegments, segmentsToExport, willMerge, visible, onClosePress, onExportConfirm,outFormat, renderOutFmt, outputDir, numStreamsTotal, numStreamsToCopy, setStreamsSelectorShown, outSegTemplate,setOutSegTemplate, generateOutSegFileNames, filePath, currentSegIndexSafe, getOutSegError, nonFilteredSegments,}) => {@@ -239,7 +239,7 @@ const ExportConfirm = memo(({exit={{ scale: 0.7, opacity: 0 }}transition={{ duration: 0.4, easings: ['easeOut'] }}>- <ExportButton selectedSegments={selectedSegments} areWeCutting={areWeCutting} onClick={() => onExportConfirm()} size={1.7} />+ <ExportButton segmentsToExport={segmentsToExport} areWeCutting={areWeCutting} onClick={() => onExportConfirm()} size={1.7} /></motion.div></div></>diff --git a/src/SegmentList.jsx b/src/SegmentList.jsxindex 99f0acee..45f1bb12 100644--- a/src/SegmentList.jsx+++ b/src/SegmentList.jsx@@ -11,7 +11,7 @@ import scrollIntoView from 'scroll-into-view-if-needed';import useContextMenu from './hooks/useContextMenu';import useUserSettings from './hooks/useUserSettings';-import { saveColor, controlsBackground } from './colors';+import { saveColor, controlsBackground, primaryTextColor } from './colors';import { getSegColor } from './util/colors';const buttonBaseStyle = {@@ -160,7 +160,7 @@ const SegmentList = memo(({let header = t('Segments to export:');if (segments.length === 0) {- if (invertCutSegments) header = <Trans>You have enabled the "invert segments" mode <FaYinYang style={{ verticalAlign: 'middle' }} /> which will cut away selected segments instead of keeping them. But there is no space between any segments, or at least two segments are overlapping. This would not produce any output. Either make room between segments or click the Yinyang <FaYinYang style={{ verticalAlign: 'middle' }} /> symbol below to disable this mode.</Trans>;+ if (invertCutSegments) header = <Trans>You have enabled the "invert segments" mode <FaYinYang style={{ verticalAlign: 'middle' }} /> which will cut away selected segments instead of keeping them. But there is no space between any segments, or at least two segments are overlapping. This would not produce any output. Either make room between segments or click the Yinyang <FaYinYang style={{ verticalAlign: 'middle', color: primaryTextColor }} /> symbol below to disable this mode.</Trans>;else header = t('No segments to export.');}diff --git a/src/components/ExportButton.jsx b/src/components/ExportButton.jsxindex c15f1631..4b466dc3 100644--- a/src/components/ExportButton.jsx+++ b/src/components/ExportButton.jsx@@ -7,34 +7,34 @@ import { primaryColor } from '../colors';import useUserSettings from '../hooks/useUserSettings';-const ExportButton = memo(({ selectedSegments, areWeCutting, onClick, size = 1 }) => {+const ExportButton = memo(({ segmentsToExport, areWeCutting, onClick, size = 1 }) => {const CutIcon = areWeCutting ? FiScissors : FaFileExport;const { t } = useTranslation();const { autoMerge } = useUserSettings();- let exportButtonTitle = t('Export');- if (selectedSegments.length === 1) {- exportButtonTitle = t('Export selection');- } else if (selectedSegments.length > 1) {- exportButtonTitle = t('Export {{ num }} segments', { num: selectedSegments.length });+ let title = t('Export');+ if (segmentsToExport.length === 1) {+ title = t('Export selection');+ } else if (segmentsToExport.length > 1) {+ title = t('Export {{ num }} segments', { num: segmentsToExport.length });}- const exportButtonText = autoMerge && selectedSegments && selectedSegments.length > 1 ? t('Export+merge') : t('Export');+ const text = autoMerge && segmentsToExport && segmentsToExport.length > 1 ? t('Export+merge') : t('Export');return (<div- style={{ cursor: 'pointer', background: primaryColor, borderRadius: size * 5, paddingTop: size * 1, paddingBottom: size * 2.5, paddingLeft: size * 7, paddingRight: size * 7, fontSize: size * 13, whiteSpace: 'nowrap' }}+ style={{ cursor: 'pointer', background: primaryColor, borderRadius: size * 5, paddingTop: size * 1, paddingBottom: size * 2.5, paddingLeft: size * 7, paddingRight: size * 7, fontSize: size * 13, whiteSpace: 'nowrap', opacity: segmentsToExport.length === 0 ? 0.5 : undefined }}onClick={onClick}- title={exportButtonTitle}+ title={title}role="button"><CutIconstyle={{ verticalAlign: 'middle', marginRight: size * 4 }}size={size * 15}/>- {exportButtonText}+ {text}</div>);});