summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Sinclair <sinclair@music.mcgill.ca>2013-10-11 01:50:50 +0200
committerStephen Sinclair <sinclair@music.mcgill.ca>2013-10-11 01:50:50 +0200
commitca0d4409186d0317c0c6377a0de6f7d72232bba4 (patch)
tree59427c62360c6f8cd0f1f5c84db45dcc7b5a7a5e
parent36a9647a9f57cb70a7748f702b174cd619c3ecbd (diff)
parentb00c41f84cfb7fc3e94ea52aeb8d9b05376399fb (diff)
Merge 4.0.2 into releases
-rw-r--r--RtAudio.cpp4
-rw-r--r--RtAudio.h2
-rw-r--r--doc/doxygen/tutorial.txt2
-rw-r--r--doc/release.txt4
4 files changed, 8 insertions, 4 deletions
diff --git a/RtAudio.cpp b/RtAudio.cpp
index 376319c..dd76b59 100644
--- a/RtAudio.cpp
+++ b/RtAudio.cpp
@@ -539,7 +539,7 @@ RtAudio::DeviceInfo RtApiCore :: getDeviceInfo( unsigned int device )
error( RtError::WARNING );
return info;
}
- info.name.append( (const char *)name, strlen(name) + 1 );
+ info.name.append( (const char *)name, strlen(name) );
info.name.append( ": " );
dataSize = 256;
@@ -552,7 +552,7 @@ RtAudio::DeviceInfo RtApiCore :: getDeviceInfo( unsigned int device )
error( RtError::WARNING );
return info;
}
- info.name.append( (const char *)name, strlen(name) + 1 );
+ info.name.append( (const char *)name, strlen(name) );
// Get the output stream "configuration".
AudioBufferList *bufferList = nil;
diff --git a/RtAudio.h b/RtAudio.h
index 1c54e97..db90a82 100644
--- a/RtAudio.h
+++ b/RtAudio.h
@@ -911,7 +911,7 @@ class RtApiDummy: public RtApi
{
public:
- RtApiDummy() { errorText_ = "RtApiDummy: This class provides no functionality."; error( WARNING ); };
+ RtApiDummy() { errorText_ = "RtApiDummy: This class provides no functionality."; error( RtError::WARNING ); };
RtAudio::Api getCurrentApi( void ) { return RtAudio::RTAUDIO_DUMMY; };
unsigned int getDeviceCount( void ) { return 0; };
RtAudio::DeviceInfo getDeviceInfo( unsigned int device ) { RtAudio::DeviceInfo info; return info; };
diff --git a/doc/doxygen/tutorial.txt b/doc/doxygen/tutorial.txt
index ffbc435..76b28b0 100644
--- a/doc/doxygen/tutorial.txt
+++ b/doc/doxygen/tutorial.txt
@@ -32,7 +32,7 @@ Devices are now re-enumerated every time the RtAudio::getDeviceCount(), RtAudio:
\section download Download
-Latest Release (13 August 2007): <A href="http://music.mcgill.ca/~gary/rtaudio/release/rtaudio-4.0.1.tar.gz">Version 4.0.1</A>
+Latest Release (21 August 2007): <A href="http://music.mcgill.ca/~gary/rtaudio/release/rtaudio-4.0.2.tar.gz">Version 4.0.2</A>
\section documentation Documentation Links
diff --git a/doc/release.txt b/doc/release.txt
index d5f3415..4ce42af 100644
--- a/doc/release.txt
+++ b/doc/release.txt
@@ -2,6 +2,10 @@ RtAudio - a set of C++ classes that provide a common API for realtime audio inpu
By Gary P. Scavone, 2001-2007.
+v4.0.2: (21 August 2007)
+- fix to RtError::WARNING typo in RtAudio.h (RtApiDummy)
+- removed "+1"s in RtApiCore c++ append when getting device name
+
v4.0.1: (13 August 2007)
- fix to RtError::WARNING typo in RtAudio.cpp