Update to CMake file for WASAPI; documentation update for CMake; finalized date for...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 365ce751f4ec9b4f82754569a21bcd1905be08d1..b96b769888ca4448223e08ce0ebb911246156215 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,7 @@ include(CheckFunctionExists)
 option(BUILD_PYTHON "Build PyRtAudio python bindings" OFF)
 option(AUDIO_WINDOWS_DS "Build Windows DirectSound API" OFF)
 option(AUDIO_WINDOWS_ASIO "Build Windows ASIO API" OFF)
 option(BUILD_PYTHON "Build PyRtAudio python bindings" OFF)
 option(AUDIO_WINDOWS_DS "Build Windows DirectSound API" OFF)
 option(AUDIO_WINDOWS_ASIO "Build Windows ASIO API" OFF)

+option(AUDIO_WINDOWS_WASAPI "Build Windows WASAPI API" OFF)

 option(AUDIO_LINUX_OSS "Build Linux OSS API" OFF)
 option(AUDIO_LINUX_ALSA "Build Linux ALSA API" OFF)
 option(AUDIO_LINUX_PULSE "Build Linux PulseAudio API" OFF)
 option(AUDIO_LINUX_OSS "Build Linux OSS API" OFF)
 option(AUDIO_LINUX_ALSA "Build Linux ALSA API" OFF)
 option(AUDIO_LINUX_PULSE "Build Linux PulseAudio API" OFF)


@@ -79,15 +80,13 @@ if (UNIX)
     if (AUDIO_UNIX_JACK)
         find_library(JACK_LIB jack)
         list(APPEND LINKLIBS ${JACK_LIB})
     if (AUDIO_UNIX_JACK)
         find_library(JACK_LIB jack)
         list(APPEND LINKLIBS ${JACK_LIB})

-#        jack_client_open
-#    AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(Jack support also requires the asound library!))], )

         add_definitions(-D__UNIX_JACK__)
         message(STATUS "Using JACK")
     endif (AUDIO_UNIX_JACK)
 endif (UNIX)
 
 if (WIN32)
         add_definitions(-D__UNIX_JACK__)
         message(STATUS "Using JACK")
     endif (AUDIO_UNIX_JACK)
 endif (UNIX)
 
 if (WIN32)

-    if (NOT AUDIO_WINDOWS_DS AND NOT AUDIO_WINDOWS_ASIO)
+    if (NOT AUDIO_WINDOWS_DS AND NOT AUDIO_WINDOWS_ASIO AND NOT AUDIO_WINDOWS_WASAPI)

         set(AUDIO_WINDOWS_DS ON)
     endif()
 
         set(AUDIO_WINDOWS_DS ON)
     endif()
 


@@ -98,6 +97,10 @@ if (WIN32)
         add_definitions(-D__WINDOWS_DS__)
         message(STATUS "Using Windows DirectSound")
     endif (AUDIO_WINDOWS_DS)
         add_definitions(-D__WINDOWS_DS__)
         message(STATUS "Using Windows DirectSound")
     endif (AUDIO_WINDOWS_DS)

