Compare commits

...

7 Commits

Author SHA1 Message Date
csd4ni3l
21d9f6c08b Code formatted by Zed automatically, added black fill color for
directory button that is currently selected, removed the current
directory text
2026-02-05 16:26:44 +01:00
csd4ni3l
abb7704e21 Fix typo 2026-01-25 15:55:09 +01:00
csd4ni3l
4d065525ff Fix Windows trying to use linux move_index_to_virtualmic func 2026-01-25 15:53:26 +01:00
csd4ni3l
73efdbd8b3 Add DeviceTrait to fix Windows not being able to access device name 2026-01-25 15:51:19 +01:00
csd4ni3l
caa4f7d2d0 Fix windows missing let keywords 2026-01-25 15:47:49 +01:00
csd4ni3l
a42c69c845 Separate Linux and Windows stuff (I have no idea if Windows even works), add automatic virtual mic support for apps on Linux (impossible on Windows) 2026-01-25 15:42:29 +01:00
csd4ni3l
d5a7dd624b Remove unused bevy features to remove bloat & reduce executable size by 32% (debug) 2026-01-23 21:13:22 +01:00
5 changed files with 318 additions and 930 deletions

819
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -13,8 +13,19 @@ serde_json = "1.0.146"
[dependencies.bevy]
version = "0.17.3"
default-features = false
features = [
"bevy_winit",
"bevy_log",
"bevy_window",
"bevy_winit",
"bevy_render",
"bevy_core_pipeline",
"bevy_sprite",
"bevy_text",
"bevy_ui",
"bevy_asset",
"bevy_picking",
"multi_threaded",
]
[profile.dev.package."*"]
@@ -22,5 +33,20 @@ opt-level = 2
debug = false
[target.'cfg(target_os = "linux")'.dependencies.bevy]
default-features = false
version = "0.17.3"
features = ["wayland", "x11", "bevy_winit"]
features = [
"bevy_log",
"bevy_window",
"bevy_winit",
"bevy_render",
"bevy_core_pipeline",
"bevy_sprite",
"bevy_text",
"bevy_ui",
"multi_threaded",
"bevy_asset",
"bevy_picking",
"wayland",
"x11"
]

108
src/linux_lib.rs Normal file
View File

