mirror of
https://github.com/csd4ni3l/soundboard.git
synced 2026-04-17 16:07:22 +02:00
Compare commits
4 Commits
d8a7db6b78
...
latest
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aecba51e77 | ||
|
|
f7d6bb9d6b | ||
|
|
3aca3d7a4a | ||
|
|
6e19790c93 |
5
.github/workflows/main.yaml
vendored
5
.github/workflows/main.yaml
vendored
@@ -27,7 +27,7 @@ jobs:
|
||||
target
|
||||
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
|
||||
|
||||
- name: Install mold & clang (Linux)
|
||||
- name: Install mold, clang, Wayland, ALSA and x11 headers and dependencies (Linux)
|
||||
if: matrix.os == 'ubuntu-22.04'
|
||||
run: |
|
||||
sudo apt update
|
||||
@@ -36,7 +36,8 @@ jobs:
|
||||
libwayland-egl-backend-dev \
|
||||
libx11-dev libxext-dev libxrandr-dev libxinerama-dev libxcursor-dev \
|
||||
libxi-dev libxfixes-dev libxrender-dev \
|
||||
libfreetype6-dev libfontconfig1-dev libgl1-mesa-dev
|
||||
libfreetype6-dev libfontconfig1-dev libgl1-mesa-dev \
|
||||
libasound2-dev libudev-dev
|
||||
|
||||
shell: bash
|
||||
|
||||
|
||||
@@ -17,6 +17,10 @@ features = [
|
||||
"bevy_winit",
|
||||
]
|
||||
|
||||
[profile.dev.package."*"]
|
||||
opt-level = 2
|
||||
debug = false
|
||||
|
||||
[target.'cfg(target_os = "linux")'.dependencies.bevy]
|
||||
version = "0.17.3"
|
||||
features = ["wayland", "x11", "bevy_winit"]
|
||||
@@ -12,7 +12,7 @@ use bevy_egui::{
|
||||
EguiContextSettings, EguiContexts, EguiPlugin, EguiPrimaryContextPass, EguiStartupSet, egui,
|
||||
};
|
||||
|
||||
use rodio::{Decoder, OutputStream, OutputStreamBuilder, Sink, Source, cpal::{self, Device, Host, traits::HostTrait}};
|
||||
use rodio::{Decoder, OutputStream, OutputStreamBuilder, Sink, Source, cpal::{self, Device, Host, traits::HostTrait, traits::DeviceTrait}};
|
||||
|
||||
#[derive(Serialize, Deserialize)]
|
||||
struct JSONData {
|
||||
@@ -78,7 +78,8 @@ fn create_virtual_mic() -> OutputStream {
|
||||
}).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(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 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"));
|
||||
}
|
||||
|
||||
#[cfg(target_os = "linux")]
|
||||
|
||||
Reference in New Issue
Block a user