Merge 4.0.10 into releases

7 files changed, 14 insertions, 9 deletions

diff --git a/Makefile.in b/Makefile.in
index 10b7ac3..b627531 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -8,7 +8,8 @@ OBJECTS	= RtAudio.o @objects@
 
 STATIC = librtaudio.a
 SHARED = @sharedlib@
-RELEASE = 4.0.7
+RELEASE = 4.0.10
+MAJOR = 4
 LIBRARIES = $(STATIC) $(SHARED)
 
 CC       = @CXX@
diff --git a/RtAudio.cpp b/RtAudio.cpp
index 4a3966b..d4f3819 100644
--- a/RtAudio.cpp
+++ b/RtAudio.cpp
@@ -38,7 +38,7 @@
 */

 /************************************************************************/

 

-// RtAudio: Version 4.0.9

+// RtAudio: Version 4.0.10

 

 #include "RtAudio.h"

 #include <iostream>

@@ -3664,9 +3664,9 @@ unsigned int RtApiDs :: getDeviceCount( void )
   std::vector< int > indices;

   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++ );

 

   return dsDevices.size();

 }

diff --git a/RtAudio.h b/RtAudio.h
index 6032368..368fda3 100644
--- a/RtAudio.h
+++ b/RtAudio.h
@@ -42,7 +42,7 @@
   \file RtAudio.h
  */
 
-// RtAudio: Version 4.0.9
+// RtAudio: Version 4.0.10
 
 #ifndef __RTAUDIO_H
 #define __RTAUDIO_H
diff --git a/configure.ac b/configure.ac
index 422d257..13132aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,7 +48,7 @@ AC_CANONICAL_HOST
 
 AC_SUBST( sharedlib, ["librtaudio.so"] )
 AC_SUBST( sharedname, ["librtaudio.so.\$(RELEASE)"] )
-AC_SUBST( libflags, ["-shared -Wl,-soname,\$(SHAREDLIB).\$(MAJOR) -o \$(SHAREDLIB).\$(RELEASE)"] )
+AC_SUBST( libflags, ["-shared -Wl,-soname,\$(SHARED).\$(MAJOR) -o \$(SHARED).\$(RELEASE)"] )
 case $host in
   *-apple*)
   AC_SUBST( sharedlib, ["librtaudio.dylib"] )
diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile
index a590a7b..f3c509e 100644
--- a/doc/doxygen/Doxyfile
+++ b/doc/doxygen/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = RtAudio
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 4.0.9
+PROJECT_NUMBER         = 4.0.10
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
diff --git a/doc/doxygen/tutorial.txt b/doc/doxygen/tutorial.txt
index 1066f41..39cb76a 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 (14 August 2011): <A href="http://www.music.mcgill.ca/~gary/rtaudio/release/rtaudio-4.0.9.tar.gz">Version 4.0.9</A>
+Latest Release (30 August 2011): <A href="http://www.music.mcgill.ca/~gary/rtaudio/release/rtaudio-4.0.10.tar.gz">Version 4.0.10</A>
 
 \section documentation Documentation Links
 
diff --git a/doc/release.txt b/doc/release.txt
index ebbc432..a3dab35 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-2011.
 
+v4.0.10: (30 August 2011)
+- fix for compile bug in Windows DS (counting devices)
+- update to configure and library Makefile
+
 v4.0.9: (14 August 2011)
 - fix for ASIO problem enumerating devices after opening duplex stream (Oliver Larkin)
 - fix for OS-X problems setting sample rate and bits-per-sample