Merge pull request #49 from radarsat1/automake

Port the build system to automake

diff --git a/RtAudio.cpp b/RtAudio.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 509e949..882fa0e
--- a/RtAudio.cpp
+++ b/RtAudio.cpp
@@ -10,7 +10,7 @@
     RtAudio WWW site: http://www.music.mcgill.ca/~gary/rtaudio/\r
 \r
     RtAudio: realtime audio i/o C++ classes\r
-    Copyright (c) 2001-2014 Gary P. Scavone\r
+    Copyright (c) 2001-2016 Gary P. Scavone\r
 \r
     Permission is hereby granted, free of charge, to any person\r
     obtaining a copy of this software and associated documentation files\r
@@ -38,7 +38,7 @@
 */\r
 /************************************************************************/\r
 \r
-// RtAudio: Version 4.1.1\r
+// RtAudio: Version 4.1.2\r
 \r
 #include "RtAudio.h"\r
 #include <iostream>\r

diff --git a/RtAudio.h b/RtAudio.h
index ea08fdaa34153c321076d6176e6b10f7150f0631..11345cc6d8a72f2ea35f6d5abf44c02e266d150a 100644 (file)
--- a/RtAudio.h
+++ b/RtAudio.h
@@ -10,7 +10,7 @@
     RtAudio WWW site: http://www.music.mcgill.ca/~gary/rtaudio/
 
     RtAudio: realtime audio i/o C++ classes
-    Copyright (c) 2001-2014 Gary P. Scavone
+    Copyright (c) 2001-2016 Gary P. Scavone
 
     Permission is hereby granted, free of charge, to any person
     obtaining a copy of this software and associated documentation files
@@ -45,7 +45,7 @@
 #ifndef __RTAUDIO_H
 #define __RTAUDIO_H
 
-#define RTAUDIO_VERSION "4.1.1"
+#define RTAUDIO_VERSION "4.1.2"
 
 #include <string>
 #include <vector>

diff --git a/configure.ac b/configure.ac
index cf1309c43e57d75cc834629436fe1313286e6d76..a61ee043ec3d610d1fdd08ff81ee425560ceaefb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(RtAudio, 4.1, gary@music.mcgill.ca, rtaudio)
+AC_INIT(RtAudio, 4.1.1, gary@music.mcgill.ca, rtaudio)
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_SRCDIR(RtAudio.cpp)
 AC_CONFIG_FILES([rtaudio-config rtaudio.pc Makefile tests/Makefile doc/Makefile doc/doxygen/Doxyfile])
@@ -65,6 +65,15 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_HEADER_STDC
 AC_CHECK_HEADERS(sys/ioctl.h unistd.h)
 
