encounter/rust-sdl2
0
0
Fork 0
mirror of https://github.com/encounter/rust-sdl2.git synced 2026-07-10 21:18:41 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #481 from AndiDog/desired-audio-spec-as-reference

Browse Source 
Take desired audio spec as reference
This commit is contained in:
Tony Aldridge
2016-01-25 10:10:29 +00:00
parent aa9fb05285 e81599c409
commit 99a216ef96
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/audio-squarewave.rs
+1 -1
View File
@@ -33,7 +33,7 @@ fn main() {
samples: None // default sample size
};
let device = audio_subsystem.open_playback(None, desired_spec, |spec| {
let device = audio_subsystem.open_playback(None, &desired_spec, |spec| {
// Show obtained AudioSpec
println!("{:?}", spec);
examples/audio-wav.rs
+1 -1
View File
@@ -32,7 +32,7 @@ fn main() {
samples: None // default
};
let device = audio_subsystem.open_playback(None, desired_spec, |spec| {
let device = audio_subsystem.open_playback(None, &desired_spec, |spec| {
let wav = AudioSpecWAV::load_wav("./tests/sine.wav")
.ok()
.expect("Could not load test WAV file");
examples/audio-whitenoise.rs
+1 -1
View File
@@ -31,7 +31,7 @@ fn main() {
};
// None: use default device
let mut device = audio_subsystem.open_playback(None, desired_spec, |spec| {
let mut device = audio_subsystem.open_playback(None, &desired_spec, |spec| {
// Show obtained AudioSpec
println!("{:?}", spec);
src/sdl2/audio.rs
+4 -3
View File
@@ -34,7 +34,7 @@
//! samples: None // default sample size
//! };
//!
//! let device = audio_subsystem.open_playback(None, desired_spec, |spec| {
//! let device = audio_subsystem.open_playback(None, &desired_spec, |spec| {
//! // initialize the audio callback
//! SquareWave {
//! phase_inc: 440.0 / spec.freq as f32,
@@ -67,7 +67,7 @@ use sys::audio as ll;
impl AudioSubsystem {
/// Opens a new audio device given the desired parameters and callback.
#[inline]
pub fn open_playback<CB, F>(&self, device: Option<&str>, spec: AudioSpecDesired, get_callback: F) -> SdlResult<AudioDevice<CB>>
pub fn open_playback<CB, F>(&self, device: Option<&str>, spec: &AudioSpecDesired, get_callback: F) -> SdlResult<AudioDevice<CB>>
where CB: AudioCallback, F: FnOnce(AudioSpec) -> CB
{
AudioDevice::open_playback(self, device, spec, get_callback)
@@ -364,6 +364,7 @@ extern "C" fn audio_callback_marshall<CB: AudioCallback>
}
}
#[derive(Clone)]
pub struct AudioSpecDesired {
/// DSP frequency (samples per second). Set to None for the device's fallback frequency.
pub freq: Option<i32>,
@@ -456,7 +457,7 @@ pub struct AudioDevice<CB: AudioCallback> {
impl<CB: AudioCallback> AudioDevice<CB> {
/// Opens a new audio device given the desired parameters and callback.
pub fn open_playback<F>(a: &AudioSubsystem, device: Option<&str>, spec: AudioSpecDesired, get_callback: F) -> SdlResult<AudioDevice<CB>>
pub fn open_playback<F>(a: &AudioSubsystem, device: Option<&str>, spec: &AudioSpecDesired, get_callback: F) -> SdlResult<AudioDevice<CB>>
where F: FnOnce(AudioSpec) -> CB
{
use std::mem;