summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Scavone <gary@music.mcgill.ca>2007-12-22 19:29:40 +0000
committerStephen Sinclair <sinclair@music.mcgill.ca>2013-10-11 01:38:21 +0200
commitb71d5ba31a0ebc433dcc255de7dbb47a689b937c (patch)
tree14d2cbc720e392f96a64787f61c84ebf4da4d164
parent3dc6e2e86821303784512f86805683f1fda14ccb (diff)
Fix of errorString clearing in error() and documentation fixes for DeviceInfo (gps).
-rw-r--r--RtAudio.cpp2
-rw-r--r--doc/doxygen/probe.txt18
-rw-r--r--doc/release.txt6
3 files changed, 15 insertions, 11 deletions
diff --git a/RtAudio.cpp b/RtAudio.cpp
index cdefda4..8deb5f6 100644
--- a/RtAudio.cpp
+++ b/RtAudio.cpp
@@ -6874,11 +6874,11 @@ extern "C" void *ossCallbackHandler( void *ptr )
// message printing.
void RtApi :: error( RtError::Type type )
{
+ errorStream_.str(""); // clear the ostringstream
if ( type == RtError::WARNING && showWarnings_ == true )
std::cerr << '\n' << errorText_ << "\n\n";
else
throw( RtError( errorText_, type ) );
- errorStream_.str(""); // clear the ostringstream
}
void RtApi :: verifyStream()
diff --git a/doc/doxygen/probe.txt b/doc/doxygen/probe.txt
index 9fce97b..1352f51 100644
--- a/doc/doxygen/probe.txt
+++ b/doc/doxygen/probe.txt
@@ -37,15 +37,15 @@ The RtAudio::DeviceInfo structure is defined in RtAudio.h and provides a variety
\code
typedef struct RtAudio::DeviceInfo {
- bool probed; // true if the device capabilities were successfully probed.
- std::string name; // Character string device identifier.
- int outputChannels; // Maximum output channels supported by device.
- int inputChannels; // Maximum input channels supported by device.
- int duplexChannels; // Maximum simultaneous input/output channels supported by device.
- bool isDefaultOutput; // true if this is the default output device.
- bool isDefaultInput; // true if this is the default input device.
- std::vector<int> sampleRates; // Supported sample rates.
- RtAudioFormat nativeFormats; // Bit mask of supported data formats.
+ bool probed; // true if the device capabilities were successfully probed.
+ std::string name; // Character string device identifier.
+ unsigned int outputChannels; // Maximum output channels supported by device.
+ unsigned int inputChannels; // Maximum input channels supported by device.
+ unsigned int duplexChannels; // Maximum simultaneous input/output channels supported by device.
+ bool isDefaultOutput; // true if this is the default output device.
+ bool isDefaultInput; // true if this is the default input device.
+ std::vector<unsigned int> sampleRates; // Supported sample rates.
+ RtAudioFormat nativeFormats; // Bit mask of supported data formats.
};
\endcode
diff --git a/doc/release.txt b/doc/release.txt
index 1fa678d..8fc6384 100644
--- a/doc/release.txt
+++ b/doc/release.txt
@@ -1,6 +1,10 @@
RtAudio - a set of C++ classes that provide a common API for realtime audio input/output across Linux (native ALSA, JACK, and OSS), Macintosh OS X (CoreAudio and JACK), and Windows (DirectSound and ASIO) operating systems.
-By Gary P. Scavone, 2001-2007.
+By Gary P. Scavone, 2001-2008.
+
+v4.0.4: ()
+- fixed clearing of error message stream in error()
+- fixed RtAudio::DeviceInfo description in "probing" documentation
v4.0.3: (7 December 2007)
- added support for MinGW compiler to configure script