@@ -0,0 +1,108 @@
use std::process::Command;
use serde_json::Value;
use rodio::{OutputStream, OutputStreamBuilder, cpal::{self, traits::HostTrait}};
fn pactl_list(sink_type: &str) -> Value {
let command_output = Command::new("pactl")
.args(&["-f", "json", "list", sink_type])
.output()
.expect("Failed to execute process");
if command_output.status.success() {
serde_json::from_str(str::from_utf8(&command_output.stdout).expect("Failed to convert to string")).expect("Failed to parse sink JSON output")
}
else {
Value::Null{}
}
}
pub fn get_device_by_index(sink_type: &str, index: String) -> Value {
let devices = pactl_list(sink_type);
for device in devices.as_array().unwrap_or(&vec![]) {
if device["index"].as_u64().expect("Device index is not a number").to_string() == index {
return device.clone();
}
}
return Value::Null{};
}
pub fn move_playback_to_sink() {
let sink_inputs = pactl_list("sink-inputs");
for device in sink_inputs.as_array().unwrap_or(&vec![]) {
if device["properties"]["node.name"] == "alsa_playback.soundboard" {
let index = device["index"].as_u64().expect("Device index is not a number").to_string();
Command::new("pactl")
.args(&["move-sink-input", index.as_str(), "VirtualMic"]) // as_str is needed here as you cannot instantly dereference a growing String (Rust...)
.output()
.expect("Failed to execute process");
}
}
}
pub fn list_outputs() -> Vec<(String, String)> {
let source_outputs = pactl_list("source-outputs");
return source_outputs.as_array().unwrap_or(&vec![]).iter().filter_map(|device| {
let app_name = device["properties"]["application.name"].as_str()?;
let binary = device["properties"]["application.process.binary"].as_str().unwrap_or("Unknown");
let index = device["index"].as_u64().expect("Device index is not a number").to_string();
Some((format!("{} ({})", app_name, binary), index))
}).collect();
}
pub fn move_index_to_virtualmic(index: String) {
Command::new("pactl")
.args(&["move-source-output", index.as_str(), "VirtualMicSource"]) // as_str is needed here as you cannot instantly dereference a growing String (Rust...)
.output()
.expect("Failed to execute process");
}
pub fn create_virtual_mic_linux() -> OutputStream {
// original_host = cpal::host_from_id(cpal::HostId::Alsa).expect("Could not initialize audio routing using ALSA");
// normal_output = original_host.default_output_device().expect("Could not get default output device");
Command::new("pactl")
.args(&["load-module", "module-null-sink", "sink_name=VirtualMic", "sink_properties=device.description=\"Virtual_Microphone\""])
.output()
.expect("Failed to execute process");
Command::new("pactl")
.args(&["load-module", "module-remap-source", "master=VirtualMic.monitor", "source_name=VirtualMicSource", "source_properties=device.description=\"Virtual_Mic_Source\""])
.output()
.expect("Failed to execute process");
Command::new("pactl")
.args(&["set-sink-volume", "VirtualMic", "100%"])
.output()
.expect("Failed to set sink volume");
Command::new("pactl")
.args(&["set-sink-volume", "VirtualMicSource", "100%"])
.output()
.expect("Failed to set sink volume");
let host = cpal::host_from_id(cpal::HostId::Alsa).expect("Could not initialize audio routing using ALSA"); // Alsa needed so pulse default works
let virtual_mic = host.default_output_device().expect("Could not get default output device");
let virtual_mic_stream = OutputStreamBuilder::from_device(virtual_mic).expect("Unable to open default audio device").open_stream().expect("Failed to open stream");
move_playback_to_sink();
return virtual_mic_stream;
// return (OutputStreamBuilder::from_device(normal_output).expect("Unable to open default audio device").open_stream().expect("Failed to open stream"), OutputStreamBuilder::from_device(virtual_mic).expect("Unable to open default audio device").open_stream().expect("Failed to open stream"));
}
pub fn reload_sound() {
let script = r#"
pactl list modules short | grep "Virtual_Microphone" | cut -f1 | xargs -L1 pactl unload-module
pactl list modules short | grep "Virtual_Mic_Source" | cut -f1 | xargs -L1 pactl unload-module
"#;
let output = Command::new("sh")
.arg("-c")
.arg(script)
.output()
.expect("Failed to execute process");
if output.status.success() {
println!("Modules unloaded successfully.");
} else {
println!("Error: {}", String::from_utf8_lossy(&output.stderr));
}
}

View File