+    if (AUDIO_WINDOWS_WASAPI)
+        add_definitions(-D__WINDOWS_WASAPI__)
+        message(STATUS "Using Windows WASAPI")
+    endif (AUDIO_WINDOWS_WASAPI)

     if (AUDIO_WINDOWS_ASIO)
         list(APPEND rtaudio_SOURCES
             include/asio.cpp
     if (AUDIO_WINDOWS_ASIO)
         list(APPEND rtaudio_SOURCES
             include/asio.cpp

diff --git a/doc/doxygen/tutorial.txt b/doc/doxygen/tutorial.txt
index 66521d967c968cfb8adafdd02112f314db6b4ec9..fc1a226fdb74edf3559f3fa0467745b5dd5a32ac 100644 (file)
--- a/doc/doxygen/tutorial.txt
+++ b/doc/doxygen/tutorial.txt
@@ -22,14 +22,16 @@ A minor API change was made. The RtError class was renamed RtAudioError and embe
 Other changes in this release include:
 
 - new support for the Windows WASAPI API (thanks to Marcus Tomlinson)
 Other changes in this release include:
 
 - new support for the Windows WASAPI API (thanks to Marcus Tomlinson)

+- CMake support (thanks to Berkus Decker)

 - pulse audio update to support bufferFrames argument with audio input (thanks to Jonatan Wallmander)
 - fixes for ALSA API to avoid high CPU usage during stops and to clear stale data before input (thanks to Pluto Hades)
 - miscellaneous efficiency updates suggested by Martin Koegler
 - bug fix for OS-X xrun reporting problem
 - pulse audio update to support bufferFrames argument with audio input (thanks to Jonatan Wallmander)
 - fixes for ALSA API to avoid high CPU usage during stops and to clear stale data before input (thanks to Pluto Hades)
 - miscellaneous efficiency updates suggested by Martin Koegler
 - bug fix for OS-X xrun reporting problem

+- bug fix if error when opening a stream after closing a previously open stream

 
 \section download Download
 
 
 \section download Download
 

-Latest Release (?? April 2014): <A href="http://www.music.mcgill.ca/~gary/rtaudio/release/rtaudio-4.1.0.tar.gz">Version 4.1.0</A>
+Latest Release (10 April 2014): <A href="http://www.music.mcgill.ca/~gary/rtaudio/release/rtaudio-4.1.0.tar.gz">Version 4.1.0</A>

 
 \section documentation Documentation Links
 
 
 \section documentation Documentation Links
 

diff --git a/doc/release.txt b/doc/release.txt
index c4a9aca9c78f84ed38b88c657169f946b1b2a3cf..91807fbb6374edf25db39ed1028c0b65ed125be0 100644 (file)
--- a/doc/release.txt
+++ b/doc/release.txt
@@ -2,9 +2,10 @@ RtAudio - a set of C++ classes that provide a common API for realtime audio inpu
 
 By Gary P. Scavone, 2001-2014.
 
 
 By Gary P. Scavone, 2001-2014.
 

-v4.1.0: (?? April 2014)
+v4.1.0: (10 April 2014)

 - RtError class renamed RtAudioError and embedded in RtAudio.h (RtError.h deleted)
 - new support for the Windows WASAPI API (thanks to Marcus Tomlinson)
 - RtError class renamed RtAudioError and embedded in RtAudio.h (RtError.h deleted)
 - new support for the Windows WASAPI API (thanks to Marcus Tomlinson)

+- CMake support (thanks to Berkus Decker)

 - pulse audio update to support bufferFrames argument with audio input (thanks to Jonatan Wallmander)
 - fixes for ALSA API to avoid high CPU usage during stops and to clear stale data before input (thanks to Pluto Hades)
 - miscellaneous efficiency updates suggested by Martin Koegler
 - pulse audio update to support bufferFrames argument with audio input (thanks to Jonatan Wallmander)
 - fixes for ALSA API to avoid high CPU usage during stops and to clear stale data before input (thanks to Pluto Hades)
 - miscellaneous efficiency updates suggested by Martin Koegler

diff --git a/install b/install
index 2afaa41e0d41d9608c7b944528bd19fa5e19b5ad..fd2b4c62f74d781d57698cfbb54d4def4350e2d0 100644 (file)
--- a/install
+++ b/install
@@ -5,6 +5,7 @@ By Gary P. Scavone, 2001-2014.
 To configure and compile (on Unix systems and MinGW):
 
 1. Unpack the RtAudio distribution (tar -xzf rtaudio-x.x.tar.gz).
 To configure and compile (on Unix systems and MinGW):
 
 1. Unpack the RtAudio distribution (tar -xzf rtaudio-x.x.tar.gz).

+

 2. From within the directory containing this file, run configure:
 
    ./configure
 2. From within the directory containing this file, run configure:
 
    ./configure


@@ -33,7 +34,16 @@ If you wish to use a different compiler than that selected by configure, specify
   ./configure CXX=CC
 
 
   ./configure CXX=CC
 
 

-WINDOWS USERS:
+CMAKE USAGE:
+
+CMake support is provided via the CMakeLists.txt files.  Assuming you have CMake installed on your system, a typical usage would involve the following steps (from within the parent distribution directory):
+
+mkdir _build_
+cd _build_
+cmake <path to CMakeLists.txt usually two dots> <options> e.g. cmake .. -DAUDIO_WINDOWS_WASAPI=ON
+
+
+WINDOWS:

 
 The DirectSound and ASIO APIs in RtAudio compile with either the MinGW compiler or MS Visual Studio.  The WASAPI API currently only compiles in MS Visual Studio.
 
 
 The DirectSound and ASIO APIs in RtAudio compile with either the MinGW compiler or MS Visual Studio.  The WASAPI API currently only compiles in MS Visual Studio.