Run rustfmt on the code (#162)
This commit is contained in:
parent
cdcef96279
commit
2028d5907f
13 changed files with 622 additions and 399 deletions
|
|
@ -1,9 +1,9 @@
|
|||
//! Handles COM initialization and cleanup.
|
||||
|
||||
use std::ptr;
|
||||
use super::winapi;
|
||||
use super::ole32;
|
||||
use super::check_result;
|
||||
use super::ole32;
|
||||
use super::winapi;
|
||||
use std::ptr;
|
||||
|
||||
thread_local!(static COM_INITIALIZED: ComInitialized = {
|
||||
unsafe {
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
use super::winapi;
|
||||
use super::ole32;
|
||||
use super::com;
|
||||
|
||||
use super::Endpoint;
|
||||
use super::check_result;
|
||||
use super::com;
|
||||
use super::ole32;
|
||||
use super::winapi;
|
||||
|
||||
use std::mem;
|
||||
use std::ptr;
|
||||
|
|
@ -33,8 +34,10 @@ lazy_static! {
|
|||
/// RAII object around `winapi::IMMDeviceEnumerator`.
|
||||
struct Enumerator(*mut winapi::IMMDeviceEnumerator);
|
||||
|
||||
unsafe impl Send for Enumerator {}
|
||||
unsafe impl Sync for Enumerator {}
|
||||
unsafe impl Send for Enumerator {
|
||||
}
|
||||
unsafe impl Sync for Enumerator {
|
||||
}
|
||||
|
||||
impl Drop for Enumerator {
|
||||
#[inline]
|
||||
|
|
@ -52,8 +55,10 @@ pub struct EndpointsIterator {
|
|||
next_item: u32,
|
||||
}
|
||||
|
||||
unsafe impl Send for EndpointsIterator {}
|
||||
unsafe impl Sync for EndpointsIterator {}
|
||||
unsafe impl Send for EndpointsIterator {
|
||||
}
|
||||
unsafe impl Sync for EndpointsIterator {
|
||||
}
|
||||
|
||||
impl Drop for EndpointsIterator {
|
||||
#[inline]
|
||||
|
|
@ -72,7 +77,7 @@ impl Default for EndpointsIterator {
|
|||
check_result((*ENUMERATOR.0).EnumAudioEndpoints(winapi::eRender,
|
||||
winapi::DEVICE_STATE_ACTIVE,
|
||||
&mut collection))
|
||||
.unwrap();
|
||||
.unwrap();
|
||||
|
||||
let mut count = mem::uninitialized();
|
||||
// can fail if the parameter is null, which should never happen
|
||||
|
|
@ -116,11 +121,11 @@ impl Iterator for EndpointsIterator {
|
|||
pub fn get_default_endpoint() -> Option<Endpoint> {
|
||||
unsafe {
|
||||
let mut device = mem::uninitialized();
|
||||
let hres = (*ENUMERATOR.0).GetDefaultAudioEndpoint(winapi::eRender,
|
||||
winapi::eConsole, &mut device);
|
||||
let hres = (*ENUMERATOR.0)
|
||||
.GetDefaultAudioEndpoint(winapi::eRender, winapi::eConsole, &mut device);
|
||||
|
||||
if let Err(_err) = check_result(hres) {
|
||||
return None; // TODO: check specifically for `E_NOTFOUND`, and panic otherwise
|
||||
return None; // TODO: check specifically for `E_NOTFOUND`, and panic otherwise
|
||||
}
|
||||
|
||||
Some(Endpoint::from_immdevice(device))
|
||||
|
|
|
|||
|
|
@ -2,23 +2,23 @@ extern crate winapi;
|
|||
extern crate ole32;
|
||||
extern crate kernel32;
|
||||
|
||||
use std::io::Error as IoError;
|
||||
use std::os::windows::ffi::OsStringExt;
|
||||
use std::ffi::OsString;
|
||||
use std::sync::{Arc, Mutex, MutexGuard};
|
||||
use std::ptr;
|
||||
use std::io::Error as IoError;
|
||||
use std::mem;
|
||||
use std::os::windows::ffi::OsStringExt;
|
||||
use std::ptr;
|
||||
use std::slice;
|
||||
use std::sync::{Arc, Mutex, MutexGuard};
|
||||
|
||||
use ChannelPosition;
|
||||
use Format;
|
||||
use FormatsEnumerationError;
|
||||
use ChannelPosition;
|
||||
use SamplesRate;
|
||||
use SampleFormat;
|
||||
use SamplesRate;
|
||||
|
||||
pub use std::option::IntoIter as OptionIntoIter;
|
||||
pub use self::enumerate::{EndpointsIterator, get_default_endpoint};
|
||||
pub use self::voice::{Voice, Buffer, EventLoop, SamplesStream};
|
||||
pub use self::voice::{Buffer, EventLoop, SamplesStream, Voice};
|
||||
pub use std::option::IntoIter as OptionIntoIter;
|
||||
|
||||
pub type SupportedFormatsIterator = OptionIntoIter<Format>;
|
||||
|
||||
|
|
@ -38,8 +38,10 @@ fn check_result(result: winapi::HRESULT) -> Result<(), IoError> {
|
|||
/// Wrapper because of that stupid decision to remove `Send` and `Sync` from raw pointers.
|
||||
#[derive(Copy, Clone)]
|
||||
struct IAudioClientWrapper(*mut winapi::IAudioClient);
|
||||
unsafe impl Send for IAudioClientWrapper {}
|
||||
unsafe impl Sync for IAudioClientWrapper {}
|
||||
unsafe impl Send for IAudioClientWrapper {
|
||||
}
|
||||
unsafe impl Sync for IAudioClientWrapper {
|
||||
}
|
||||
|
||||
/// An opaque type that identifies an end point.
|
||||
pub struct Endpoint {
|
||||
|
|
@ -47,11 +49,13 @@ pub struct Endpoint {
|
|||
|
||||
/// We cache an uninitialized `IAudioClient` so that we can call functions from it without
|
||||
/// having to create/destroy audio clients all the time.
|
||||
future_audio_client: Arc<Mutex<Option<IAudioClientWrapper>>>, // TODO: add NonZero around the ptr
|
||||
future_audio_client: Arc<Mutex<Option<IAudioClientWrapper>>>, // TODO: add NonZero around the ptr
|
||||
}
|
||||
|
||||
unsafe impl Send for Endpoint {}
|
||||
unsafe impl Sync for Endpoint {}
|
||||
unsafe impl Send for Endpoint {
|
||||
}
|
||||
unsafe impl Sync for Endpoint {
|
||||
}
|
||||
|
||||
impl Endpoint {
|
||||
// TODO: this function returns a GUID of the endpoin
|
||||
|
|
@ -87,7 +91,8 @@ impl Endpoint {
|
|||
}
|
||||
|
||||
/// Ensures that `future_audio_client` contains a `Some` and returns a locked mutex to it.
|
||||
fn ensure_future_audio_client(&self) -> Result<MutexGuard<Option<IAudioClientWrapper>>, IoError> {
|
||||
fn ensure_future_audio_client(&self)
|
||||
-> Result<MutexGuard<Option<IAudioClientWrapper>>, IoError> {
|
||||
let mut lock = self.future_audio_client.lock().unwrap();
|
||||
if lock.is_some() {
|
||||
return Ok(lock);
|
||||
|
|
@ -95,12 +100,14 @@ impl Endpoint {
|
|||
|
||||
let audio_client: *mut winapi::IAudioClient = unsafe {
|
||||
let mut audio_client = mem::uninitialized();
|
||||
let hresult = (*self.device).Activate(&winapi::IID_IAudioClient, winapi::CLSCTX_ALL,
|
||||
ptr::null_mut(), &mut audio_client);
|
||||
let hresult = (*self.device).Activate(&winapi::IID_IAudioClient,
|
||||
winapi::CLSCTX_ALL,
|
||||
ptr::null_mut(),
|
||||
&mut audio_client);
|
||||
|
||||
// can fail if the device has been disconnected since we enumerated it, or if
|
||||
// the device doesn't support playback for some reason
|
||||
try!(check_result(hresult));
|
||||
check_result(hresult)?;
|
||||
assert!(!audio_client.is_null());
|
||||
audio_client as *mut _
|
||||
};
|
||||
|
|
@ -112,15 +119,15 @@ impl Endpoint {
|
|||
/// Returns an uninitialized `IAudioClient`.
|
||||
#[inline]
|
||||
fn build_audioclient(&self) -> Result<*mut winapi::IAudioClient, IoError> {
|
||||
let mut lock = try!(self.ensure_future_audio_client());
|
||||
let mut lock = self.ensure_future_audio_client()?;
|
||||
let client = lock.unwrap().0;
|
||||
*lock = None;
|
||||
Ok(client)
|
||||
}
|
||||
|
||||
pub fn get_supported_formats_list(&self)
|
||||
-> Result<SupportedFormatsIterator, FormatsEnumerationError>
|
||||
{
|
||||
pub fn get_supported_formats_list(
|
||||
&self)
|
||||
-> Result<SupportedFormatsIterator, FormatsEnumerationError> {
|
||||
// We always create voices in shared mode, therefore all samples go through an audio
|
||||
// processor to mix them together.
|
||||
// However there is no way to query the list of all formats that are supported by the
|
||||
|
|
@ -150,10 +157,8 @@ impl Endpoint {
|
|||
let format = {
|
||||
let (channels, data_type) = match (*format_ptr).wFormatTag {
|
||||
winapi::WAVE_FORMAT_PCM => {
|
||||
(
|
||||
vec![ChannelPosition::FrontLeft, ChannelPosition::FrontRight],
|
||||
SampleFormat::I16
|
||||
)
|
||||
(vec![ChannelPosition::FrontLeft, ChannelPosition::FrontRight],
|
||||
SampleFormat::I16)
|
||||
},
|
||||
winapi::WAVE_FORMAT_EXTENSIBLE => {
|
||||
let format_ptr = format_ptr as *const winapi::WAVEFORMATEXTENSIBLE;
|
||||
|
|
@ -162,24 +167,60 @@ impl Endpoint {
|
|||
let mut channels = Vec::new();
|
||||
|
||||
let mask = (*format_ptr).dwChannelMask;
|
||||
if (mask & winapi::SPEAKER_FRONT_LEFT) != 0 { channels.push(ChannelPosition::FrontLeft); }
|
||||
if (mask & winapi::SPEAKER_FRONT_RIGHT) != 0 { channels.push(ChannelPosition::FrontRight); }
|
||||
if (mask & winapi::SPEAKER_FRONT_CENTER) != 0 { channels.push(ChannelPosition::FrontCenter); }
|
||||
if (mask & winapi::SPEAKER_LOW_FREQUENCY) != 0 { channels.push(ChannelPosition::LowFrequency); }
|
||||
if (mask & winapi::SPEAKER_BACK_LEFT) != 0 { channels.push(ChannelPosition::BackLeft); }
|
||||
if (mask & winapi::SPEAKER_BACK_RIGHT) != 0 { channels.push(ChannelPosition::BackRight); }
|
||||
if (mask & winapi::SPEAKER_FRONT_LEFT_OF_CENTER) != 0 { channels.push(ChannelPosition::FrontLeftOfCenter); }
|
||||
if (mask & winapi::SPEAKER_FRONT_RIGHT_OF_CENTER) != 0 { channels.push(ChannelPosition::FrontRightOfCenter); }
|
||||
if (mask & winapi::SPEAKER_BACK_CENTER) != 0 { channels.push(ChannelPosition::BackCenter); }
|
||||
if (mask & winapi::SPEAKER_SIDE_LEFT) != 0 { channels.push(ChannelPosition::SideLeft); }
|
||||
if (mask & winapi::SPEAKER_SIDE_RIGHT) != 0 { channels.push(ChannelPosition::SideRight); }
|
||||
if (mask & winapi::SPEAKER_TOP_CENTER) != 0 { channels.push(ChannelPosition::TopCenter); }
|
||||
if (mask & winapi::SPEAKER_TOP_FRONT_LEFT) != 0 { channels.push(ChannelPosition::TopFrontLeft); }
|
||||
if (mask & winapi::SPEAKER_TOP_FRONT_CENTER) != 0 { channels.push(ChannelPosition::TopFrontCenter); }
|
||||
if (mask & winapi::SPEAKER_TOP_FRONT_RIGHT) != 0 { channels.push(ChannelPosition::TopFrontRight); }
|
||||
if (mask & winapi::SPEAKER_TOP_BACK_LEFT) != 0 { channels.push(ChannelPosition::TopBackLeft); }
|
||||
if (mask & winapi::SPEAKER_TOP_BACK_CENTER) != 0 { channels.push(ChannelPosition::TopBackCenter); }
|
||||
if (mask & winapi::SPEAKER_TOP_BACK_RIGHT) != 0 { channels.push(ChannelPosition::TopBackRight); }
|
||||
if (mask & winapi::SPEAKER_FRONT_LEFT) != 0 {
|
||||
channels.push(ChannelPosition::FrontLeft);
|
||||
}
|
||||
if (mask & winapi::SPEAKER_FRONT_RIGHT) != 0 {
|
||||
channels.push(ChannelPosition::FrontRight);
|
||||
}
|
||||
if (mask & winapi::SPEAKER_FRONT_CENTER) != 0 {
|
||||
channels.push(ChannelPosition::FrontCenter);
|
||||
}
|
||||
if (mask & winapi::SPEAKER_LOW_FREQUENCY) != 0 {
|
||||
channels.push(ChannelPosition::LowFrequency);
|
||||
}
|
||||
if (mask & winapi::SPEAKER_BACK_LEFT) != 0 {
|
||||
channels.push(ChannelPosition::BackLeft);
|
||||
}
|
||||
if (mask & winapi::SPEAKER_BACK_RIGHT) != 0 {
|
||||
channels.push(ChannelPosition::BackRight);
|
||||
}
|
||||
if (mask & winapi::SPEAKER_FRONT_LEFT_OF_CENTER) != 0 {
|
||||
channels.push(ChannelPosition::FrontLeftOfCenter);
|
||||
}
|
||||
if (mask & winapi::SPEAKER_FRONT_RIGHT_OF_CENTER) != 0 {
|
||||
channels.push(ChannelPosition::FrontRightOfCenter);
|
||||
}
|
||||
if (mask & winapi::SPEAKER_BACK_CENTER) != 0 {
|
||||
channels.push(ChannelPosition::BackCenter);
|
||||
}
|
||||
if (mask & winapi::SPEAKER_SIDE_LEFT) != 0 {
|
||||
channels.push(ChannelPosition::SideLeft);
|
||||
}
|
||||
if (mask & winapi::SPEAKER_SIDE_RIGHT) != 0 {
|
||||
channels.push(ChannelPosition::SideRight);
|
||||
}
|
||||
if (mask & winapi::SPEAKER_TOP_CENTER) != 0 {
|
||||
channels.push(ChannelPosition::TopCenter);
|
||||
}
|
||||
if (mask & winapi::SPEAKER_TOP_FRONT_LEFT) != 0 {
|
||||
channels.push(ChannelPosition::TopFrontLeft);
|
||||
}
|
||||
if (mask & winapi::SPEAKER_TOP_FRONT_CENTER) != 0 {
|
||||
channels.push(ChannelPosition::TopFrontCenter);
|
||||
}
|
||||
if (mask & winapi::SPEAKER_TOP_FRONT_RIGHT) != 0 {
|
||||
channels.push(ChannelPosition::TopFrontRight);
|
||||
}
|
||||
if (mask & winapi::SPEAKER_TOP_BACK_LEFT) != 0 {
|
||||
channels.push(ChannelPosition::TopBackLeft);
|
||||
}
|
||||
if (mask & winapi::SPEAKER_TOP_BACK_CENTER) != 0 {
|
||||
channels.push(ChannelPosition::TopBackCenter);
|
||||
}
|
||||
if (mask & winapi::SPEAKER_TOP_BACK_RIGHT) != 0 {
|
||||
channels.push(ChannelPosition::TopBackRight);
|
||||
}
|
||||
|
||||
assert_eq!((*format_ptr).Format.nChannels as usize, channels.len());
|
||||
channels
|
||||
|
|
@ -187,8 +228,8 @@ impl Endpoint {
|
|||
|
||||
let format = {
|
||||
fn cmp_guid(a: &winapi::GUID, b: &winapi::GUID) -> bool {
|
||||
a.Data1 == b.Data1 && a.Data2 == b.Data2 &&
|
||||
a.Data3 == b.Data3 && a.Data4 == b.Data4
|
||||
a.Data1 == b.Data1 && a.Data2 == b.Data2 && a.Data3 == b.Data3 &&
|
||||
a.Data4 == b.Data4
|
||||
}
|
||||
if cmp_guid(&(*format_ptr).SubFormat,
|
||||
&winapi::KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)
|
||||
|
|
@ -207,7 +248,7 @@ impl Endpoint {
|
|||
(channels, format)
|
||||
},
|
||||
|
||||
f => panic!("Unknown data format returned by GetMixFormat: {:?}", f)
|
||||
f => panic!("Unknown data format returned by GetMixFormat: {:?}", f),
|
||||
};
|
||||
|
||||
Format {
|
||||
|
|
@ -231,12 +272,15 @@ impl PartialEq for Endpoint {
|
|||
}
|
||||
}
|
||||
|
||||
impl Eq for Endpoint {}
|
||||
impl Eq for Endpoint {
|
||||
}
|
||||
|
||||
impl Clone for Endpoint {
|
||||
#[inline]
|
||||
fn clone(&self) -> Endpoint {
|
||||
unsafe { (*self.device).AddRef(); }
|
||||
unsafe {
|
||||
(*self.device).AddRef();
|
||||
}
|
||||
|
||||
Endpoint {
|
||||
device: self.device,
|
||||
|
|
@ -248,10 +292,14 @@ impl Clone for Endpoint {
|
|||
impl Drop for Endpoint {
|
||||
#[inline]
|
||||
fn drop(&mut self) {
|
||||
unsafe { (*self.device).Release(); }
|
||||
unsafe {
|
||||
(*self.device).Release();
|
||||
}
|
||||
|
||||
if let Some(client) = self.future_audio_client.lock().unwrap().take() {
|
||||
unsafe { (*client.0).Release(); }
|
||||
unsafe {
|
||||
(*client.0).Release();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,26 +1,27 @@
|
|||
|
||||
use super::Endpoint;
|
||||
use super::check_result;
|
||||
use super::com;
|
||||
use super::kernel32;
|
||||
use super::ole32;
|
||||
use super::winapi;
|
||||
use super::Endpoint;
|
||||
use super::check_result;
|
||||
|
||||
use std::slice;
|
||||
use std::mem;
|
||||
use std::ptr;
|
||||
use std::sync::atomic::AtomicBool;
|
||||
use std::sync::atomic::Ordering;
|
||||
use std::slice;
|
||||
use std::sync::Arc;
|
||||
use std::sync::Mutex;
|
||||
use std::sync::atomic::AtomicBool;
|
||||
use std::sync::atomic::Ordering;
|
||||
|
||||
use futures::Poll;
|
||||
use futures::task::Task;
|
||||
use futures::task;
|
||||
use futures::stream::Stream;
|
||||
use futures::Async;
|
||||
use futures::Poll;
|
||||
use futures::stream::Stream;
|
||||
use futures::task;
|
||||
use futures::task::Task;
|
||||
|
||||
use CreationError;
|
||||
use ChannelPosition;
|
||||
use CreationError;
|
||||
use Format;
|
||||
use SampleFormat;
|
||||
use UnknownTypeBuffer;
|
||||
|
|
@ -29,8 +30,10 @@ pub struct EventLoop {
|
|||
inner: Arc<EventLoopInner>,
|
||||
}
|
||||
|
||||
unsafe impl Send for EventLoop {}
|
||||
unsafe impl Sync for EventLoop {}
|
||||
unsafe impl Send for EventLoop {
|
||||
}
|
||||
unsafe impl Sync for EventLoop {
|
||||
}
|
||||
|
||||
struct EventLoopInner {
|
||||
// List of handles that are currently being polled or that are going to be polled. This mutex
|
||||
|
|
@ -67,22 +70,21 @@ struct EventLoopScheduled {
|
|||
|
||||
impl EventLoop {
|
||||
pub fn new() -> EventLoop {
|
||||
let pending_scheduled_event = unsafe {
|
||||
kernel32::CreateEventA(ptr::null_mut(), 0, 0, ptr::null())
|
||||
};
|
||||
let pending_scheduled_event =
|
||||
unsafe { kernel32::CreateEventA(ptr::null_mut(), 0, 0, ptr::null()) };
|
||||
|
||||
EventLoop {
|
||||
inner: Arc::new(EventLoopInner {
|
||||
pending_scheduled_event: pending_scheduled_event,
|
||||
scheduled: Mutex::new(EventLoopScheduled {
|
||||
handles: vec![pending_scheduled_event],
|
||||
task_handles: vec![],
|
||||
}),
|
||||
pending_scheduled: Mutex::new(EventLoopScheduled {
|
||||
handles: vec![],
|
||||
task_handles: vec![],
|
||||
})
|
||||
})
|
||||
pending_scheduled_event: pending_scheduled_event,
|
||||
scheduled: Mutex::new(EventLoopScheduled {
|
||||
handles: vec![pending_scheduled_event],
|
||||
task_handles: vec![],
|
||||
}),
|
||||
pending_scheduled: Mutex::new(EventLoopScheduled {
|
||||
handles: vec![],
|
||||
task_handles: vec![],
|
||||
}),
|
||||
}),
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -101,7 +103,8 @@ impl EventLoop {
|
|||
// sound needs a buffer.
|
||||
let result = kernel32::WaitForMultipleObjectsEx(scheduled.handles.len() as u32,
|
||||
scheduled.handles.as_ptr(),
|
||||
winapi::FALSE, winapi::INFINITE, /* TODO: allow setting a timeout */
|
||||
winapi::FALSE,
|
||||
winapi::INFINITE, /* TODO: allow setting a timeout */
|
||||
winapi::FALSE /* irrelevant parameter here */);
|
||||
|
||||
// Notifying the corresponding task handler.
|
||||
|
|
@ -144,27 +147,30 @@ pub struct SamplesStream {
|
|||
event_loop: Arc<EventLoopInner>,
|
||||
inner: Arc<Mutex<VoiceInner>>,
|
||||
// The event that is signalled whenever a buffer is ready to be submitted to the voice.
|
||||
event: winapi::HANDLE, // TODO: not deleted
|
||||
event: winapi::HANDLE, // TODO: not deleted
|
||||
max_frames_in_buffer: winapi::UINT32,
|
||||
bytes_per_frame: winapi::WORD,
|
||||
ready: Arc<AtomicBool>,
|
||||
}
|
||||
|
||||
unsafe impl Send for SamplesStream {}
|
||||
unsafe impl Sync for SamplesStream {}
|
||||
unsafe impl Send for SamplesStream {
|
||||
}
|
||||
unsafe impl Sync for SamplesStream {
|
||||
}
|
||||
|
||||
struct VoiceInner {
|
||||
audio_client: *mut winapi::IAudioClient,
|
||||
render_client: *mut winapi::IAudioRenderClient,
|
||||
}
|
||||
|
||||
unsafe impl Send for Voice {}
|
||||
unsafe impl Sync for Voice {}
|
||||
unsafe impl Send for Voice {
|
||||
}
|
||||
unsafe impl Sync for Voice {
|
||||
}
|
||||
|
||||
impl Voice {
|
||||
pub fn new(end_point: &Endpoint, format: &Format, event_loop: &EventLoop)
|
||||
-> Result<(Voice, SamplesStream), CreationError>
|
||||
{
|
||||
-> Result<(Voice, SamplesStream), CreationError> {
|
||||
unsafe {
|
||||
// Making sure that COM is initialized.
|
||||
// It's not actually sure that this is required, but when in doubt do it.
|
||||
|
|
@ -179,14 +185,15 @@ impl Voice {
|
|||
|
||||
// Computing the format and initializing the device.
|
||||
let format = {
|
||||
let format_attempt = try!(format_to_waveformatextensible(format));
|
||||
let format_attempt = format_to_waveformatextensible(format)?;
|
||||
let share_mode = winapi::AUDCLNT_SHAREMODE_SHARED;
|
||||
|
||||
// `IsFormatSupported` checks whether the format is supported and fills
|
||||
// a `WAVEFORMATEX`
|
||||
let mut dummy_fmt_ptr: *mut winapi::WAVEFORMATEX = mem::uninitialized();
|
||||
let hresult = (*audio_client).IsFormatSupported(share_mode, &format_attempt.Format,
|
||||
&mut dummy_fmt_ptr);
|
||||
let hresult =
|
||||
(*audio_client)
|
||||
.IsFormatSupported(share_mode, &format_attempt.Format, &mut dummy_fmt_ptr);
|
||||
// we free that `WAVEFORMATEX` immediately after because we don't need it
|
||||
if !dummy_fmt_ptr.is_null() {
|
||||
ole32::CoTaskMemFree(dummy_fmt_ptr as *mut _);
|
||||
|
|
@ -196,8 +203,7 @@ impl Voice {
|
|||
// has been found) but we also treat this as an error
|
||||
match (hresult, check_result(hresult)) {
|
||||
(_, Err(ref e))
|
||||
if e.raw_os_error() == Some(winapi::AUDCLNT_E_DEVICE_INVALIDATED) =>
|
||||
{
|
||||
if e.raw_os_error() == Some(winapi::AUDCLNT_E_DEVICE_INVALIDATED) => {
|
||||
(*audio_client).Release();
|
||||
return Err(CreationError::DeviceNotAvailable);
|
||||
},
|
||||
|
|
@ -215,10 +221,13 @@ impl Voice {
|
|||
// finally initializing the audio client
|
||||
let hresult = (*audio_client).Initialize(share_mode,
|
||||
winapi::AUDCLNT_STREAMFLAGS_EVENTCALLBACK,
|
||||
0, 0, &format_attempt.Format, ptr::null());
|
||||
0,
|
||||
0,
|
||||
&format_attempt.Format,
|
||||
ptr::null());
|
||||
match check_result(hresult) {
|
||||
Err(ref e) if e.raw_os_error() == Some(winapi::AUDCLNT_E_DEVICE_INVALIDATED) =>
|
||||
{
|
||||
Err(ref e)
|
||||
if e.raw_os_error() == Some(winapi::AUDCLNT_E_DEVICE_INVALIDATED) => {
|
||||
(*audio_client).Release();
|
||||
return Err(CreationError::DeviceNotAvailable);
|
||||
},
|
||||
|
|
@ -245,7 +254,7 @@ impl Voice {
|
|||
(*audio_client).Release();
|
||||
panic!("Failed to call SetEventHandle")
|
||||
},
|
||||
Ok(_) => ()
|
||||
Ok(_) => (),
|
||||
};
|
||||
|
||||
event
|
||||
|
|
@ -257,8 +266,8 @@ impl Voice {
|
|||
let hresult = (*audio_client).GetBufferSize(&mut max_frames_in_buffer);
|
||||
|
||||
match check_result(hresult) {
|
||||
Err(ref e) if e.raw_os_error() == Some(winapi::AUDCLNT_E_DEVICE_INVALIDATED) =>
|
||||
{
|
||||
Err(ref e)
|
||||
if e.raw_os_error() == Some(winapi::AUDCLNT_E_DEVICE_INVALIDATED) => {
|
||||
(*audio_client).Release();
|
||||
return Err(CreationError::DeviceNotAvailable);
|
||||
},
|
||||
|
|
@ -276,13 +285,13 @@ impl Voice {
|
|||
let render_client = {
|
||||
let mut render_client: *mut winapi::IAudioRenderClient = mem::uninitialized();
|
||||
let hresult = (*audio_client).GetService(&winapi::IID_IAudioRenderClient,
|
||||
&mut render_client
|
||||
as *mut *mut winapi::IAudioRenderClient
|
||||
as *mut _);
|
||||
&mut render_client as
|
||||
*mut *mut winapi::IAudioRenderClient as
|
||||
*mut _);
|
||||
|
||||
match check_result(hresult) {
|
||||
Err(ref e) if e.raw_os_error() == Some(winapi::AUDCLNT_E_DEVICE_INVALIDATED) =>
|
||||
{
|
||||
Err(ref e)
|
||||
if e.raw_os_error() == Some(winapi::AUDCLNT_E_DEVICE_INVALIDATED) => {
|
||||
(*audio_client).Release();
|
||||
return Err(CreationError::DeviceNotAvailable);
|
||||
},
|
||||
|
|
@ -298,9 +307,9 @@ impl Voice {
|
|||
|
||||
// Everything went fine.
|
||||
let inner = Arc::new(Mutex::new(VoiceInner {
|
||||
audio_client: audio_client,
|
||||
render_client: render_client,
|
||||
}));
|
||||
audio_client: audio_client,
|
||||
render_client: render_client,
|
||||
}));
|
||||
|
||||
let voice = Voice {
|
||||
inner: inner.clone(),
|
||||
|
|
@ -354,7 +363,9 @@ impl SamplesStream {
|
|||
fn schedule(&mut self) {
|
||||
let mut pending = self.event_loop.pending_scheduled.lock().unwrap();
|
||||
pending.handles.push(self.event);
|
||||
pending.task_handles.push((task::park(), self.ready.clone()));
|
||||
pending
|
||||
.task_handles
|
||||
.push((task::park(), self.ready.clone()));
|
||||
drop(pending);
|
||||
|
||||
let result = unsafe { kernel32::SetEvent(self.event_loop.pending_scheduled_event) };
|
||||
|
|
@ -379,7 +390,7 @@ impl Stream for SamplesStream {
|
|||
self.schedule();
|
||||
return Ok(Async::NotReady);
|
||||
},
|
||||
_ => unreachable!()
|
||||
_ => unreachable!(),
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -403,13 +414,14 @@ impl Stream for SamplesStream {
|
|||
// Obtaining a pointer to the buffer.
|
||||
let (buffer_data, buffer_len) = {
|
||||
let mut buffer: *mut winapi::BYTE = mem::uninitialized();
|
||||
let hresult = (*inner.render_client).GetBuffer(frames_available,
|
||||
&mut buffer as *mut *mut _);
|
||||
check_result(hresult).unwrap(); // FIXME: can return `AUDCLNT_E_DEVICE_INVALIDATED`
|
||||
let hresult = (*inner.render_client)
|
||||
.GetBuffer(frames_available, &mut buffer as *mut *mut _);
|
||||
check_result(hresult).unwrap(); // FIXME: can return `AUDCLNT_E_DEVICE_INVALIDATED`
|
||||
debug_assert!(!buffer.is_null());
|
||||
|
||||
(buffer as *mut _,
|
||||
frames_available as usize * self.bytes_per_frame as usize / mem::size_of::<f32>()) // FIXME: correct size
|
||||
frames_available as usize * self.bytes_per_frame as usize /
|
||||
mem::size_of::<f32>()) // FIXME: correct size
|
||||
};
|
||||
|
||||
let buffer = Buffer {
|
||||
|
|
@ -419,7 +431,9 @@ impl Stream for SamplesStream {
|
|||
frames: frames_available,
|
||||
};
|
||||
|
||||
Ok(Async::Ready(Some(UnknownTypeBuffer::F32(::Buffer { target: Some(buffer) })))) // FIXME: not necessarily F32
|
||||
Ok(Async::Ready(Some(UnknownTypeBuffer::F32(::Buffer {
|
||||
target: Some(buffer),
|
||||
})))) // FIXME: not necessarily F32
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -450,14 +464,13 @@ pub struct Buffer<T> {
|
|||
frames: winapi::UINT32,
|
||||
}
|
||||
|
||||
unsafe impl<T> Send for Buffer<T> {}
|
||||
unsafe impl<T> Send for Buffer<T> {
|
||||
}
|
||||
|
||||
impl<T> Buffer<T> {
|
||||
#[inline]
|
||||
pub fn get_buffer(&mut self) -> &mut [T] {
|
||||
unsafe {
|
||||
slice::from_raw_parts_mut(self.buffer_data, self.buffer_len)
|
||||
}
|
||||
unsafe { slice::from_raw_parts_mut(self.buffer_data, self.buffer_len) }
|
||||
}
|
||||
|
||||
#[inline]
|
||||
|
|
@ -472,8 +485,7 @@ impl<T> Buffer<T> {
|
|||
let hresult = (*inner.render_client).ReleaseBuffer(self.frames as u32, 0);
|
||||
match check_result(hresult) {
|
||||
// ignoring the error that is produced if the device has been disconnected
|
||||
Err(ref e)
|
||||
if e.raw_os_error() == Some(winapi::AUDCLNT_E_DEVICE_INVALIDATED) => (),
|
||||
Err(ref e) if e.raw_os_error() == Some(winapi::AUDCLNT_E_DEVICE_INVALIDATED) => (),
|
||||
e => e.unwrap(),
|
||||
};
|
||||
}
|
||||
|
|
@ -481,69 +493,69 @@ impl<T> Buffer<T> {
|
|||
}
|
||||
|
||||
fn format_to_waveformatextensible(format: &Format)
|
||||
-> Result<winapi::WAVEFORMATEXTENSIBLE, CreationError>
|
||||
{
|
||||
-> Result<winapi::WAVEFORMATEXTENSIBLE, CreationError> {
|
||||
Ok(winapi::WAVEFORMATEXTENSIBLE {
|
||||
Format: winapi::WAVEFORMATEX {
|
||||
wFormatTag: match format.data_type {
|
||||
SampleFormat::I16 => winapi::WAVE_FORMAT_PCM,
|
||||
SampleFormat::F32 => winapi::WAVE_FORMAT_EXTENSIBLE,
|
||||
SampleFormat::U16 => return Err(CreationError::FormatNotSupported),
|
||||
},
|
||||
nChannels: format.channels.len() as winapi::WORD,
|
||||
nSamplesPerSec: format.samples_rate.0 as winapi::DWORD,
|
||||
nAvgBytesPerSec: format.channels.len() as winapi::DWORD *
|
||||
format.samples_rate.0 as winapi::DWORD *
|
||||
format.data_type.get_sample_size() as winapi::DWORD,
|
||||
nBlockAlign: format.channels.len() as winapi::WORD *
|
||||
format.data_type.get_sample_size() as winapi::WORD,
|
||||
wBitsPerSample: 8 * format.data_type.get_sample_size() as winapi::WORD,
|
||||
cbSize: match format.data_type {
|
||||
SampleFormat::I16 => 0,
|
||||
SampleFormat::F32 => (mem::size_of::<winapi::WAVEFORMATEXTENSIBLE>() -
|
||||
mem::size_of::<winapi::WAVEFORMATEX>()) as winapi::WORD,
|
||||
SampleFormat::U16 => return Err(CreationError::FormatNotSupported),
|
||||
},
|
||||
},
|
||||
Samples: 8 * format.data_type.get_sample_size() as winapi::WORD,
|
||||
dwChannelMask: {
|
||||
let mut mask = 0;
|
||||
for &channel in format.channels.iter() {
|
||||
let raw_value = match channel {
|
||||
ChannelPosition::FrontLeft => winapi::SPEAKER_FRONT_LEFT,
|
||||
ChannelPosition::FrontRight => winapi::SPEAKER_FRONT_RIGHT,
|
||||
ChannelPosition::FrontCenter => winapi::SPEAKER_FRONT_CENTER,
|
||||
ChannelPosition::LowFrequency => winapi::SPEAKER_LOW_FREQUENCY,
|
||||
ChannelPosition::BackLeft => winapi::SPEAKER_BACK_LEFT,
|
||||
ChannelPosition::BackRight => winapi::SPEAKER_BACK_RIGHT,
|
||||
ChannelPosition::FrontLeftOfCenter => winapi::SPEAKER_FRONT_LEFT_OF_CENTER,
|
||||
ChannelPosition::FrontRightOfCenter => winapi::SPEAKER_FRONT_RIGHT_OF_CENTER,
|
||||
ChannelPosition::BackCenter => winapi::SPEAKER_BACK_CENTER,
|
||||
ChannelPosition::SideLeft => winapi::SPEAKER_SIDE_LEFT,
|
||||
ChannelPosition::SideRight => winapi::SPEAKER_SIDE_RIGHT,
|
||||
ChannelPosition::TopCenter => winapi::SPEAKER_TOP_CENTER,
|
||||
ChannelPosition::TopFrontLeft => winapi::SPEAKER_TOP_FRONT_LEFT,
|
||||
ChannelPosition::TopFrontCenter => winapi::SPEAKER_TOP_FRONT_CENTER,
|
||||
ChannelPosition::TopFrontRight => winapi::SPEAKER_TOP_FRONT_RIGHT,
|
||||
ChannelPosition::TopBackLeft => winapi::SPEAKER_TOP_BACK_LEFT,
|
||||
ChannelPosition::TopBackCenter => winapi::SPEAKER_TOP_BACK_CENTER,
|
||||
ChannelPosition::TopBackRight => winapi::SPEAKER_TOP_BACK_RIGHT,
|
||||
};
|
||||
Format: winapi::WAVEFORMATEX {
|
||||
wFormatTag: match format.data_type {
|
||||
SampleFormat::I16 => winapi::WAVE_FORMAT_PCM,
|
||||
SampleFormat::F32 => winapi::WAVE_FORMAT_EXTENSIBLE,
|
||||
SampleFormat::U16 => return Err(CreationError::FormatNotSupported),
|
||||
},
|
||||
nChannels: format.channels.len() as winapi::WORD,
|
||||
nSamplesPerSec: format.samples_rate.0 as winapi::DWORD,
|
||||
nAvgBytesPerSec: format.channels.len() as winapi::DWORD *
|
||||
format.samples_rate.0 as winapi::DWORD *
|
||||
format.data_type.get_sample_size() as winapi::DWORD,
|
||||
nBlockAlign: format.channels.len() as winapi::WORD *
|
||||
format.data_type.get_sample_size() as winapi::WORD,
|
||||
wBitsPerSample: 8 * format.data_type.get_sample_size() as winapi::WORD,
|
||||
cbSize: match format.data_type {
|
||||
SampleFormat::I16 => 0,
|
||||
SampleFormat::F32 => (mem::size_of::<winapi::WAVEFORMATEXTENSIBLE>() -
|
||||
mem::size_of::<winapi::WAVEFORMATEX>()) as
|
||||
winapi::WORD,
|
||||
SampleFormat::U16 => return Err(CreationError::FormatNotSupported),
|
||||
},
|
||||
},
|
||||
Samples: 8 * format.data_type.get_sample_size() as winapi::WORD,
|
||||
dwChannelMask: {
|
||||
let mut mask = 0;
|
||||
for &channel in format.channels.iter() {
|
||||
let raw_value = match channel {
|
||||
ChannelPosition::FrontLeft => winapi::SPEAKER_FRONT_LEFT,
|
||||
ChannelPosition::FrontRight => winapi::SPEAKER_FRONT_RIGHT,
|
||||
ChannelPosition::FrontCenter => winapi::SPEAKER_FRONT_CENTER,
|
||||
ChannelPosition::LowFrequency => winapi::SPEAKER_LOW_FREQUENCY,
|
||||
ChannelPosition::BackLeft => winapi::SPEAKER_BACK_LEFT,
|
||||
ChannelPosition::BackRight => winapi::SPEAKER_BACK_RIGHT,
|
||||
ChannelPosition::FrontLeftOfCenter => winapi::SPEAKER_FRONT_LEFT_OF_CENTER,
|
||||
ChannelPosition::FrontRightOfCenter => winapi::SPEAKER_FRONT_RIGHT_OF_CENTER,
|
||||
ChannelPosition::BackCenter => winapi::SPEAKER_BACK_CENTER,
|
||||
ChannelPosition::SideLeft => winapi::SPEAKER_SIDE_LEFT,
|
||||
ChannelPosition::SideRight => winapi::SPEAKER_SIDE_RIGHT,
|
||||
ChannelPosition::TopCenter => winapi::SPEAKER_TOP_CENTER,
|
||||
ChannelPosition::TopFrontLeft => winapi::SPEAKER_TOP_FRONT_LEFT,
|
||||
ChannelPosition::TopFrontCenter => winapi::SPEAKER_TOP_FRONT_CENTER,
|
||||
ChannelPosition::TopFrontRight => winapi::SPEAKER_TOP_FRONT_RIGHT,
|
||||
ChannelPosition::TopBackLeft => winapi::SPEAKER_TOP_BACK_LEFT,
|
||||
ChannelPosition::TopBackCenter => winapi::SPEAKER_TOP_BACK_CENTER,
|
||||
ChannelPosition::TopBackRight => winapi::SPEAKER_TOP_BACK_RIGHT,
|
||||
};
|
||||
|
||||
// channels must be in the right order
|
||||
if raw_value <= mask {
|
||||
return Err(CreationError::FormatNotSupported);
|
||||
}
|
||||
// channels must be in the right order
|
||||
if raw_value <= mask {
|
||||
return Err(CreationError::FormatNotSupported);
|
||||
}
|
||||
|
||||
mask = mask | raw_value;
|
||||
}
|
||||
mask = mask | raw_value;
|
||||
}
|
||||
|
||||
mask
|
||||
},
|
||||
SubFormat: match format.data_type {
|
||||
SampleFormat::I16 => winapi::KSDATAFORMAT_SUBTYPE_PCM,
|
||||
SampleFormat::F32 => winapi::KSDATAFORMAT_SUBTYPE_IEEE_FLOAT,
|
||||
SampleFormat::U16 => return Err(CreationError::FormatNotSupported),
|
||||
},
|
||||
})
|
||||
mask
|
||||
},
|
||||
SubFormat: match format.data_type {
|
||||
SampleFormat::I16 => winapi::KSDATAFORMAT_SUBTYPE_PCM,
|
||||
SampleFormat::F32 => winapi::KSDATAFORMAT_SUBTYPE_IEEE_FLOAT,
|
||||
SampleFormat::U16 => return Err(CreationError::FormatNotSupported),
|
||||
},
|
||||
})
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue