Skip to content

1.4.0 #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ardura merged 3 commits into from
Aug 22, 2025
Merged

1.4.0 #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02d0225
baseview and egui_file and nih_plug updates
ardura Aug 18, 2025
19d7687
audio export working
ardura Aug 22, 2025
cfcea80
Fix version number
ardura Aug 22, 2025
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
47 changes: 24 additions & 23 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "Actuate"
version = "1.3.91"
version = "1.4.0"
edition = "2021"
authors = ["Ardura <azviscarra@gmail.com>"]
license = "GPL-3.0-or-later"
Expand All @@ -18,11 +18,11 @@ hound = "3.5.0"
lazy_static = "1.4.0"

# Nih plug fork for actuate
nih_plug = { git = "https://github.com/Ardura/nih-plug.git", rev = "32e4e96d0d9820f28bcfd22a6cde4c05b5c71a51", features = ["assert_process_allocs"] }
nih_plug_egui = { git = "https://github.com/Ardura/nih-plug.git", rev = "32e4e96d0d9820f28bcfd22a6cde4c05b5c71a51" }
nih_plug = { git = "https://github.com/Ardura/nih-plug.git", rev = "ce77d8c6daeebcdcc15e84a178ddce617ee6a3d3", features = ["assert_process_allocs"] }
nih_plug_egui = { git = "https://github.com/Ardura/nih-plug.git", rev = "ce77d8c6daeebcdcc15e84a178ddce617ee6a3d3" }

# egui_file fork for nih-plug/Actuate
egui_file = { git = "https://github.com/Ardura/egui_file.git", rev = "409258b8858ac1fb881ae2b5e40ff6d4a5cd474a" }
egui_file = { git = "https://github.com/Barugon/egui_file.git", rev = "28a242a7e921144e9ac442cc00fad6eca01b59e6" }

num-complex = "0.4.4"
num-traits = "0.2.17"
Expand Down
70 changes: 67 additions & 3 deletions src/actuate_gui.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,13 @@ pub(crate) fn make_actuate_gui(instance: &mut Actuate, _async_executor: AsyncExe
let browse_preset_active: Arc<AtomicBool> = Arc::clone(&instance.browsing_presets);
let import_preset_active: Arc<AtomicBool> = Arc::clone(&instance.importing_presets);
let export_preset_active: Arc<AtomicBool> = Arc::clone(&instance.exporting_presets);
let export_last_sound: Arc<AtomicBool> = Arc::clone(&instance.export_last_sound);
let safety_clip_output: Arc<Mutex<bool>> = Arc::clone(&instance.safety_clip_output);
let hq_mode: Arc<AtomicBool> = Arc::clone(&instance.hq_mode);
let AM1: Arc<Mutex<AudioModule>> = Arc::clone(&instance.audio_module_1);
let AM2: Arc<Mutex<AudioModule>> = Arc::clone(&instance.audio_module_2);
let AM3: Arc<Mutex<AudioModule>> = Arc::clone(&instance.audio_module_3);
let recorder: Arc<Mutex<crate::recorder::Recorder>> = Arc::clone(&instance.recorder);

let update_current_preset: Arc<AtomicBool> = Arc::clone(&instance.update_current_preset);
let filter_select_outside: Arc<Mutex<UIBottomSelection>> =
Expand Down Expand Up @@ -175,6 +178,10 @@ pub(crate) fn make_actuate_gui(instance: &mut Actuate, _async_executor: AsyncExe
let ext = Some(OsStr::new("actuate"));
move |path: &Path| -> bool { path.extension() == ext }
});
let export_filter = Box::new({
let ext = Some(OsStr::new("wav"));
move |path: &Path| -> bool { path.extension() == ext }
});
let sample_filter = Box::new({
let ext = Some(OsStr::new("wav"));
move |path: &Path| -> bool { path.extension() == ext }
Expand Down Expand Up @@ -218,6 +225,25 @@ pub(crate) fn make_actuate_gui(instance: &mut Actuate, _async_executor: AsyncExe
}
)
);
let export_wav_dialog_main: Arc<Mutex<FileDialog>> = Arc::new(
Mutex::new(
if PathBuf::from((*default_dir.lock().unwrap().clone()).to_string()).exists() {
FileDialog::save_file(Some(PathBuf::from((*default_dir.lock().unwrap().clone()).to_string())))
//.current_pos([(WIDTH/4) as f32, 10.0])
.show_files_filter(export_filter)
.keep_on_top(true)
.show_new_folder(false)
.show_rename(false)
} else {
FileDialog::save_file(Some(home_dir.clone()))
//.current_pos([(WIDTH/4) as f32, 10.0])
.show_files_filter(export_filter)
.keep_on_top(true)
.show_new_folder(false)
.show_rename(false)
}
)
);