+# Check version number coherency between RtAudio.h and configure.ac
+AC_MSG_CHECKING([that version numbers are coherent])
+AC_RUN_IFELSE(
+   [AC_LANG_PROGRAM([#include <string.h>
+                     `grep "define RTAUDIO_VERSION" $srcdir/RtAudio.h`],
+                    [return strcmp(RTAUDIO_VERSION, PACKAGE_VERSION);])],
+   [AC_MSG_RESULT([yes])],
+   [AC_MSG_FAILURE([testing RTAUDIO_VERSION==PACKAGE_VERSION failed, check that RtAudio.h defines RTAUDIO_VERSION as "$PACKAGE_VERSION" or that the first line of configure.ac has been updated.])])
+
 # Check for debug
 AC_MSG_CHECKING(whether to compile debug version)
 AC_ARG_ENABLE(debug,
@@ -72,7 +81,6 @@ AC_ARG_ENABLE(debug,
   [AC_SUBST( cppflag, [-D__RTAUDIO_DEBUG__] ) AC_SUBST( cxxflag, [-g] ) AC_SUBST( object_path, [Debug] ) AC_MSG_RESULT(yes)],
   [AC_SUBST( cppflag, [] ) AC_SUBST( cxxflag, [-O2] ) AC_SUBST( object_path, [Release] ) AC_MSG_RESULT(no)])
 
-
 # Checks for functions
 AC_CHECK_FUNC(gettimeofday, [cppflag="$cppflag -DHAVE_GETTIMEOFDAY"], )
 

diff --git a/doc/doxygen/footer.html b/doc/doxygen/footer.html
index 086b22bb2a32006442e0806c65a31c88910887ab..4fb5c48c10348824c0830c7ebad12e9381fc2f78 100644 (file)
--- a/doc/doxygen/footer.html
+++ b/doc/doxygen/footer.html
@@ -1,7 +1,7 @@
 <HR>
 
 <table><tr><td><img src="../images/mcgill.gif" width=165></td>
-  <td>&copy;2001-2014 Gary P. Scavone, McGill University. All Rights Reserved.<br>Maintained by <a href="http://www.music.mcgill.ca/~gary/">Gary P. Scavone</a>.</td></tr>
+  <td>&copy;2001-2016 Gary P. Scavone, McGill University. All Rights Reserved.<br>Maintained by <a href="http://www.music.mcgill.ca/~gary/">Gary P. Scavone</a>.</td></tr>
 </table>
 
 </BODY>

diff --git a/doc/doxygen/license.txt b/doc/doxygen/license.txt
index c595b4f2fe3c5b51d25b00277d2edb3708078f3a..10729213c0d52920ec5c754cf2c82bd58387498e 100644 (file)
--- a/doc/doxygen/license.txt
+++ b/doc/doxygen/license.txt
@@ -1,7 +1,7 @@
 /*! \page license License
 
     RtAudio: a set of realtime audio i/o C++ classes<BR>
-    Copyright (c) 2001-2012 Gary P. Scavone
+    Copyright (c) 2001-2016 Gary P. Scavone
 
     Permission is hereby granted, free of charge, to any person
     obtaining a copy of this software and associated documentation files

diff --git a/doc/doxygen/tutorial.txt b/doc/doxygen/tutorial.txt
index 04b77d9392d6e938180a548d9a8e97f0477a311c..f65aed1120831330ffc9872c459b928aa47859ab 100644 (file)
--- a/doc/doxygen/tutorial.txt
+++ b/doc/doxygen/tutorial.txt
@@ -2,32 +2,24 @@
 
 RtAudio is a set of C++ classes that provide a common API (Application Programming Interface) for realtime audio input/output across Linux, Macintosh OS-X and Windows operating systems.  RtAudio significantly simplifies the process of interacting with computer audio hardware.  It was designed with the following objectives:
 
-<UL>
-  <LI>object-oriented C++ design</LI>
-  <LI>simple, common API across all supported platforms</LI>
-  <LI>only one source and one header file for easy inclusion in programming projects</LI>
-  <LI>allow simultaneous multi-api support</LI>
-  <LI>support dynamic connection of devices</LI>
-  <LI>provide extensive audio device parameter control</LI>
-  <LI>allow audio device capability probing</LI>
-  <LI>automatic internal conversion for data format, channel number compensation, (de)interleaving, and byte-swapping</LI>
-</UL>
+- object-oriented C++ design
+- simple, common API across all supported platforms
+- only one source and one header file for easy inclusion in programming projects
+- allow simultaneous multi-api support
+- support dynamic connection of devices
+- provide extensive audio device parameter control
+- allow audio device capability probing
+- automatic internal conversion for data format, channel number compensation, (de)interleaving, and byte-swapping
 
 RtAudio incorporates the concept of audio streams, which represent audio output (playback) and/or input (recording).  Available audio devices and their capabilities can be enumerated and then specified when opening a stream.  Where applicable, multiple API support can be compiled and a particular API specified when creating an RtAudio instance.  See the \ref apinotes section for information specific to each of the supported audio APIs.
 
-\section whatsnew Latest Updates (Version 4.1.1)
+\section whatsnew Latest Updates (Version 4.1.2)
 
 Changes in this release include:
 
-- updates to WASAPI API for MinGW compiling
-- WASAPI bug fixes for audio INPUT mode (thanks to Marcus Tomlinson)
-- DirectSound bug fix for INPUT mode
-- Bug fixes in Core, Jack, ASIO and DS for internal draining in INPUT mode
-- updates to test programs for default device specifiers
-- CMake buildfile update for WASAPI
-- new setStreamTime function
+- miscellaneous small fixes for the various systems (more details in  <A href="http://github.com/thestk/rtaudio">GitHub</A>)
 
-Changes in the previous 4.1.0 release included:
+Changes in the 4.1.0 release included:
 
 - RtError class renamed RtAudioError and embedded in RtAudio.h (RtError.h deleted)
 - new support for the Windows WASAPI API (thanks to Marcus Tomlinson)
@@ -40,7 +32,7 @@ Changes in the previous 4.1.0 release included:
 
 \section download Download
 
-Latest Release (26 April 2014): <A href="http://www.music.mcgill.ca/~gary/rtaudio/release/rtaudio-4.1.1.tar.gz">Version 4.1.1</A>
+Latest Release (?? February 2016): <A href="http://www.music.mcgill.ca/~gary/rtaudio/release/rtaudio-4.1.2.tar.gz">Version 4.1.2</A>
 
 \section documentation Documentation Links
 

diff --git a/doc/release.txt b/doc/release.txt
index 9dc44a3380ed2801b8deda61227830bdc93a0feb..44f94b2ecc8f0f30b87d68924a9910cfe3d5021f 100644 (file)
--- a/doc/release.txt
+++ b/doc/release.txt
@@ -1,6 +1,9 @@
 RtAudio - a set of C++ classes that provide a common API for realtime audio input/output across Linux (native ALSA, JACK, PulseAudio, and OSS), Macintosh OS X (CoreAudio and JACK), and Windows (DirectSound, ASIO and WASAPI) operating systems.
 
-By Gary P. Scavone, 2001-2014.
+By Gary P. Scavone, 2001-2016.
+
+v4.1.2: (?? February 2016)
+- miscellaneous updates, see github repo commit history for details
 
 v4.1.1: (26 April 2014)
 - updates to WASAPI API for MinGW compiling

diff --git a/readme b/readme
index bb04c7ef961b3db074ddbc64298f6cee4618d706..d86078fc1550532d119f72f66e803e28939b49a9 100644 (file)
--- a/readme
+++ b/readme
@@ -1,6 +1,6 @@
 RtAudio - a set of C++ classes that provide a common API for realtime audio input/output across Linux (native ALSA, JACK, PulseAudio and OSS), Macintosh OS X (CoreAudio and JACK), and Windows (DirectSound, ASIO and WASAPI) operating systems.
 
-By Gary P. Scavone, 2001-2014.
+By Gary P. Scavone, 2001-2016.
 
 This distribution of RtAudio contains the following:
 
@@ -34,7 +34,7 @@ LEGAL AND ETHICAL:
 The RtAudio license is similar to the MIT License.
 
     RtAudio: a set of realtime audio i/o C++ classes
-    Copyright (c) 2001-2014 Gary P. Scavone
+    Copyright (c) 2001-2016 Gary P. Scavone
 
     Permission is hereby granted, free of charge, to any person
     obtaining a copy of this software and associated documentation files

diff --git a/tests/duplex.cpp b/tests/duplex.cpp
index 43d12179bc9c028e0843bdff5c406d877ed5602f..06462f2872aae5edbf6f883c01037cc8756f7df4 100644 (file)
--- a/tests/duplex.cpp
+++ b/tests/duplex.cpp
@@ -55,7 +55,7 @@ int inout( void *outputBuffer, void *inputBuffer, unsigned int /*nBufferFrames*/
   // a simple buffer copy operation here.
   if ( status ) std::cout << "Stream over/underflow detected." << std::endl;
 
-  uint32_t *bytes = (uint32_t *) data;
+  unsigned int *bytes = (unsigned int *) data;
   memcpy( outputBuffer, inputBuffer, *bytes );
   return 0;
 }