Merge pull request #86 from mitchmindtree/master

Removed unnecessary callback member from Stream, made travis build on stable rather than beta.

Author: mitchmindtree

.travis.yml

@@ -3,7 +3,7 @@ env:
 language: rust
 rust:
     - nightly
-    - 1.0.0-beta
+    - stable
 os:
     - linux
     - osx

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "portaudio"
-version = "0.4.9"
+version = "0.4.10"
 authors = ["Jeremy Letang <[email protected]>",
            "Mitchell Nordine <[email protected]>"]
 description = "PortAudio bindings for Rust."

src/lib.rs

@@ -52,7 +52,6 @@
 //! 
 
 #![warn(missing_docs)]
-#![allow(dead_code)]
 
 #[macro_use] extern crate bitflags;
 extern crate libc;

src/pa/device.rs

@@ -21,10 +21,7 @@
 
 //! Device management
 
-use pa::{
-    DeviceIndex,
-    DeviceInfo
-};
+use pa::{DeviceIndex, DeviceInfo};
 use pa::error::Error;
 use ffi;
 

src/pa/mod.rs

@@ -260,7 +260,6 @@ pub struct Stream<I: Sample, O: Sample> {
     c_input : Option<ffi::C_PaStreamParameters>,
     c_output : Option<ffi::C_PaStreamParameters>,
     unsafe_buffer : *mut c_void,
-    callback_function : Option<StreamCallbackFn<I, O>>,
     num_input_channels : i32,
     phantom_data_input : ::std::marker::PhantomData<I>,
     phantom_data_output : ::std::marker::PhantomData<O>,
@@ -277,7 +276,6 @@ impl<I: Sample, O: Sample> Stream<I, O> {
             c_input : None,
             c_output : None,
             unsafe_buffer : ptr::null_mut(),
-            callback_function : None,
             num_input_channels : 0,
             phantom_data_input : ::std::marker::PhantomData,
             phantom_data_output : ::std::marker::PhantomData,

src/pa/types.rs

@@ -192,12 +192,15 @@ pub type StreamCallbackFn<I, O> =
     Box<FnMut(&[I], &mut[O], u32, &StreamCallbackTimeInfo, StreamCallbackFlags)
             -> StreamCallbackResult>;
 
-#[doc(hidden)]
+/// The result of the StreamCallbackFn.
 #[derive(Copy, Clone)]
 #[repr(C)]
 pub enum StreamCallbackResult {
+    /// Continue the stream.
     Continue = 0,
+    /// The stream has completed.
     Complete = 1,
+    /// Abort the stream.
     Abort = 2
 }