From f79d75037a2c1054aa4677b9306b8ebc750b5db2 Mon Sep 17 00:00:00 2001 From: Ryan Schmidt Date: Sat, 25 Aug 2018 20:13:57 -0500 Subject: [PATCH 1/3] Change "Core Midi" to "CoreMIDI" --- include/RtMidi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/RtMidi.h b/include/RtMidi.h index 7ab50a9..9ba3fb1 100644 --- a/include/RtMidi.h +++ b/include/RtMidi.h @@ -120,7 +120,7 @@ class RtMidi //! MIDI API specifier arguments. enum Api { UNSPECIFIED, /*!< Search for a working compiled API. */ - MACOSX_CORE, /*!< Macintosh OS-X Core Midi API. */ + MACOSX_CORE, /*!< Macintosh OS-X CoreMIDI API. */ LINUX_ALSA, /*!< The Advanced Linux Sound Architecture API. */ UNIX_JACK, /*!< The JACK Low-Latency MIDI Server API. */ WINDOWS_MM, /*!< The Microsoft Multimedia MIDI API. */ From 21d392dca74357e513f9a63a7187bcc8c93fe63e Mon Sep 17 00:00:00 2001 From: Ryan Schmidt Date: Sat, 25 Aug 2018 20:15:08 -0500 Subject: [PATCH 2/3] Change "Core Audio" to "CoreAudio" --- INSTALL.md | 2 +- doc/doxygen/usage.txt | 4 ++-- include/RtAudio.h | 2 +- projects/examples/audioprobe.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index b197bc7..cd0d4c0 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -32,7 +32,7 @@ Several options can be passed to configure, including: --with-alsa = choose native ALSA API support (default, linux only) --with-oss = choose native OSS API support (unixes only) --with-jack = choose native JACK server API support (linux and macintosh OS-X) - --with-core = choose OS-X Core Audio API (macintosh OS-X only) + --with-core = choose OS-X CoreAudio API (macintosh OS-X only) --with-asio = choose ASIO API support (windows only) --with-ds = choose DirectSound API support (windows only) --with-wasapi = choose Windows Audio Session API support (windows only) diff --git a/doc/doxygen/usage.txt b/doc/doxygen/usage.txt index c441d1e..649960a 100644 --- a/doc/doxygen/usage.txt +++ b/doc/doxygen/usage.txt @@ -57,7 +57,7 @@ Several options can be supplied to the configure script to customize th
  • --with-alsa to choose native ALSA API support (default, linux only)
  • --with-oss to choose native OSS audio API support (linux only, no native OSS MIDI support)
  • --with-jack to choose native JACK API support (linux and Macintosh OS-X)
    • -
  • --with-core to choose Core Audio API support (Macintosh OS-X)
    • +
  • --with-core to choose CoreAudio API support (Macintosh OS-X)
  • --with-asio to choose ASIO Audio API support (Windows)
  • --with-ds to choose Windows Direct Sound Audio API support (Windows)
    • @@ -75,7 +75,7 @@ For those who wish to create their own system-specific Makefiles: diff --git a/include/RtAudio.h b/include/RtAudio.h index a9fa650..5e072cd 100644 --- a/include/RtAudio.h +++ b/include/RtAudio.h @@ -271,7 +271,7 @@ class RtAudio LINUX_PULSE, /*!< The Linux PulseAudio API. */ LINUX_OSS, /*!< The Linux Open Sound System API. */ UNIX_JACK, /*!< The Jack Low-Latency Audio Server API. */ - MACOSX_CORE, /*!< Macintosh OS-X Core Audio API. */ + MACOSX_CORE, /*!< Macintosh OS-X CoreAudio API. */ WINDOWS_WASAPI, /*!< The Microsoft WASAPI API. */ WINDOWS_ASIO, /*!< The Steinberg Audio Stream I/O API. */ WINDOWS_DS, /*!< The Microsoft Direct Sound API. */ diff --git a/projects/examples/audioprobe.cpp b/projects/examples/audioprobe.cpp index f7246fb..1ece884 100644 --- a/projects/examples/audioprobe.cpp +++ b/projects/examples/audioprobe.cpp @@ -15,7 +15,7 @@ int main() { // Create an api map. std::map apiMap; - apiMap[RtAudio::MACOSX_CORE] = "OS-X Core Audio"; + apiMap[RtAudio::MACOSX_CORE] = "OS-X CoreAudio"; apiMap[RtAudio::WINDOWS_ASIO] = "Windows ASIO"; apiMap[RtAudio::WINDOWS_DS] = "Windows Direct Sound"; apiMap[RtAudio::UNIX_JACK] = "Jack Client"; From 5e28beb4dbe6cf56a027a6f5f0fb9e362a5b4f12 Mon Sep 17 00:00:00 2001 From: Ryan Schmidt Date: Sat, 25 Aug 2018 20:16:07 -0500 Subject: [PATCH 3/3] Change "Direct Sound" to "DirectSound" --- doc/doxygen/information.txt | 2 +- doc/doxygen/usage.txt | 2 +- include/RtAudio.h | 6 +++--- projects/examples/audioprobe.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/doxygen/information.txt b/doc/doxygen/information.txt index 792fca7..b331abd 100644 --- a/doc/doxygen/information.txt +++ b/doc/doxygen/information.txt @@ -40,7 +40,7 @@ greatly expanded the synthesis techniques available. With the help of Bill Putnam, Perry also made a port of STK to Windows95. Gary Scavone began using STK extensively in the summer of 1997 and completed a full port of STK to Linux early in 1998. He finished the fully compatable -Windows port (using Direct Sound API) in June 1998. Numerous +Windows port (using DirectSound API) in June 1998. Numerous improvements and extensions have been made since then. The Toolkit has been distributed continuously since 1996 via the configure script to customize th
  • --with-jack to choose native JACK API support (linux and Macintosh OS-X)
  • --with-core to choose CoreAudio API support (Macintosh OS-X)
  • --with-asio to choose ASIO Audio API support (Windows)
    • -
  • --with-ds to choose Windows Direct Sound Audio API support (Windows)
    • +
  • --with-ds to choose Windows DirectSound Audio API support (Windows)

    • Note that it is possible to specify as many of the "--with-" options as desired to compile multi-API support. In addition, it is possible to specify the location of the STK rawwaves and the STK include path as follows: diff --git a/include/RtAudio.h b/include/RtAudio.h index 5e072cd..47d4214 100644 --- a/include/RtAudio.h +++ b/include/RtAudio.h @@ -102,7 +102,7 @@ static const RtAudioFormat RTAUDIO_FLOAT64 = 0x20; // Normalized between plus/mi Certain audio APIs offer a number of parameters that influence the I/O latency of a stream. By default, RtAudio will attempt to set these parameters internally for robust (glitch-free) performance - (though some APIs, like Windows Direct Sound, make this difficult). + (though some APIs, like Windows DirectSound, make this difficult). By passing the RTAUDIO_MINIMIZE_LATENCY flag to the openStream() function, internal stream settings will be influenced in an attempt to minimize stream latency, though possibly at the expense of stream @@ -274,7 +274,7 @@ class RtAudio MACOSX_CORE, /*!< Macintosh OS-X CoreAudio API. */ WINDOWS_WASAPI, /*!< The Microsoft WASAPI API. */ WINDOWS_ASIO, /*!< The Steinberg Audio Stream I/O API. */ - WINDOWS_DS, /*!< The Microsoft Direct Sound API. */ + WINDOWS_DS, /*!< The Microsoft DirectSound API. */ RTAUDIO_DUMMY /*!< A compilable but non-functional API. */ }; @@ -333,7 +333,7 @@ class RtAudio Certain audio APIs offer a number of parameters that influence the I/O latency of a stream. By default, RtAudio will attempt to set these parameters internally for robust (glitch-free) performance - (though some APIs, like Windows Direct Sound, make this difficult). + (though some APIs, like Windows DirectSound, make this difficult). By passing the RTAUDIO_MINIMIZE_LATENCY flag to the openStream() function, internal stream settings will be influenced in an attempt to minimize stream latency, though possibly at the expense of stream diff --git a/projects/examples/audioprobe.cpp b/projects/examples/audioprobe.cpp index 1ece884..ece84ac 100644 --- a/projects/examples/audioprobe.cpp +++ b/projects/examples/audioprobe.cpp @@ -17,7 +17,7 @@ int main() std::map apiMap; apiMap[RtAudio::MACOSX_CORE] = "OS-X CoreAudio"; apiMap[RtAudio::WINDOWS_ASIO] = "Windows ASIO"; - apiMap[RtAudio::WINDOWS_DS] = "Windows Direct Sound"; + apiMap[RtAudio::WINDOWS_DS] = "Windows DirectSound"; apiMap[RtAudio::UNIX_JACK] = "Jack Client"; apiMap[RtAudio::LINUX_ALSA] = "Linux ALSA"; apiMap[RtAudio::LINUX_OSS] = "Linux OSS";