@@ -1,19 +1,24 @@
use bevy::{
log::{Level, LogPlugin},
prelude::*,
};
use bevy::{log::Level, prelude::*};
use std::{collections::HashMap, fs::File, io::BufReader, path::Path, process::Command};
use std::{collections::HashMap, fs::File, io::BufReader, path::Path};
use serde::{Deserialize, Serialize};
use serde_json::Value;
use bevy_egui::{
EguiContextSettings, EguiContexts, EguiPlugin, EguiPrimaryContextPass, EguiStartupSet, egui,
use bevy_egui::{EguiContextSettings, EguiContexts, EguiPrimaryContextPass, EguiStartupSet, egui};
use egui::ecolor::Color32;
#[cfg(target_os = "linux")]
mod linux_lib;
#[cfg(target_os = "windows")]
mod windows_lib;
use rodio::{
Decoder, OutputStream, OutputStreamBuilder, Sink, Source,
cpal::{self, traits::HostTrait},
};
use rodio::{Decoder, OutputStream, OutputStreamBuilder, Sink, Source, cpal::{self, Device, Host, traits::HostTrait, traits::DeviceTrait}};
#[derive(Serialize, Deserialize)]
struct JSONData {
tabs: Vec<String>,
@@ -24,13 +29,13 @@ struct PlayingSound {
file_path: String,
length: f32,
virtual_sink: Sink,
// normal_sink: Sink
// normal_sink: Sink
}
struct SoundSystem {
virtual_mic_stream: OutputStream,
// normal_output_stream: OutputStream,
paused: bool
paused: bool,
}
#[derive(Resource)]
@@ -39,104 +44,57 @@ struct AppState {
json_data: JSONData,
current_directory: String,
currently_playing: Vec<PlayingSound>,
sound_system: SoundSystem
sound_system: SoundSystem,
virt_outputs: Vec<(String, String)>,
virt_output_index_switch: String,
virt_output_index: String,
}
const ALLOWED_FILE_EXTENSIONS: [&str; 4] = ["mp3", "wav", "flac", "ogg"];
fn move_playback_to_sink() {
let command_output = Command::new("pactl")
.args(&["-f", "json", "list", "sink-inputs"])
.output()
.expect("Failed to execute process");
if command_output.status.success() {
let sink_json: Value = serde_json::from_str(str::from_utf8(&command_output.stdout).expect("Failed to convert to string")).expect("Failed to parse sink JSON output");
for device in sink_json.as_array().unwrap_or(&vec![]) {
if device["properties"]["node.name"] == "alsa_playback.soundboard" {
let index = device["index"].as_u64().expect("Device index is not a number").to_string();
Command::new("pactl")
.args(&["move-sink-input", index.as_str(), "VirtualMic"]) // as_str is needed here as you cannot instantly dereference a growing String (Rust...)
.output()
.expect("Failed to execute process");
}
}
}
}
fn create_virtual_mic() -> OutputStream {
let host: Host;
// let original_host: Host;
// let normal_output: Device;
let virtual_mic: Device;
#[cfg(target_os = "windows")]
{
host = cpal::host_from_id(cpal::HostId::Wasapi).expect("Could not initialize audio routing using WasAPI");
virtual_mic = host.output_devices().expect("Could not list Output devices").find(|device| {
device.name().ok().map(|name|{
name.contains("CABLE Input") || name.contains("VB-Audio")
}).unwrap_or(false)
}).expect("Could not get default output device");
// normal_output = host.default_output_device().expect("Could not get default output device");
return OutputStreamBuilder::from_device(virtual_mic).expect("Unable to open default audio device").open_stream().expect("Failed to open stream");
// return (OutputStreamBuilder::from_device(normal_output).expect("Unable to open default audio device").open_stream().expect("Failed to open stream"), OutputStreamBuilder::from_device(virtual_mic).expect("Unable to open default audio device").open_stream().expect("Failed to open stream"));
}
return windows_lib::create_virtual_mic_windows();
#[cfg(target_os = "linux")]
{
// original_host = cpal::host_from_id(cpal::HostId::Alsa).expect("Could not initialize audio routing using ALSA");
// normal_output = original_host.default_output_device().expect("Could not get default output device");
return linux_lib::create_virtual_mic_linux();
Command::new("pactl")
.args(&["load-module", "module-null-sink", "sink_name=VirtualMic", "sink_properties=device.description=\"Virtual_Microphone\""])
.output()
.expect("Failed to execute process");
Command::new("pactl")
.args(&["load-module", "module-remap-source", "master=VirtualMic.monitor", "source_name=VirtualMicSource", "source_properties=device.description=\"Virtual_Mic_Source\""])
.output()
.expect("Failed to execute process");
host = cpal::host_from_id(cpal::HostId::Alsa).expect("Could not initialize audio routing using ALSA"); // Alsa needed so pulse default works
virtual_mic = host.default_output_device().expect("Could not get default output device");
let virtual_mic_stream = OutputStreamBuilder::from_device(virtual_mic).expect("Unable to open default audio device").open_stream().expect("Failed to open stream");
move_playback_to_sink();
return virtual_mic_stream;
// return (OutputStreamBuilder::from_device(normal_output).expect("Unable to open default audio device").open_stream().expect("Failed to open stream"), OutputStreamBuilder::from_device(virtual_mic).expect("Unable to open default audio device").open_stream().expect("Failed to open stream"));
}
#[allow(unreachable_code)] {
println!("Unknown/unsupported OS. Audio support may not work or may route to default output (headset, headphones, etc).");
host = cpal::default_host();
virtual_mic = host.default_output_device().expect("Could not get default output device");
return OutputStreamBuilder::from_device(virtual_mic).expect("Unable to open default audio device").open_stream().expect("Failed to open stream")
#[allow(unreachable_code)]
{
println!(
"Unknown/unsupported OS. Audio support may not work or may route to default output (headset, headphones, etc)."
);
let host = cpal::default_host();
let virtual_mic = host
.default_output_device()
.expect("Could not get default output device");
return OutputStreamBuilder::from_device(virtual_mic)
.expect("Unable to open default audio device")
.open_stream()
.expect("Failed to open stream");
// normal_output = host.default_output_device().expect("Could not get default output device");
// return (OutputStreamBuilder::from_device(normal_output).expect("Unable to open default audio device").open_stream().expect("Failed to open stream"), OutputStreamBuilder::from_device(virtual_mic).expect("Unable to open default audio device").open_stream().expect("Failed to open stream"));
}
}
fn reload_sound() -> OutputStream {
if cfg!(target_os = "linux"){
let script = r#"
pactl list modules short | grep "Virtual_Microphone" | cut -f1 | xargs -L1 pactl unload-module
pactl list modules short | grep "Virtual_Mic_Source" | cut -f1 | xargs -L1 pactl unload-module
"#;
#[cfg(target_os = "linux")]
linux_lib::reload_sound();
let output = Command::new("sh")
.arg("-c")
.arg(script)
.output()
.expect("Failed to execute process");
if output.status.success() {
println!("Modules unloaded successfully.");
} else {
println!("Error: {}", String::from_utf8_lossy(&output.stderr));
}
}
return create_virtual_mic();
}
fn list_outputs() -> Vec<(String, String)> {
#[cfg(target_os = "windows")]
return Vec::from([("Select in apps".to_string(), String::from("9999999"))]);
#[cfg(target_os = "linux")]
return linux_lib::list_outputs();
#[allow(unreachable_code)]
return Vec::new();
}
fn main() {
let virtual_mic_stream = create_virtual_mic();
// let (normal_output_stream, virtual_mic_stream) = create_virtual_mic();
@@ -145,7 +103,7 @@ fn main() {
.insert_resource(ClearColor(Color::BLACK))
.add_plugins(
DefaultPlugins
.set(LogPlugin {
.set(bevy::log::LogPlugin {
filter: "warn,ui=info".to_string(),
level: Level::INFO,
..Default::default()
@@ -159,7 +117,7 @@ fn main() {
..default()
}),
)
.add_plugins(EguiPlugin::default())
.add_plugins(bevy_egui::EguiPlugin::default())
.insert_resource(AppState {
loaded_files: HashMap::new(),
json_data: JSONData { tabs: Vec::new() },
@@ -168,8 +126,11 @@ fn main() {
sound_system: SoundSystem {
virtual_mic_stream,
// normal_output_stream,
paused: false
}
paused: false,
},
virt_outputs: Vec::new(),
virt_output_index_switch: String::from("0"),
virt_output_index: String::from("999"),
})
.add_systems(
PreStartup,
@@ -178,12 +139,28 @@ fn main() {
.add_systems(Startup, load_system)
.add_systems(
EguiPrimaryContextPass,
(ui_system, update_ui_scale_factor_system),
(ui_system, update_ui_scale_factor_system, update_virtualmic),
)
.run();
}
fn update_virtualmic(mut app_state: ResMut<AppState>) {
if app_state.virt_outputs.is_empty() {
return;
}
if app_state.virt_output_index != app_state.virt_output_index_switch {
app_state.virt_output_index = app_state.virt_output_index_switch.clone();
#[cfg(target_os = "linux")]
linux_lib::move_index_to_virtualmic(app_state.virt_output_index_switch.clone());
}
}
fn load_system(mut app_state: ResMut<AppState>) {
app_state.virt_outputs = list_outputs();
if !app_state.virt_outputs.is_empty() {
app_state.virt_output_index_switch = app_state.virt_outputs[0].1.clone();
}
load_data(&mut app_state);
}
@@ -209,7 +186,15 @@ fn load_data(app_state: &mut AppState) {
.filter_map(|entry| {
entry.ok().and_then(|e| {
let path = e.path();
if path.is_file() && ALLOWED_FILE_EXTENSIONS.contains(&path.extension().expect("Could not find extension").to_str().expect("Could not convert extension to string")) {
if path.is_file()
&& ALLOWED_FILE_EXTENSIONS.contains(
&path
.extension()
.unwrap_or_default()
.to_str()
.expect("Could not convert extension to string"),
)
{
path.to_str().map(|s| s.to_string())
} else {
None
@@ -227,9 +212,7 @@ fn setup_camera_system(mut commands: Commands) {
commands.spawn(Camera2d);
}
fn update_ui_scale_factor_system(
egui_context: Single<(&mut EguiContextSettings, &Camera)>,
) {
fn update_ui_scale_factor_system(egui_context: Single<(&mut EguiContextSettings, &Camera)>) {
let (mut egui_settings, camera) = egui_context.into_inner();
egui_settings.scale_factor = 1.5 / camera.target_scaling_factor().unwrap_or(1.5);
}
@@ -238,19 +221,21 @@ fn play_sound(file_path: String, app_state: &mut AppState) {
let virtual_file = File::open(&file_path).unwrap();
let virtual_src = Decoder::new(BufReader::new(virtual_file)).unwrap();
let virtual_sink = Sink::connect_new(&app_state.sound_system.virtual_mic_stream.mixer());
let length = virtual_src.total_duration().expect("Could not get source duration").as_secs_f32();
let length = virtual_src
.total_duration()
.expect("Could not get source duration")
.as_secs_f32();
virtual_sink.append(virtual_src);
virtual_sink.play();
// let normal_file = File::open(&file_path).unwrap();
// let normal_src = Decoder::new(BufReader::new(normal_file)).unwrap();
// let normal_sink = Sink::connect_new(&app_state.sound_system.normal_output_stream.mixer());
// let normal_sink = Sink::connect_new(&app_state.sound_system.normal_output_stream.mixer());
// normal_sink.append(normal_src);
// normal_sink.play();
app_state.currently_playing.push(PlayingSound {
file_path: file_path.clone(),
app_state.currently_playing.push(PlayingSound {
file_path: file_path.clone(),
length,
virtual_sink,
// normal_sink
@@ -269,11 +254,40 @@ fn ui_system(mut contexts: EguiContexts, mut app_state: ResMut<AppState>) -> Res
ui.separator();
let available_width = ui.available_width();
let available_height = ui.available_height();
let outputs = app_state.virt_outputs.clone();
let mut mic_name = "Select inside apps".to_string();
#[cfg(target_os = "linux")]
{
let output_index = app_state.virt_output_index.clone();
let output_device = linux_lib::get_device_by_index("source-outputs", output_index);
if let Some(app_name) = output_device["properties"]["application.name"].as_str() {
mic_name = app_name.to_string();
}
}
ui.label("Virtual Mic Output");
egui::ComboBox::from_id_salt("Virtual Mic Output")
.selected_text(mic_name)
.width(available_width)
.height(available_height / 15.0)
.show_ui(ui, |ui| {
for output in &outputs {
ui.selectable_value(
&mut app_state.virt_output_index_switch,
output.1.clone(),
output.0.clone(),
);
}
});
if ui
.add_sized(
[ui.available_width(), available_height / 15.0],
[available_width, available_height / 15.0],
egui::Button::new("Add folder"),
)
.clicked()
@@ -297,7 +311,7 @@ fn ui_system(mut contexts: EguiContexts, mut app_state: ResMut<AppState>) -> Res
if ui
.add_sized(
[ui.available_width(), available_height / 15.0],
[available_width, available_height / 15.0],
egui::Button::new("Reload content"),
)
.clicked()
@@ -308,7 +322,7 @@ fn ui_system(mut contexts: EguiContexts, mut app_state: ResMut<AppState>) -> Res
if ui
.add_sized(
[ui.available_width(), available_height / 15.0],
[available_width, available_height / 15.0],
egui::Button::new("Youtube downloader"),
)
.clicked()
@@ -318,7 +332,7 @@ fn ui_system(mut contexts: EguiContexts, mut app_state: ResMut<AppState>) -> Res
if ui
.add_sized(
[ui.available_width(), available_height / 15.0],
[available_width, available_height / 15.0],
egui::Button::new("Reload sound system"),
)
.clicked()
@@ -334,14 +348,18 @@ fn ui_system(mut contexts: EguiContexts, mut app_state: ResMut<AppState>) -> Res
ui.horizontal(|ui| {
if app_state.sound_system.paused {
ui.heading("Paused");
}
else {
} else {
ui.heading("Playing");
}
ui.vertical(|ui| {
for playing_sound in &app_state.currently_playing {
ui.label(format!("{} - {:.2} / {:.2}", playing_sound.file_path, playing_sound.virtual_sink.get_pos().as_secs_f32(), playing_sound.length));
ui.label(format!(
"{} - {:.2} / {:.2}",
playing_sound.file_path,
playing_sound.virtual_sink.get_pos().as_secs_f32(),
playing_sound.length
));
}
})
});
@@ -349,15 +367,22 @@ fn ui_system(mut contexts: EguiContexts, mut app_state: ResMut<AppState>) -> Res
egui::CentralPanel::default().show(ctx, |ui| {
let available_height = ui.available_height();
ui.horizontal(|ui| {
let available_width = ui.available_width();
let current_directories = app_state.loaded_files.keys().cloned().collect::<Vec<_>>();
for directory in current_directories.clone() {
let mut button = egui::Button::new(&directory);
if directory == app_state.current_directory {
button = button.fill(Color32::BLACK);
}
if ui
.add_sized(
[available_width / current_directories.len() as f32, available_height / 15.0],
egui::Button::new(&directory),
[
available_width / current_directories.len() as f32,
available_height / 15.0,
],
button,
)
.clicked()
{
@@ -366,10 +391,6 @@ fn ui_system(mut contexts: EguiContexts, mut app_state: ResMut<AppState>) -> Res
}
});
ui.add_space(available_height / 50.0);
ui.with_layout(egui::Layout::top_down(egui::Align::Center), |ui| {
ui.label(egui::RichText::new(format!("The current directory is {}", app_state.current_directory)).font(egui::FontId::proportional(20.0)));
});
ui.add_space(available_height / 50.0);
if app_state.current_directory.chars().count() > 0 {
let files = app_state
.loaded_files
@@ -380,10 +401,13 @@ fn ui_system(mut contexts: EguiContexts, mut app_state: ResMut<AppState>) -> Res
egui::ScrollArea::vertical().show(ui, |ui| {
for element in files {
if let Some(filename) = element.split("/").collect::<Vec<_>>().last() {
if ui.add_sized(
[ui.available_width(), available_height / 15.0],
egui::Button::new(*filename),
).clicked() {
if ui
.add_sized(
[ui.available_width(), available_height / 15.0],
egui::Button::new(*filename),
)
.clicked()
{
let path = Path::new(&app_state.current_directory)
.join(filename)
.to_string_lossy()
@@ -395,10 +419,10 @@ fn ui_system(mut contexts: EguiContexts, mut app_state: ResMut<AppState>) -> Res
});
}
});
app_state.currently_playing.retain(|playing_sound| {
playing_sound.virtual_sink.get_pos().as_secs_f32() <= (playing_sound.length - 0.01) // 0.01 offset needed here because of floating point errors and so its not exact
});
Ok(())
}
}

13
src/windows_lib.rs Normal file
View File

@@ -0,0 +1,13 @@
use rodio::{OutputStream, OutputStreamBuilder, cpal::{self, traits::HostTrait, traits::DeviceTrait}};
pub fn create_virtual_mic_windows() -> OutputStream {
let host = cpal::host_from_id(cpal::HostId::Wasapi).expect("Could not initialize audio routing using WasAPI");
let virtual_mic = host.output_devices().expect("Could not list Output devices").find(|device| {
device.name().ok().map(|name|{
name.contains("CABLE Input") || name.contains("VB-Audio")
}).unwrap_or(false)
}).expect("Could not get default output device");
// normal_output = host.default_output_device().expect("Could not get default output device");
return OutputStreamBuilder::from_device(virtual_mic).expect("Unable to open default audio device").open_stream().expect("Failed to open stream");
// return (OutputStreamBuilder::from_device(normal_output).expect("Unable to open default audio device").open_stream().expect("Failed to open stream"), OutputStreamBuilder::from_device(virtual_mic).expect("Unable to open default audio device").open_stream().expect("Failed to open stream"));
}