Skip to content

The swiss army knife of lossless video/audio editing

Address review: clearer setting label and description, tidy style

Claude25a8a8d91db1
diff --git a/locales/en/translation.json b/locales/en/translation.json
index 644817e6..5a35acbf 100644
--- a/locales/en/translation.json
+++ b/locales/en/translation.json
@@ -527,7 +527,7 @@
"None": "None",
"Normal cut": "Normal cut",
"Not all formats support all track types, and LosslessCut is unable to properly cut some track types, so you may have to sacrifice some tracks by disabling them in order to get correct result.": "Not all formats support all track types, and LosslessCut is unable to properly cut some track types, so you may have to sacrifice some tracks by disabling them in order to get correct result.",
- "Not applied in FFmpeg-assisted playback": "Not applied in FFmpeg-assisted playback",
+ "Not applied when FFmpeg renders the preview (FFmpeg-assisted playback or rotation preview)": "Not applied when FFmpeg renders the preview (FFmpeg-assisted playback or rotation preview)",
"Note that also other settings from the normal export dialog apply to this merge function. For more information about all options, see the export dialog.": "Note that also other settings from the normal export dialog apply to this merge function. For more information about all options, see the export dialog.",
"Note that depending on input parameters, up to {{estimatedMaxNumFiles}} files may be produced!": "Note that depending on input parameters, up to {{estimatedMaxNumFiles}} files may be produced!",
"Note that this is not supported in all video players.": "Note that this is not supported in all video players.",
@@ -865,7 +865,7 @@
"Variables": "Variables",
"video": "video",
"Video FPS": "Video FPS",
- "Video preview size": "Video preview size",
+ "Video preview scaling": "Video preview scaling",
"Video track": "Video track",
"Video tracks": "Video tracks",
"View": "View",
diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx
index d779bb25..43fe1743 100644
--- a/src/renderer/src/App.tsx
+++ b/src/renderer/src/App.tsx
@@ -202,9 +202,10 @@ function App() {
const { showGenericDialog, genericDialog, closeGenericDialog, confirmDialog, openExportFinishedDialog, openCutFinishedDialog, openConcatFinishedDialog, openCleanupFilesDialog, openShiftSegmentsDialog, openDecimateDialog } = useDialog();
// Note that each action may be multiple key bindings and this will only be the first binding for each action
- const mainVideoStyle = useMemo(() => ({ ...videoStyle, objectFit: videoFit }), [videoFit]);
const keyBindingByAction = useMemo(() => Object.fromEntries(keyBindings.map((binding) => [binding.action, binding])), [keyBindings]);
+ const mainVideoStyle = useMemo<CSSProperties>(() => ({ ...videoStyle, objectFit: videoFit }), [videoFit]);
+
const { working, setWorking, workingRef, abortWorking } = useLoading();
const { videoRef, videoContainerRef, playbackRate, setPlaybackRate, outputPlaybackRate, setOutputPlaybackRate, commandedTime, seekAbs, playingRef, getRelevantTime, setPlaying, onSeeked, relevantTime, onStartPlaying, setCommandedTime, setOutputPlaybackRateState, commandedTimeRef, onStopPlaying, onVideoAbort, playerTime, setPlayerTime, playbackMode, setPlaybackMode, playbackModeRef, playing, play, pause, seekRel } = useVideo({ filePath });
const { timecodePlaceholder, formatTimecode, parseTimecode, getFrameCount, promptTimecode } = useTimecode({ detectedFps, timecodeFormat, showGenericDialog });
diff --git a/src/renderer/src/components/Settings.tsx b/src/renderer/src/components/Settings.tsx
index e4571ad3..9d2b9b6b 100644
--- a/src/renderer/src/components/Settings.tsx
+++ b/src/renderer/src/components/Settings.tsx
@@ -483,8 +483,8 @@ function Settings({
{showAdvancedSettings && (
<Row>
<KeyCell>
- {t('Video preview size')}
- <div style={detailsStyle}>{t('Not applied in FFmpeg-assisted playback')}</div>
+ {t('Video preview scaling')}
+ <div style={detailsStyle}>{t('Not applied when FFmpeg renders the preview (FFmpeg-assisted playback or rotation preview)')}</div>
</KeyCell>
<td>
<Select value={videoFit} onChange={(e) => setVideoFit(e.target.value as Config['videoFit'])}>
diff --git a/src/renderer/src/styles.ts b/src/renderer/src/styles.ts
index 8d043d13..9356f689 100644
--- a/src/renderer/src/styles.ts
+++ b/src/renderer/src/styles.ts
@@ -2,5 +2,5 @@ import type { CSSProperties } from 'react';
import { controlsBackground, darkModeTransition } from './colors';
-export const videoStyle: CSSProperties = { width: '100%', height: '100%', objectFit: 'contain' };
+export const videoStyle: CSSProperties = { width: '100%', height: '100%' };
export const bottomStyle: CSSProperties = { background: controlsBackground, transition: darkModeTransition, flexShrink: 0 };