aboutsummaryrefslogtreecommitdiffstats
path: root/RtAudio.cpp
diff options
context:
space:
mode:
authorChris Kiefer <chrisk13fer@gmail.com>2011-08-25 16:00:21 +0100
committerChris Kiefer <chrisk13fer@gmail.com>2011-08-25 16:00:21 +0100
commit9c982dd80c0a73d96cbf8103bc33f1749b204a7c (patch)
tree423c8accf9ec62a7849d4e8e9c7d284d5507654e /RtAudio.cpp
parentd595100fefb826174591737727525d486c790b28 (diff)
parentf246be00cfd2ab25cb921552e9dd5a12c0605df7 (diff)
Merge branch 'master' of github.com:micknoise/Maximilian
Conflicts: .gitignore
Diffstat (limited to 'RtAudio.cpp')
-rw-r--r--RtAudio.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/RtAudio.cpp b/RtAudio.cpp
index 4a3966b..ecea3ea 100644
--- a/RtAudio.cpp
+++ b/RtAudio.cpp
@@ -3662,10 +3662,14 @@ unsigned int RtApiDs :: getDeviceCount( void )
// Clean out any devices that may have disappeared.
std::vector< int > indices;
- for ( unsigned int i=0; i<dsDevices.size(); i++ )
+ for ( unsigned int i=0; i<dsDevices.size(); i++ ) {
if ( dsDevices[i].found == false ) indices.push_back( i );
- for ( unsigned int nErased=0, unsigned int i=0; i<indices.size(); i++, nErased++ ) {
- dsDevices.erase( dsDevices.begin()-nErased );
+ }
+
+ unsigned int nErased=0;
+ for (unsigned int i=0; i<indices.size(); i++ ) {
+ dsDevices.erase( dsDevices.begin()-nErased );
+ nErased++;
}
return dsDevices.size();