Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/chorus/gui.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,14 @@ use maolan_baseview::iced::{
use raw_window_handle::RawWindowHandle;
use raw_window_handle::{HandleError, HasWindowHandle, WindowHandle};

use maolan_widgets::knob::Knob;

use crate::{
chorus::{
params::{PARAMS, ParamId},
plugin::SharedState,
},
common::{
preset::{self, PresetProvider, PresetUi},
ui::{SmallKnob, small_knob},
},
common::preset::{self, PresetProvider, PresetUi},
};

pub const EDITOR_WIDTH: u32 = 420;
Expand Down Expand Up @@ -178,14 +177,15 @@ fn knob<'a>(id: ParamId, label: &'a str, state: &'a State) -> Element<'a, Messag
ParamId::Voices => format!("{value:.0}"),
};

small_knob(
SmallKnob {
maolan_widgets::knob::knob(
Knob {
label: label.to_string(),
value,
range: def.min as f32..=def.max as f32,
default: def.default as f32,
step: def.step as f32,
value_text,
assigned: false,
},
move |v| Message::ParamChanged(id, v),
Message::ParamReleased(id),
Expand Down
38 changes: 0 additions & 38 deletions src/common/ui.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ use maolan_baseview::iced::{
Alignment, Background, Border, Color, Element, Length, Theme,
widget::{column, container, text},
};
use maolan_widgets::arch_slider::arch_slider;
use maolan_widgets::meters;
use maolan_widgets::slider::Slider as VerticalSliderWidget;
use maolan_widgets::ticks;
Expand All @@ -13,43 +12,6 @@ const SIDE_FADER_WIDTH: f32 = 50.0;
const SIDE_TICKS_WIDTH: f32 = 25.0;
const SIDE_COLUMN_WIDTH: f32 = SIDE_FADER_WIDTH + SIDE_TICKS_WIDTH;

pub struct SmallKnob {
pub label: String,
pub value: f32,
pub range: std::ops::RangeInclusive<f32>,
pub default: f32,
pub step: f32,
pub value_text: String,
}

pub fn small_knob<Message: Clone + 'static>(
knob: SmallKnob,
on_change: impl Fn(f32) -> Message + 'static,
on_release: Message,
) -> Element<'static, Message> {
let min = *knob.range.start();
let max = *knob.range.end();
let slider = arch_slider(knob.range, knob.value.clamp(min, max), on_change)
.step(knob.step)
.double_click_reset(knob.default)
.on_release(on_release)
.fill_from_start()
.width(Length::Fixed(41.0))
.height(Length::Fixed(41.0));

container(
column![
text(knob.label).size(11),
slider,
text(knob.value_text).size(10)
]
.spacing(2)
.align_x(Alignment::Center),
)
.width(Length::Fixed(SIDE_FADER_WIDTH))
.into()
}

pub struct VerticalSlider {
pub value: f32,
pub range: std::ops::RangeInclusive<f32>,
Expand Down
9 changes: 6 additions & 3 deletions src/compressor/gui.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@ use std::{
time::Duration,
};

use maolan_widgets::knob::Knob;

use crate::common::{
bus,
preset::{self, PresetProvider, PresetUi},
spectrum::{
DEFAULT_SPECTRUM_BINS, SPECTRUM_FLOOR_DB, SpectralAnalyzerWidget, SpectrumMarker,
SpectrumThresholdCurve, display_range_bounds,
},
ui::{SmallKnob, VerticalSlider, small_knob, vertical_slider, vertical_ticks, vu_meter},
ui::{VerticalSlider, vertical_slider, vertical_ticks, vu_meter},
};

use maolan_baseview::iced::{
Expand Down Expand Up @@ -1249,14 +1251,15 @@ fn knob_with_range(
format!("{value:.1} {units}")
};

small_knob(
SmallKnob {
maolan_widgets::knob::knob(
Knob {
label: label.to_string(),
value,
range: min..=max,
default: def.default as f32,
step,
value_text,
assigned: false,
},
move |v| Message::SetParam(id, v.clamp(min, max)),
Message::ReleaseParam(id),
Expand Down
12 changes: 6 additions & 6 deletions src/deesser/gui.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ use maolan_clap::ffi::CLAP_WINDOW_API_X11;
use raw_window_handle::RawWindowHandle;
use raw_window_handle::{HandleError, HasWindowHandle, WindowHandle};

use maolan_widgets::knob::Knob;

use crate::{
common::{
preset::{self, PresetProvider, PresetUi},
ui::{SmallKnob, small_knob},
},
common::preset::{self, PresetProvider, PresetUi},
deesser::{
params::{PARAMS, ParamId},
plugin::SharedState,
Expand Down Expand Up @@ -200,14 +199,15 @@ fn knob(
format!("{value:.1} {units}")
};

small_knob(
SmallKnob {
maolan_widgets::knob::knob(
Knob {
label: label.to_string(),
value,
range: def.min as f32..=def.max as f32,
default: def.default as f32,
step,
value_text,
assigned: false,
},
move |v| Message::SetParam(id, v),
Message::ReleaseParam(id),
Expand Down
17 changes: 9 additions & 8 deletions src/delay/gui.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ use maolan_clap::ffi::CLAP_WINDOW_API_X11;
use raw_window_handle::RawWindowHandle;
use raw_window_handle::{HandleError, HasWindowHandle, WindowHandle};

use maolan_widgets::knob::Knob;

use crate::{
common::{
preset::{self, PresetProvider, PresetUi},
ui::{SmallKnob, small_knob},
},
common::preset::{self, PresetProvider, PresetUi},
delay::{
params::{NOTE_DIVISIONS, PARAMS, ParamId},
plugin::SharedState,
Expand Down Expand Up @@ -204,14 +203,15 @@ fn view(state: &State) -> Element<'_, Message> {
let def = &PARAMS[id.as_index()];
let value_text = format!("{value:.2}");

small_knob(
SmallKnob {
maolan_widgets::knob::knob(
Knob {
label: label.to_string(),
value,
range: def.min as f32..=def.max as f32,
default: def.default as f32,
step: 0.01,
value_text,
assigned: false,
},
move |v| Message::SetParam(id, v),
Message::ReleaseParam(id),
Expand All @@ -237,14 +237,15 @@ fn view(state: &State) -> Element<'_, Message> {
format!("{value:.0} ms")
};

small_knob(
SmallKnob {
maolan_widgets::knob::knob(
Knob {
label: label.to_string(),
value,
range: def.min as f32..=def.max as f32,
default: def.default as f32,
step: def.step as f32,
value_text,
assigned: false,
},
move |v| Message::SetParam(id, v),
Message::ReleaseParam(id),
Expand Down
14 changes: 9 additions & 5 deletions src/eq/gui.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
use maolan_widgets::knob::Knob;

use crate::common::{
bus,
preset::{self, PresetProvider, PresetUi},
spectrum::{db_to_y, display_range_bounds, freq_to_x, x_to_freq, y_to_db},
ui::{SmallKnob, VerticalSlider, small_knob, vertical_slider, vertical_ticks, vu_meter},
ui::{VerticalSlider, vertical_slider, vertical_ticks, vu_meter},
};
use crate::eq::dsp::{self, Biquad};
use crate::eq::params::{PARAMS, ParamId, ParamIdExt};
Expand Down Expand Up @@ -2725,14 +2727,15 @@ fn knob(
format!("{value:.1} {units}")
};

small_knob(
SmallKnob {
maolan_widgets::knob::knob(
Knob {
label,
value,
range: def.min as f32..=def.max as f32,
default: def.default as f32,
step,
value_text,
assigned: false,
},
move |v| Message::SetParam(id, v),
Message::ReleaseParam(id),
Expand Down Expand Up @@ -3195,14 +3198,15 @@ fn freq_knob(id: ParamId, value_hz: f32) -> Element<'static, Message> {
let value_norm = freq_to_norm(value_hz);
let default_norm = freq_to_norm(def.default as f32);

small_knob(
SmallKnob {
maolan_widgets::knob::knob(
Knob {
label: "Freq".to_string(),
value: value_norm,
range: 0.0..=1.0,
default: default_norm,
step: 0.001,
value_text: String::new(),
assigned: false,
},
move |n| Message::SetParam(id, norm_to_freq(n)),
Message::ReleaseParam(id),
Expand Down
9 changes: 6 additions & 3 deletions src/flanger/gui.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@ use maolan_baseview::iced::{
use raw_window_handle::RawWindowHandle;
use raw_window_handle::{HandleError, HasWindowHandle, WindowHandle};

use maolan_widgets::knob::Knob;

use crate::{
common::{
preset::{self, PresetProvider, PresetUi},
ui::{SmallKnob, VerticalSlider, small_knob, vertical_slider, vu_meter},
ui::{VerticalSlider, vertical_slider, vu_meter},
},
flanger::{
params::{FRACTION_NAMES, LFO_TYPE_NAMES, LFO2_TYPE_NAMES, PARAMS, PERIOD_NAMES, ParamId},
Expand Down Expand Up @@ -182,8 +184,8 @@ fn knob<'a>(id: ParamId, label: &'a str, state: &'a State) -> Element<'a, Messag
_ => format!("{value:.2}"),
};

small_knob(
SmallKnob {
maolan_widgets::knob::knob(
Knob {
label: label.to_string(),
value,
range: def.min as f32..=def.max as f32,
Expand All @@ -194,6 +196,7 @@ fn knob<'a>(id: ParamId, label: &'a str, state: &'a State) -> Element<'a, Messag
0.01
},
value_text,
assigned: false,
},
move |v| Message::ParamChanged(id, v),
Message::ParamReleased(id),
Expand Down
12 changes: 6 additions & 6 deletions src/formant/gui.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@ use maolan_baseview::iced::{
use raw_window_handle::RawWindowHandle;
use raw_window_handle::{HandleError, HasWindowHandle, WindowHandle};

use maolan_widgets::knob::Knob;

use crate::{
common::{
preset::{self, PresetProvider, PresetUi},
ui::{SmallKnob, small_knob},
},
common::preset::{self, PresetProvider, PresetUi},
formant::{
params::{PARAMS, ParamId},
plugin::SharedState,
Expand Down Expand Up @@ -177,14 +176,15 @@ fn knob<'a>(id: ParamId, label: &'a str, state: &'a State) -> Element<'a, Messag
ParamId::OutputGain => format!("{value:.1} dB"),
};

small_knob(
SmallKnob {
maolan_widgets::knob::knob(
Knob {
label: label.to_string(),
value,
range: def.min as f32..=def.max as f32,
default: def.default as f32,
step: def.step as f32,
value_text,
assigned: false,
},
move |v| Message::ParamChanged(id, v),
Message::ParamReleased(id),
Expand Down
11 changes: 6 additions & 5 deletions src/kick/gui/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ use maolan_clap::ffi::CLAP_WINDOW_API_X11;
use maolan_widgets::arch_slider::arch_slider;
use maolan_widgets::meters::meters;

use maolan_widgets::knob::Knob;

use crate::common::preset::{self, PresetProvider, PresetUi};
use crate::common::ui::{
FADER_MAX_DB, FADER_MIN_DB, SmallKnob, VerticalSlider, small_knob, vertical_slider,
};
use crate::common::ui::{FADER_MAX_DB, FADER_MIN_DB, VerticalSlider, vertical_slider};
#[cfg(any(
target_os = "windows",
target_os = "macos",
Expand Down Expand Up @@ -1446,14 +1446,15 @@ fn knob(
let def = param_type_def(id.param_type());
let value_text = knob_value_text(value, units);

small_knob(
SmallKnob {
maolan_widgets::knob::knob(
Knob {
label: label.to_string(),
value,
range: def.min as f32..=def.max as f32,
default: def.default as f32,
step,
value_text,
assigned: false,
},
move |v| Message::SetParam(id, v),
Message::ReleaseParam(id),
Expand Down
9 changes: 6 additions & 3 deletions src/limiter/gui.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,12 @@ use maolan_clap::ffi::CLAP_WINDOW_API_X11;
use raw_window_handle::RawWindowHandle;
use raw_window_handle::{HandleError, HasWindowHandle, WindowHandle};

use maolan_widgets::knob::Knob;

use crate::{
common::{
preset::{self, PresetProvider, PresetUi},
ui::{SmallKnob, VerticalSlider, small_knob, vertical_slider, vertical_ticks, vu_meter},
ui::{VerticalSlider, vertical_slider, vertical_ticks, vu_meter},
},
limiter::{
params::{PARAMS, ParamId},
Expand Down Expand Up @@ -731,14 +733,15 @@ fn knob(
}
};

small_knob(
SmallKnob {
maolan_widgets::knob::knob(
Knob {
label: label.to_string(),
value,
range: def.min as f32..=def.max as f32,
default: def.default as f32,
step,
value_text,
assigned: false,
},
move |v| Message::SetParam(id, v),
Message::ReleaseParam(id),
Expand Down
Loading
Loading