Skip to content

Commit

Permalink
Fix audio-dump feature build
Browse files Browse the repository at this point in the history 
A typo prevented the audio-dump members from being compiled.
A cubeb-backend update is also needed to get the dump types.
  • Loading branch information
@Pehrsons @padenot
Pehrsons authored and padenot committed May 15, 2024
1 parent 4ca174c commit d892b0a
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ crate-type = ["staticlib", "rlib"]
atomic = "0.4"
bitflags = "2"
coreaudio-sys-utils = { path = "coreaudio-sys-utils" }
cubeb-backend = "0.12.0"
cubeb-backend = "0.13"
float-cmp = "0.6"
libc = "0.2"
lazy_static = "1.2"
Expand Down
48 changes: 24 additions & 24 deletions src/backend/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ use self::mixer::*;
use self::resampler::*;
use self::utils::*;
use backend::ringbuf::RingBuffer;
#[cfg(feature = "audio_dump")]
#[cfg(feature = "audio-dump")]
use cubeb_backend::ffi::cubeb_audio_dump_stream_t;
use cubeb_backend::{
ffi, ChannelLayout, Context, ContextOps, DeviceCollectionRef, DeviceId, DeviceRef, DeviceType,
Expand Down Expand Up @@ -116,7 +116,7 @@ lazy_static! {
};
}

