Skip to content

The truly free, open-source, local-first, cross-platform CapCut replacement. Scriptable through a JSON-RPC API & MCP.

Give the inspector CapCut's tabs, and an Adjust tab that adjusts colour

Jareer9a317023f3c2
diff --git a/engine/crates/concat-effects/packages/concat.adjust/effect.toml b/engine/crates/concat-effects/packages/concat.adjust/effect.toml
new file mode 100644
index 00000000..f74507a6
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.adjust/effect.toml
@@ -0,0 +1,120 @@
+[effect]
+id = "concat.adjust"
+name = "Adjust"
+kind = "filter"
+category = "Adjust"
+order = 0
+intensity = "exposure"
+description = "The manual colour panel every picture clip carries: exposure, tone, balance, sharpness and edge."
+
+# Exposure in stops; brightness, contrast and saturation as a signed
+# percent of the untouched picture; temperature in kelvin with 6500 the
+# picture as shot; tint green to magenta; shadows and highlights lift or
+# crush their end of the curve; sharpen, vignette and fade add from zero.
+
+[[param]]
+key = "exposure"
+label = "Exposure"
+min = -3
+max = 3
+default = 0
+step = 0.05
+unit = "EV"
+
+[[param]]
+key = "brightness"
+label = "Brightness"
+min = -100
+max = 100
+default = 0
+step = 1
+unit = "%"
+
+[[param]]
+key = "contrast"
+label = "Contrast"
+min = -100
+max = 100
+default = 0
+step = 1
+unit = "%"
+
+[[param]]
+key = "saturation"
+label = "Saturation"
+min = -100
+max = 100
+default = 0
+step = 1
+unit = "%"
+
+[[param]]
+key = "temperature"
+label = "Temperature"
+min = 2000
+max = 11000
+default = 6500
+step = 50
+unit = "K"
+
+[[param]]
+key = "tint"
+label = "Tint"
+min = -100
+max = 100
+default = 0
+step = 1
+unit = "%"
+
+[[param]]
+key = "shadows"
+label = "Shadows"
+min = -100
+max = 100
+default = 0
+step = 1
+unit = "%"
+
+[[param]]
+key = "highlights"
+label = "Highlights"
+min = -100
+max = 100
+default = 0
+step = 1
+unit = "%"
+
+[[param]]
+key = "sharpen"
+label = "Sharpen"
+min = 0
+max = 100
+default = 0
+step = 1
+unit = "%"
+
+[[param]]
+key = "vignette"
+label = "Vignette"
+min = 0
+max = 100
+default = 0
+step = 1
+unit = "%"
+
+[[param]]
+key = "fade"
+label = "Fade"
+min = 0
+max = 100
+default = 0
+step = 1
+unit = "%"
+
+[ffmpeg]
+let = [
+ "lift = fade / 100 * 0.25",
+ "low = clamp(0.25 + shadows / 100 * 0.18, 0.05, 0.45)",
+ "high = clamp(0.75 + highlights / 100 * 0.18, 0.55, 0.95)",
+]
+chain = "exposure=exposure={fixed(exposure, 2)},eq=brightness={fixed(brightness / 100 * 0.5, 3)}:contrast={fixed(1 + contrast / 100, 3)}:saturation={fixed(1 + saturation / 100 * 2, 3)},colortemperature=temperature={round(temperature)},colorbalance=gm={fixed(0 - tint / 100 * 0.5, 3)},curves=all='0/{fixed(lift, 3)} 0.25/{fixed(low, 3)} 0.75/{fixed(high, 3)} 1/1',unsharp=5:5:{fixed(sharpen / 100 * 2, 2)},vignette=a={fixed(vignette / 100 * 1.2, 3)}"
diff --git a/engine/crates/concat-effects/packages/concat.adjust/fixtures.toml b/engine/crates/concat-effects/packages/concat.adjust/fixtures.toml
new file mode 100644
index 00000000..32b55592
--- /dev/null
+++ b/engine/crates/concat-effects/packages/concat.adjust/fixtures.toml
@@ -0,0 +1,13 @@
+[[case]]
+name = "default is the picture as shot"
+chain = "exposure=exposure=0.00,eq=brightness=0.000:contrast=1.000:saturation=1.000,colortemperature=temperature=6500,colorbalance=gm=0.000,curves=all='0/0.000 0.25/0.250 0.75/0.750 1/1',unsharp=5:5:0.00,vignette=a=0.000"
+
+[[case]]
+name = "everything down"
+at = "min"
+chain = "exposure=exposure=-3.00,eq=brightness=-0.500:contrast=0.000:saturation=-1.000,colortemperature=temperature=2000,colorbalance=gm=0.500,curves=all='0/0.000 0.25/0.070 0.75/0.570 1/1',unsharp=5:5:0.00,vignette=a=0.000"
+
+[[case]]
+name = "everything up"
+at = "max"
+chain = "exposure=exposure=3.00,eq=brightness=0.500:contrast=2.000:saturation=3.000,colortemperature=temperature=11000,colorbalance=gm=-0.500,curves=all='0/0.250 0.25/0.430 0.75/0.930 1/1',unsharp=5:5:2.00,vignette=a=1.200"
diff --git a/engine/crates/concat/src/main.rs b/engine/crates/concat/src/main.rs
index 34c59e6f..d9472421 100644
--- a/engine/crates/concat/src/main.rs
+++ b/engine/crates/concat/src/main.rs
@@ -135,6 +135,7 @@ fn main() -> Result<(), slint::PlatformError> {
editor.set_applied_audio(ModelRc::from(models.applied_audio.clone()));
editor.set_visual_params(ModelRc::from(models.visual_params.clone()));
editor.set_audio_params(ModelRc::from(models.audio_params.clone()));
+ editor.set_adjust_params(ModelRc::from(models.adjust_params.clone()));
editor.set_menu_items(ModelRc::from(models.menu.clone()));
editor.set_av_items(ModelRc::from(models.av.clone()));
app.set_app_menu_items(ModelRc::from(models.bar.clone()));
@@ -675,6 +676,10 @@ fn main() -> Result<(), slint::PlatformError> {
}
));
+ editor.on_adjust_set(on_lanes!(|state, key: SharedString, value: f32| {
+ state.adjust_set(key.as_str(), value);
+ }));
+
// ── the monitor ──
editor.on_seek(on_lanes!(|state, seconds: f32| {
state.pause();
diff --git a/engine/crates/concat/src/studio.rs b/engine/crates/concat/src/studio.rs
index ab7e6b2f..c87be8df 100644
--- a/engine/crates/concat/src/studio.rs
+++ b/engine/crates/concat/src/studio.rs
@@ -391,6 +391,8 @@ pub struct Models {
pub applied_audio: Rc<VecModel<AppliedEntryData>>,
pub visual_params: Rc<VecModel<AppliedParamData>>,
pub audio_params: Rc<VecModel<AppliedParamData>>,
+ /// The colour panel's knobs.
+ pub adjust_params: Rc<VecModel<AppliedParamData>>,
pub menu: Rc<VecModel<MenuItemData>>,
pub av: Rc<VecModel<MenuItemData>>,
pub bar: Rc<VecModel<MenuItemData>>,
@@ -422,6 +424,7 @@ impl Models {
applied_audio: Rc::new(VecModel::default()),
visual_params: Rc::new(VecModel::default()),
audio_params: Rc::new(VecModel::default()),
+ adjust_params: Rc::new(VecModel::default()),
menu: Rc::new(VecModel::default()),
av: Rc::new(VecModel::default()),
bar: Rc::new(VecModel::default()),
@@ -590,6 +593,11 @@ fn shelves(kind: PackageKind) -> (Vec<SharedString>, Vec<CatalogueEntryData>) {
let mut entries = Vec::new();
for package in Catalogue::builtin().of_kind(kind) {
let meta = &package.manifest.effect;
+ // The colour panel's own package: every picture clip can carry it,
+ // and it has a tab, not a shelf.
+ if meta.id == ADJUST_ID {
+ continue;
+ }
let category = if meta.category.is_empty() {
"Other".to_owned()
} else {
@@ -627,12 +635,47 @@ fn format_of(unit: &str) -> ParamFormat {
"ms" => ParamFormat::Millis,
"st" => ParamFormat::Pitch,
"K" => ParamFormat::Kelvin,
+ "EV" => ParamFormat::Stops,
"°" => ParamFormat::Degrees,
"x" => ParamFormat::Rate,
_ => ParamFormat::Plain,
}
}
+/// The built-in colour package's id; see `adjust_rows` and `Studio::adjust_set`.
+const ADJUST_ID: &str = "concat.adjust";
+
+/// The colour panel's rows: the adjust package's parameters, at the values
+/// the clip's chain holds or at the defaults when the clip carries none.
+fn adjust_rows(chain: &[AppliedFilter]) -> Vec<AppliedParamData> {
+ let Some(package) = Catalogue::builtin().get(ADJUST_ID) else {
+ return Vec::new();
+ };
+ let held = chain.iter().find(|entry| entry.id == ADJUST_ID);
+ package
+ .manifest
+ .params
+ .iter()
+ .map(|param| AppliedParamData {
+ entry: -1,
+ key: param.key.as_str().into(),
+ label: param.label.as_str().into(),
+ min: param.min as f32,
+ max: param.max as f32,
+ step: if param.step > 0.0 {
+ param.step as f32
+ } else {
+ ((param.max - param.min) / 200.0) as f32
+ },
+ default_value: param.default as f32,
+ value: held
+ .and_then(|entry| entry.params.get(&param.key).copied())
+ .unwrap_or(param.default) as f32,
+ fmt: format_of(&param.unit),
+ })
+ .collect()
+}
+
/// A chain as the inspector's stack draws it: one row per link, and one per
/// knob its package declares, holding the document's value or the default.
/// A link no package answers to keeps its row - so it can be removed - and
@@ -655,6 +698,11 @@ fn chain_rows(chain: &[AppliedFilter]) -> (Vec<AppliedEntryData>, Vec<AppliedPar
known: package.is_some(),
});
let Some(package) = package else { continue };
+ // The adjust link shows as a link - it can be bypassed or removed
+ // here - but its knobs are the Adjust tab's, not the chain's.
+ if package.id() == ADJUST_ID {
+ continue;
+ }
for param in &package.manifest.params {
let step = if param.step > 0.0 {
param.step
@@ -1771,6 +1819,43 @@ impl Studio {
}
}
+ /// One knob of the colour panel, on the echo. The adjust package joins
+ /// the head of the picture's chain the first time a knob moves, so an
+ /// untouched clip carries nothing.
+ pub fn adjust_set(&mut self, key: &str, value: f32) {
+ let Some(id) = self.sole_selection() else {
+ return;
+ };
+ self.begin_echo();
+ let Some(clip) = self.echo_clip_mut(&id) else {
+ return;
+ };
+ if !clip.kind.is_visual() {
+ return;
+ }
+ let at = match clip
+ .video_effects
+ .iter()
+ .position(|entry| entry.id == ADJUST_ID)
+ {
+ Some(at) => at,
+ None => {
+ clip.video_effects.insert(
+ 0,
+ AppliedFilter {
+ id: ADJUST_ID.to_owned(),
+ params: std::collections::BTreeMap::new(),
+ enabled: true,
+ },
+ );
+ 0
+ }
+ };
+ clip.video_effects[at]
+ .params
+ .insert(key.to_owned(), f64::from(value));
+ }
+
// ── gestures ──
/// A press resolves the selection before anything moves, so a drag that
@@ -3504,6 +3589,13 @@ impl Studio {
sync(&models.visual_params, visual_params);
sync(&models.applied_audio, sound);
sync(&models.audio_params, sound_params);
+ sync(
+ &models.adjust_params,
+ match self.sole_selection().and_then(|id| self.clip(&id)) {
+ Some(clip) if clip.kind.is_visual() => adjust_rows(&clip.video_effects),
+ _ => Vec::new(),
+ },
+ );
}
/// The selection, flattened for the inspector: exactly one clip or
diff --git a/engine/crates/concat/ui/editor.slint b/engine/crates/concat/ui/editor.slint
index 83f27539..7f3c2c4c 100644
--- a/engine/crates/concat/ui/editor.slint
+++ b/engine/crates/concat/ui/editor.slint
@@ -112,6 +112,9 @@ export global Editor {
in-out property <[AppliedEntryData]> applied-audio;
in-out property <[AppliedParamData]> visual-params;
in-out property <[AppliedParamData]> audio-params;
+ /// The Adjust tab: the colour package's knobs for the selected clip.
+ in-out property <[AppliedParamData]> adjust-params;
+ callback adjust-set(key: string, value: float);
/// `audio` picks the chain: the sound's, or the picture's. A parameter
/// change lands on the echo and `clip-commit` makes it a command, the
/// same as every other inspector control.
diff --git a/engine/crates/concat/ui/inspector/clip-inspector.slint b/engine/crates/concat/ui/inspector/clip-inspector.slint
index 1d31e3d6..c34ecdf6 100644
--- a/engine/crates/concat/ui/inspector/clip-inspector.slint
+++ b/engine/crates/concat/ui/inspector/clip-inspector.slint
@@ -307,45 +307,30 @@ export component PresetStack inherits VerticalLayout {
}
}
-// The Adjust tab: what can be changed about the selected clip.
+// The clip's own tabs, one panel each. The tab strip follows the kind (see
+// config-pane): a still has picture but no sound, so it gets Video and not
+// Audio or Speed; a sound clip is the reverse. Every panel here is a set of
+// fields on the selected clip; the chains have their own stacks.
//
-// The panel adapts to the kind rather than the tab strip doing it all: a
-// still has picture but no sound, so it gets Transform and nothing else; an
-// audio clip has sound but no picture, so it gets everything but Transform.
-//
-// The fader for level works in decibels, not linear gain. Linear puts every
-// useful setting in the bottom sixth of the travel; decibels is both how the
-// ear works and how anyone mixing thinks.
-export component AdjustPanel inherits VerticalLayout {
+// Local editing state is assigned rather than bound. A control writes to its
+// own `value` as it is dragged, and an assignment in Slint replaces whatever
+// binding the parent declared on that property — so binding these straight
+// to `selected` would work exactly once and then go deaf to the model. They
+// are seeded instead, on init and whenever the selection changes under us.
+
+/// Video: how the picture sits in the frame, and how solid it is.
+export component VideoPanel inherits VerticalLayout {
in property <SelectedClipData> selected;
callback set(field: ClipField, value: float);
/// A control gesture finished: the accumulated change becomes one command.
callback commit();
- property <bool> has-picture: root.selected.kind == ClipKind.video
- || root.selected.kind == ClipKind.image;
- /// A still is picture only: no gain to set, nothing a fade could quieten.
- property <bool> has-sound: root.selected.kind != ClipKind.image;
- /// A fade longer than half the clip would overlap the other one.
- property <float> fade-limit: Math.max(0.1, Math.min(10, root.selected.duration / 2));
-
- // Local editing state, assigned rather than bound.
- //
- // A control writes to its own `value` as it is dragged, and an assignment
- // in Slint replaces whatever binding the parent declared on that property
- // — so binding these straight to `clip` would work exactly once and then
- // go deaf to the model. They are seeded instead, on init and whenever the
- // selection changes under us.
property <float> scale;
property <float> offset-x;
property <float> offset-y;
property <float> rotation;
property <float> alpha;
- property <float> level;
- property <float> speed;
- property <float> fade-in;
- property <float> fade-out;
function seed() {
root.scale = root.selected.scale;
@@ -353,19 +338,14 @@ export component AdjustPanel inherits VerticalLayout {
root.offset-y = root.selected.offset-y;
root.rotation = root.selected.rotation;
root.alpha = root.selected.opacity;
- root.level = InspectorFmt.to-decibels(root.selected.volume);
- root.speed = root.selected.speed;
- root.fade-in = root.selected.fade-in;
- root.fade-out = root.selected.fade-out;
}
init => { root.seed(); }
changed selected => { root.seed(); }
property <bool> transform-help;
- property <bool> speed-help;
- if root.has-picture: Section {
+ Section {
first: true;
transform := SectionHeader {
title: "Transform";
@@ -381,7 +361,8 @@ export component AdjustPanel inherits VerticalLayout {
if root.transform-help: Note {
text: "Scale and position are fractions of the output frame, so a"
- + " clip keeps its framing if the project is re-sized.";
+ + " clip keeps its framing if the project is re-sized. The"
+ + " same numbers move with the box on the monitor.";
}
Param {
@@ -424,7 +405,17 @@ export component AdjustPanel inherits VerticalLayout {
fmt: ParamFormat.degrees;
changed(v) => { root.set(ClipField.rotation, v); root.commit(); }
}
- Param {
+
+ }
+ }
+
+ Section {
+ blend := SectionHeader {
+ title: "Blend";
+ collapsible: true;
+ summary: "\{Math.round(root.alpha * 100)}%";
+ }
+ if blend.open: Param {
label: "Opacity";
value <=> root.alpha;
minimum: 0;
@@ -434,12 +425,39 @@ export component AdjustPanel inherits VerticalLayout {
fmt: ParamFormat.fraction;
changed(v) => { root.set(ClipField.opacity, v); root.commit(); }
}
+ }
+}
- }
+/// Audio: the level and the fades. The voice and room chain sits under it
+/// in the same tab; see config-pane.
+///
+/// The fader for level works in decibels, not linear gain. Linear puts every
+/// useful setting in the bottom sixth of the travel; decibels is both how the
+/// ear works and how anyone mixing thinks.
+export component AudioPanel inherits VerticalLayout {
+ in property <SelectedClipData> selected;
+
+ callback set(field: ClipField, value: float);
+ callback commit();
+
+ /// A fade longer than half the clip would overlap the other one.
+ property <float> fade-limit: Math.max(0.1, Math.min(10, root.selected.duration / 2));
+
+ property <float> level;
+ property <float> fade-in;
+ property <float> fade-out;
+
+ function seed() {
+ root.level = InspectorFmt.to-decibels(root.selected.volume);
+ root.fade-in = root.selected.fade-in;
+ root.fade-out = root.selected.fade-out;
}
- if root.has-sound: Section {
- first: !root.has-picture;
+ init => { root.seed(); }
+ changed selected => { root.seed(); }
+
+ Section {
+ first: true;
volume := SectionHeader {
title: "Volume";
collapsible: true;
@@ -464,7 +482,54 @@ export component AdjustPanel inherits VerticalLayout {
}
}
- if root.has-sound: Section {
+ Section {
+ fades := SectionHeader {
+ title: "Fades";
+ collapsible: true;
+ summary: (root.fade-in == 0 && root.fade-out == 0) ? "none"
+ : InspectorFmt.format(ParamFormat.seconds2, root.fade-in)
+ + " / " + InspectorFmt.format(ParamFormat.seconds2, root.fade-out);
+ }
+ if fades.open: VerticalLayout {
+ Param {
+ label: "Fade in";
+ value <=> root.fade-in;
+ minimum: 0;
+ maximum: root.fade-limit;
+ step: 0.05;
+ fmt: ParamFormat.seconds2;
+ changed(v) => { root.set(ClipField.fade-in, v); root.commit(); }
+ }
+ Param {
+ label: "Fade out";
+ value <=> root.fade-out;
+ minimum: 0;
+ maximum: root.fade-limit;
+ step: 0.05;
+ fmt: ParamFormat.seconds2;
+ changed(v) => { root.set(ClipField.fade-out, v); root.commit(); }
+ }
+ }
+ }
+}
+
+/// Speed: the rate, and whether pitch follows it. Curves come later and
+/// will live here too.
+export component SpeedPanel inherits VerticalLayout {
+ in property <SelectedClipData> selected;
+
+ callback set(field: ClipField, value: float);
+ callback commit();
+
+ property <float> speed;
+ function seed() { root.speed = root.selected.speed; }
+ init => { root.seed(); }
+ changed selected => { root.seed(); }
+
+ property <bool> speed-help;
+
+ Section {
+ first: true;
speed := SectionHeader {
title: "Speed";
collapsible: true;
@@ -507,34 +572,53 @@ export component AdjustPanel inherits VerticalLayout {
}
}
+}
- if root.has-sound: Section {
- fades := SectionHeader {
- title: "Fades";
- collapsible: true;
- summary: (root.fade-in == 0 && root.fade-out == 0) ? "none"
- : InspectorFmt.format(ParamFormat.seconds2, root.fade-in)
- + " / " + InspectorFmt.format(ParamFormat.seconds2, root.fade-out);
- }
- if fades.open: VerticalLayout {
- Param {
- label: "Fade in";
- value <=> root.fade-in;
- minimum: 0;
- maximum: root.fade-limit;
- step: 0.05;
- fmt: ParamFormat.seconds2;
- changed(v) => { root.set(ClipField.fade-in, v); root.commit(); }
- }
- Param {
- label: "Fade out";
- value <=> root.fade-out;
- minimum: 0;
- maximum: root.fade-limit;
- step: 0.05;
- fmt: ParamFormat.seconds2;
- changed(v) => { root.set(ClipField.fade-out, v); root.commit(); }
+/// Adjust: the manual colour panel. Every knob is a parameter of the one
+/// built-in `concat.adjust` package, which Rust puts at the head of the
+/// picture's chain the first time a knob moves; until then the rows show the
+/// package's defaults, which are the picture as shot. The rows come from the
+/// manifest, so a knob added there appears here without a line of UI.
+export component AdjustPanel inherits VerticalLayout {
+ in property <[AppliedParamData]> params;
+
+ callback set(key: string, value: float);
+ callback commit();
+
+ property <bool> help;
+
+ Section {
+ first: true;
+ SectionHeader {
+ title: "Colour";
+ HelpButton {
+ open: root.help;
+ toggled => { root.help = self.open; }
+ }
}
+
+ if root.help: Note {
+ text: "Exposure is in stops; the rest is a signed percent of the"
+ + " picture as shot, and zero everywhere is the picture as"
+ + " shot. Double-click a knob to put it back.";
+ }
+
+ // See PresetStack for why each row re-seeds its knob.
+ for p in root.params: Rectangle {
+ property <AppliedParamData> data: p;
+ height: knob.preferred-height;
+ changed data => { knob.value = self.data.value; }
+
+ knob := Param {
+ label: p.label;
+ value: p.value;
+ minimum: p.min;
+ maximum: p.max;
+ step: p.step;
+ default-value: p.default-value;
+ fmt: p.fmt;
+ changed(v) => { root.set(p.key, v); root.commit(); }
+ }
}
}
}
diff --git a/engine/crates/concat/ui/inspector/controls.slint b/engine/crates/concat/ui/inspector/controls.slint
index 2469ae23..8d5d4983 100644
--- a/engine/crates/concat/ui/inspector/controls.slint
+++ b/engine/crates/concat/ui/inspector/controls.slint
@@ -42,6 +42,7 @@ export enum ParamFormat {
// named in a unit nothing above spells.
plain, // "1.25", or "12" when it is whole
kelvin, // "4600 K"
+ stops, // "+0.50 EV", "0.00 EV"
}
export global InspectorFmt {
@@ -108,6 +109,9 @@ export global InspectorFmt {
: InspectorFmt.fixed2(v);
}
if (fmt == ParamFormat.kelvin) { return "\{Math.round(v)} K"; }
+ if (fmt == ParamFormat.stops) {
+ return (v > 0 ? "+" : "") + InspectorFmt.fixed2(v) + " EV";
+ }
return v == 0 ? "none" : InspectorFmt.fixed1(v) + " s";
}
diff --git a/engine/crates/concat/ui/workspace/config-pane.slint b/engine/crates/concat/ui/workspace/config-pane.slint
index 86aeaf0f..eaeb0799 100644
--- a/engine/crates/concat/ui/workspace/config-pane.slint
+++ b/engine/crates/concat/ui/workspace/config-pane.slint
@@ -6,8 +6,8 @@ import { Pane, PaneBody, PaneScroll } from "pane.slint";
import { PaneKind, PaneSwitcher } from "pane-switcher.slint";
import { EffectData } from "../demo/effects-panel.slint";
import {
- AdjustPanel, AppliedEntryData, AppliedParamData, CatalogueEntryData,
- FilterPanel, PresetStack,
+ AdjustPanel, AppliedEntryData, AppliedParamData, AudioPanel,
+ CatalogueEntryData, FilterPanel, PresetStack, SpeedPanel, VideoPanel,
} from "../inspector/clip-inspector.slint";
import { TextPanel } from "../inspector/text-panel.slint";
import {
@@ -136,6 +136,10 @@ export component ConfigPane inherits Rectangle {
in property <[AppliedEntryData]> applied-audio;
in property <[AppliedParamData]> visual-params;
in property <[AppliedParamData]> audio-params;
+ /// The colour panel's knobs: the adjust package's parameters, at the
+ /// selected clip's values or the defaults.
+ in property <[AppliedParamData]> adjust-params;
+ callback adjust-set(key: string, value: float);
callback chain-add(audio: bool, id: string);
callback chain-toggle(audio: bool, index: int);
@@ -166,9 +170,9 @@ export component ConfigPane inherits Rectangle {
property <bool> is-layer: root.selected.kind == ClipKind.filter;
property <[string]> tabs: root.is-text ? ["Text"]
: root.is-layer ? ["Filter"]
- : root.is-image ? ["Adjust", "Filters", "Effects"]
- : root.is-audio ? ["Adjust", "Audio"]
- : ["Adjust", "Audio", "Filters", "Effects"];
+ : root.is-image ? ["Video", "Adjust", "Filters", "Effects"]
+ : root.is-audio ? ["Audio", "Speed"]
+ : ["Video", "Audio", "Speed", "Adjust", "Filters", "Effects"];
/// A one-segment segmented control is a label wearing a costume, so a lone
/// tab renders as the panel's plain heading instead.
property <bool> single: root.tabs.length < 2;
@@ -382,12 +386,24 @@ export component ConfigPane inherits Rectangle {
padding: 0px;
PaneScroll {
- if root.showing == "Adjust": AdjustPanel {
+ if root.showing == "Video": VideoPanel {
selected: root.selected;
set(field, value) => { root.clip-set(field, value); }
commit => { root.clip-commit(); }
}
+ if root.showing == "Speed": SpeedPanel {
+ selected: root.selected;
+ set(field, value) => { root.clip-set(field, value); }
+ commit => { root.clip-commit(); }
+ }
+
+ if root.showing == "Adjust": AdjustPanel {
+ params: root.adjust-params;
+ set(key, value) => { root.adjust-set(key, value); }
+ commit => { root.clip-commit(); }
+ }
+
if root.showing == "Filter": FilterPanel {
selected: root.selected;
set(field, value) => { root.clip-set(field, value); }
@@ -402,22 +418,31 @@ export component ConfigPane inherits Rectangle {
commit => { root.clip-commit(); }
}
- if root.showing == "Audio": PresetStack {
- noun: "audio effect";
- library-title: "Audio effects";
- group-labels: root.audio-groups;
- catalogue: root.catalogue-audio;
- applied: root.applied-audio;
- params: root.audio-params;
-
- add(id) => { root.chain-add(true, id); }
- toggle(index) => { root.chain-toggle(true, index); }
- move-by(index, delta) => { root.chain-move-by(true, index, delta); }
- remove(index) => { root.chain-remove(true, index); }
- set-param(index, key, value) => {
- root.chain-set-param(true, index, key, value);
+ // Audio: the level and fades, then the voice and room chain
+ // under them, as CapCut's audio tab has it.
+ if root.showing == "Audio": VerticalLayout {
+ AudioPanel {
+ selected: root.selected;
+ set(field, value) => { root.clip-set(field, value); }
+ commit => { root.clip-commit(); }
+ }
+ PresetStack {
+ noun: "audio effect";
+ library-title: "Audio effects";
+ group-labels: root.audio-groups;
+ catalogue: root.catalogue-audio;
+ applied: root.applied-audio;
+ params: root.audio-params;
+
+ add(id) => { root.chain-add(true, id); }
+ toggle(index) => { root.chain-toggle(true, index); }
+ move-by(index, delta) => { root.chain-move-by(true, index, delta); }
+ remove(index) => { root.chain-remove(true, index); }
+ set-param(index, key, value) => {
+ root.chain-set-param(true, index, key, value);
+ }
+ commit => { root.clip-commit(); }
}
- commit => { root.clip-commit(); }
}
// Filters and Effects share one chain — a look and a blur
diff --git a/engine/crates/concat/ui/workspace/seat.slint b/engine/crates/concat/ui/workspace/seat.slint
index 5d3ef79d..a0d44f16 100644
--- a/engine/crates/concat/ui/workspace/seat.slint
+++ b/engine/crates/concat/ui/workspace/seat.slint
@@ -185,6 +185,8 @@ export component Seat inherits Rectangle {
applied-audio: Editor.applied-audio;
visual-params: Editor.visual-params;
audio-params: Editor.audio-params;
+ adjust-params: Editor.adjust-params;
+ adjust-set(key, value) => { Editor.adjust-set(key, value); }
chain-add(audio, id) => { Editor.chain-add(audio, id); }
chain-toggle(audio, index) => { Editor.chain-toggle(audio, index); }
chain-move-by(audio, index, delta) => { Editor.chain-move-by(audio, index, delta); }