let load_sample_dialog: Arc<Mutex<FileDialog>> = Arc::new(
Mutex::new(
Expand Down Expand Up @@ -348,6 +374,8 @@ pub(crate) fn make_actuate_gui(instance: &mut Actuate, _async_executor: AsyncExe
}
if params.filter_cutoff_link.value() {
setter.set_parameter(&params.filter_cutoff_2, params.filter_cutoff.value());
// This is set again here so it doesn't mess up FL Automation when linked after modifying
setter.set_parameter(&params.filter_cutoff, params.filter_cutoff.value());
}

// Assign default colors
Expand Down Expand Up @@ -437,7 +465,7 @@ pub(crate) fn make_actuate_gui(instance: &mut Actuate, _async_executor: AsyncExe
ui.label(RichText::new("Actuate")
.font(FONT)
.color(FONT_COLOR))
.on_hover_text("v1.3.9 by Ardura!");
.on_hover_text("v1.4.0 by Ardura!");
ui.add_space(2.0);
ui.separator();

Expand Down Expand Up @@ -992,8 +1020,8 @@ pub(crate) fn make_actuate_gui(instance: &mut Actuate, _async_executor: AsyncExe
export_preset_active.store(true, Ordering::SeqCst);
}
if export_preset_active.load(Ordering::SeqCst) {
let save_dialock = save_dialog_main.clone();
let mut save_dialog = save_dialock.lock().unwrap();
let export_dialock = export_wav_dialog_main.clone();
let mut save_dialog = export_dialock.lock().unwrap();
save_dialog.open();
let mut dvar = Some(save_dialog);
if let Some(s_dialog) = &mut dvar {
Expand All @@ -1016,6 +1044,42 @@ pub(crate) fn make_actuate_gui(instance: &mut Actuate, _async_executor: AsyncExe
}
}
ui.checkbox(&mut safety_clip_output.lock().unwrap(), "Safety Clip").on_hover_text("Clip the output at 0dB to save your ears/speakers");
let hq_check = slim_checkbox::AtomicSlimCheckbox::new(&hq_mode, "HQ Rendering");
ui.add(hq_check);
let export_last_note_button = ui.button(RichText::new("Export Last Note")
.font(SMALLER_FONT)
.background_color(DARK_GREY_UI_COLOR)
.color(TEAL_GREEN)
);
if export_last_note_button.clicked() {
export_last_sound.store(true, Ordering::SeqCst);
}
if export_last_sound.load(Ordering::SeqCst) {
let save_dialock = save_dialog_main.clone();
let mut save_dialog = save_dialock.lock().unwrap();
save_dialog.open();
let mut dvar = Some(save_dialog);
if let Some(s_dialog) = &mut dvar {
if s_dialog.show(egui_ctx).selected() {
if let Some(file) = s_dialog.path() {
let saved_file = Some(file.to_path_buf());
let mut str_path = saved_file.unwrap_or_default().as_path().to_str().unwrap().to_string();
if !str_path.contains(".wav") {
str_path = str_path + ".wav"
}
let _ = recorder.lock().unwrap().export(&str_path);
export_last_sound.store(false, Ordering::SeqCst);
}
}

match s_dialog.state() {
State::Cancelled | State::Closed => {
export_last_sound.store(false, Ordering::SeqCst);
},
_ => {}
}
}
}
});
const KNOB_SIZE: f32 = 28.0;
const TEXT_SIZE: f32 = 11.0;
Expand Down
Loading
Loading