summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Scavone <gary@music.mcgill.ca>2007-08-21 17:40:16 +0000
committerStephen Sinclair <sinclair@music.mcgill.ca>2013-10-11 01:24:07 +0200
commit506f4cdf5aa5ed74f6ab47616fbf1ea1ab54e328 (patch)
treefcee0e9b6f0c0f6bbc1f689a7db1d666df71f5c9
parent8f2275b4cf067760f574e00c41697107930e1912 (diff)
- Missing RtError:: for WARNING in RtAudio.h (RtApiDummy) (GS)
- Deleted "+1" in c++ append command for RtApiCore device naming (GS)
-rw-r--r--RtAudio.cpp4
-rw-r--r--RtAudio.h2
2 files changed, 3 insertions, 3 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; };