#[cfg(feature = "audio_dump")]
#[cfg(feature = "audio-dump")]
fn dump_audio(stream: cubeb_audio_dump_stream_t, audio_samples: *mut c_void, count: u32) {
unsafe {
let rv = ffi::cubeb_audio_dump_write(stream, audio_samples, count);
Expand Down Expand Up @@ -569,7 +569,7 @@ extern "C" fn audiounit_input_callback(
} else {
assert_eq!(status, NO_ERR);

#[cfg(feature = "audio_dump")]
#[cfg(feature = "audio-dump")]
{
dump_audio(
stm.core_stream_data.audio_dump_input,
Expand Down Expand Up @@ -735,7 +735,7 @@ extern "C" fn audiounit_output_callback(
if stm.stopped.load(Ordering::SeqCst) {
cubeb_alog!("({:p}) output stopped.", stm as *const AudioUnitStream);
audiounit_make_silent(&buffers[0]);
#[cfg(feature = "audio_dump")]
#[cfg(feature = "audio-dump")]
{
dump_audio(
stm.core_stream_data.audio_dump_output,
Expand All @@ -754,7 +754,7 @@ extern "C" fn audiounit_output_callback(
stm.notify_state_changed(State::Drained);
let queue = stm.queue.clone();
audiounit_make_silent(&buffers[0]);
#[cfg(feature = "audio_dump")]
#[cfg(feature = "audio-dump")]
{
dump_audio(
stm.core_stream_data.audio_dump_output,
Expand Down Expand Up @@ -891,7 +891,7 @@ extern "C" fn audiounit_output_callback(
let queue = stm.queue.clone();
audiounit_make_silent(&buffers[0]);

#[cfg(feature = "audio_dump")]
#[cfg(feature = "audio-dump")]
{
dump_audio(
stm.core_stream_data.audio_dump_output,
Expand Down Expand Up @@ -951,7 +951,7 @@ extern "C" fn audiounit_output_callback(
);
}

#[cfg(feature = "audio_dump")]
#[cfg(feature = "audio-dump")]
{
dump_audio(
stm.core_stream_data.audio_dump_output,
Expand Down Expand Up @@ -3071,13 +3071,13 @@ struct CoreStreamData<'ctx> {
output_alive_listener: Option<device_property_listener>,
output_source_listener: Option<device_property_listener>,
input_logging: Option<InputCallbackLogger>,
#[cfg(feature = "audio_dump")]
#[cfg(feature = "audio-dump")]
audio_dump_session: ffi::cubeb_audio_dump_session_t,
#[cfg(feature = "audio_dump")]
#[cfg(feature = "audio-dump")]
audio_dump_session_running: bool,
#[cfg(feature = "audio_dump")]
#[cfg(feature = "audio-dump")]
audio_dump_input: ffi::cubeb_audio_dump_stream_t,
#[cfg(feature = "audio_dump")]
#[cfg(feature = "audio-dump")]
audio_dump_output: ffi::cubeb_audio_dump_stream_t,
}

Expand Down Expand Up @@ -3119,13 +3119,13 @@ impl<'ctx> Default for CoreStreamData<'ctx> {
output_alive_listener: None,
output_source_listener: None,
input_logging: None,
#[cfg(feature = "audio_dump")]
#[cfg(feature = "audio-dump")]
audio_dump_session: ptr::null_mut(),
#[cfg(feature = "audio_dump")]
#[cfg(feature = "audio-dump")]
audio_dump_session_running: false,
#[cfg(feature = "audio_dump")]
#[cfg(feature = "audio-dump")]
audio_dump_input: ptr::null_mut(),
#[cfg(feature = "audio_dump")]
#[cfg(feature = "audio-dump")]
audio_dump_output: ptr::null_mut(),
}
}
Expand Down Expand Up @@ -3174,13 +3174,13 @@ impl<'ctx> CoreStreamData<'ctx> {
output_alive_listener: None,
output_source_listener: None,
input_logging: None,
#[cfg(feature = "audio_dump")]
#[cfg(feature = "audio-dump")]
audio_dump_session: ptr::null_mut(),
#[cfg(feature = "audio_dump")]
#[cfg(feature = "audio-dump")]
audio_dump_session_running: false,
#[cfg(feature = "audio_dump")]
#[cfg(feature = "audio-dump")]
audio_dump_input: ptr::null_mut(),
#[cfg(feature = "audio_dump")]
#[cfg(feature = "audio-dump")]
audio_dump_output: ptr::null_mut(),
}
}
Expand Down Expand Up @@ -3539,7 +3539,7 @@ impl<'ctx> CoreStreamData<'ctx> {
assert!(!self.stm_ptr.is_null());
let stream = unsafe { &(*self.stm_ptr) };

#[cfg(feature = "audio_dump")]
#[cfg(feature = "audio-dump")]
unsafe {
ffi::cubeb_audio_dump_init(&mut self.audio_dump_session);
}
Expand Down Expand Up @@ -3633,7 +3633,7 @@ impl<'ctx> CoreStreamData<'ctx> {
e
})?;

#[cfg(feature = "audio_dump")]
#[cfg(feature = "audio-dump")]
{
let name = format!("input-{:p}.wav", self.stm_ptr);
let cname = CString::new(name).expect("OK");
Expand Down Expand Up @@ -3849,7 +3849,7 @@ impl<'ctx> CoreStreamData<'ctx> {
e
})?;

#[cfg(feature = "audio_dump")]
#[cfg(feature = "audio-dump")]
{
let name = format!("output-{:p}.wav", self.stm_ptr);
let cname = CString::new(name).expect("OK");
Expand Down Expand Up @@ -4038,7 +4038,7 @@ impl<'ctx> CoreStreamData<'ctx> {
self.input_logging = Some(InputCallbackLogger::new());
}

#[cfg(feature = "audio_dump")]
#[cfg(feature = "audio-dump")]
{
unsafe { ffi::cubeb_audio_dump_start(self.audio_dump_session) };
self.audio_dump_session_running = true;
Expand Down Expand Up @@ -4217,7 +4217,7 @@ impl<'ctx> CoreStreamData<'ctx> {
// Return the VPIO unit if present.
self.voiceprocessing_unit_handle = None;

#[cfg(feature = "audio_dump")]
#[cfg(feature = "audio-dump")]
{
if !self.audio_dump_session.is_null() {
unsafe {
Expand Down

0 comments on commit d892b0a

Please sign in to comment.