Skip to content

fix: bug with stream building on MacOS #996

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

Closed
Ada-lave wants to merge 7 commits into from
Closed

fix: bug with stream building on MacOS #996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
164cc3e
fix: bug with stream building
Ada-lave Mar 2, 2026
c2dbcd5
feat: up version
Ada-lave Mar 2, 2026
0923438
cargo fmt
Ada-lave Mar 2, 2026
87a91b6
fix clippy lint
Ada-lave Mar 2, 2026
605c43d
fix: clippy fix
Ada-lave Mar 2, 2026
f272d21
cargo fmt
Ada-lave Mar 2, 2026
1788633
fix
Ada-lave Mar 2, 2026
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
136 changes: 95 additions & 41 deletions desktop/src-tauri/src/cmd/audio.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,12 @@ pub async fn start_record(
tracing::debug!("Device ID: {}", device.id);

let is_input = device.is_input;
let device_id: usize = device.id.parse().context("Failed to parse device ID")?;
let device = host.devices()?.nth(device_id).context("Failed to get device by ID")?;
let device_name = device.name.clone();
let device = host
.devices()?
.find(|d| d.description().ok().map(|desc| desc.name() == device_name).unwrap_or(false))
.with_context(|| format!("Audio device '{}' is no longer available.", device_name))?;

let config = if is_input {
device.default_input_config().context("Failed to get default input config")?
} else {
Expand All @@ -100,47 +104,97 @@ pub async fn start_record(
tracing::error!("An error occurred on stream: {}", err);
};

let stream = match config.sample_format() {
cpal::SampleFormat::I8 => device.build_input_stream(
&config.into(),
move |data, _: &_| {
tracing::trace!("Writing input data (I8)");
write_input_data::<i8, i8>(data, &writer_2)
},
err_fn,
None,
)?,
cpal::SampleFormat::I16 => device.build_input_stream(
&config.into(),
move |data, _: &_| {
tracing::trace!("Writing input data (I16)");
write_input_data::<i16, i16>(data, &writer_2)
},
err_fn,
None,
)?,
cpal::SampleFormat::I32 => device.build_input_stream(
&config.into(),
move |data, _: &_| {
tracing::trace!("Writing input data (I32)");
write_input_data::<i32, i32>(data, &writer_2)
},
err_fn,
None,
)?,
cpal::SampleFormat::F32 => device.build_input_stream(
&config.into(),
move |data, _: &_| {
tracing::trace!("Writing input data (F32)");
write_input_data::<f32, f32>(data, &writer_2)
},
err_fn,
None,
)?,
sample_format => {
bail!("Unsupported sample format '{}'", sample_format)
let build_result = if is_input {
match config.sample_format() {
cpal::SampleFormat::I8 => device.build_input_stream(
&config.into(),
move |data, _: &_| {
tracing::trace!("Writing input data (I8)");
write_input_data::<i8, i8>(data, &writer_2)
},
err_fn,
None,
),
cpal::SampleFormat::I16 => device.build_input_stream(
&config.into(),
move |data, _: &_| {
tracing::trace!("Writing input data (I16)");
write_input_data::<i16, i16>(data, &writer_2)
},
err_fn,
None,
),
cpal::SampleFormat::I32 => device.build_input_stream(
&config.into(),
move |data, _: &_| {
tracing::trace!("Writing input data (I32)");
write_input_data::<i32, i32>(data, &writer_2)
},
err_fn,
None,
),
cpal::SampleFormat::F32 => device.build_input_stream(
&config.into(),
move |data, _: &_| {
tracing::trace!("Writing input data (F32)");
write_input_data::<f32, f32>(data, &writer_2)
},
err_fn,
None,
),
sample_format => {
bail!("Unsupported sample format '{}'", sample_format)
}
}
} else {
match config.sample_format() {
cpal::SampleFormat::I8 => device.build_output_stream(
&config.into(),
move |data, _: &_| {
tracing::trace!("Capturing output data (I8)");
write_input_data::<i8, i8>(data, &writer_2)
},
err_fn,
None,
),
cpal::SampleFormat::I16 => device.build_output_stream(
&config.into(),
move |data, _: &_| {
tracing::trace!("Capturing output data (I16)");
write_input_data::<i16, i16>(data, &writer_2)
},
err_fn,
None,
),
cpal::SampleFormat::I32 => device.build_output_stream(
&config.into(),
move |data, _: &_| {
tracing::trace!("Capturing output data (I32)");
write_input_data::<i32, i32>(data, &writer_2)
},
err_fn,
None,
),
cpal::SampleFormat::F32 => device.build_output_stream(
&config.into(),
move |data, _: &_| {
tracing::trace!("Capturing output data (F32)");
write_input_data::<f32, f32>(data, &writer_2)
},
err_fn,
None,
),
sample_format => {
bail!("Unsupported sample format '{}'", sample_format)
}
}
};
let stream = build_result.with_context(|| {
format!(
"Failed to open audio stream for device '{}'. The device may have been disconnected or is in use by another application. Try re-selecting the device.",
device_name
)
})?;
stream.play()?;
tracing::debug!("Stream started playing");

Expand Down
2 changes: 1 addition & 1 deletion desktop/src-tauri/tauri.conf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "./gen/schemas/desktop-schema.json",
"productName": "vibe",
"version": "3.0.15",
"version": "3.0.16",
"identifier": "github.zerozr99.workers.dev.thewh1teagle.vibe",
"app": {
"windows": [],
Expand Down
Loading