Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed all system references of 'Linux' to 'GNU/Linux'
  • Loading branch information
mtytel committed Jan 22, 2014
1 parent 5cc5918 commit fb6ddc2
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 35 deletions.
6 changes: 3 additions & 3 deletions rtaudio/RtAudio.cpp
Expand Up @@ -3,7 +3,7 @@
\brief Realtime audio i/o C++ classes.
RtAudio provides a common API (Application Programming Interface)
for realtime audio input/output across Linux (native ALSA, Jack,
for realtime audio input/output across GNU/Linux (native ALSA, Jack,
and OSS), Macintosh OS X (CoreAudio and Jack), and Windows
(DirectSound and ASIO) operating systems.
Expand Down Expand Up @@ -2562,7 +2562,7 @@ bool RtApiJack :: callbackEvent( unsigned long nframes )
#if defined(__WINDOWS_ASIO__) // ASIO API on Windows

// The ASIO API is designed around a callback scheme, so this
// implementation is similar to that used for OS-X CoreAudio and Linux
// implementation is similar to that used for OS-X CoreAudio and GNU/Linux
// Jack. The primary constraint with ASIO is that it only allows
// access to a single driver at a time. Thus, it is not possible to
// have more than one simultaneous RtAudio stream.
Expand Down Expand Up @@ -5946,7 +5946,7 @@ bool RtApiAlsa :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne

// Set the thread attributes for joinable and realtime scheduling
// priority (optional). The higher priority will only take affect
// if the program is run as root or suid. Note, under Linux
// if the program is run as root or suid. Note, under GNU/Linux
// processes with CAP_SYS_NICE privilege, a user can change
// scheduling policy and priority (thus need not be root). See
// POSIX "capabilities".
Expand Down
12 changes: 6 additions & 6 deletions rtaudio/RtAudio.h
Expand Up @@ -3,7 +3,7 @@
\brief Realtime audio i/o C++ classes.
RtAudio provides a common API (Application Programming Interface)
for realtime audio input/output across Linux (native ALSA, Jack,
for realtime audio input/output across GNU/Linux (native ALSA, Jack,
and OSS), Macintosh OS X (CoreAudio and Jack), and Windows
(DirectSound and ASIO) operating systems.
Expand Down Expand Up @@ -214,9 +214,9 @@ class RtAudio
//! Audio API specifier arguments.
enum Api {
UNSPECIFIED, /*!< Search for a working compiled API. */
LINUX_ALSA, /*!< The Advanced Linux Sound Architecture API. */
LINUX_PULSE, /*!< The Linux PulseAudio API. */
LINUX_OSS, /*!< The Linux Open Sound System API. */
LINUX_ALSA, /*!< The Advanced GNU/Linux Sound Architecture API. */
LINUX_PULSE, /*!< The GNU/Linux PulseAudio API. */
LINUX_OSS, /*!< The GNU/Linux Open Sound System API. */
UNIX_JACK, /*!< The Jack Low-Latency Audio Server API. */
MACOSX_CORE, /*!< Macintosh OS-X Core Audio API. */
WINDOWS_ASIO, /*!< The Steinberg Audio Stream I/O API. */
Expand Down Expand Up @@ -298,7 +298,7 @@ class RtAudio
will override any specified input or output device id.
The \c numberOfBuffers parameter can be used to control stream
latency in the Windows DirectSound, Linux OSS, and Linux Alsa APIs
latency in the Windows DirectSound, GNU/Linux OSS, and GNU/Linux Alsa APIs
only. A value of two is usually the smallest allowed. Larger
numbers can potentially result in more robust stream performance,
though likely at the cost of stream latency. The value set by the
Expand Down Expand Up @@ -338,7 +338,7 @@ class RtAudio
can be thrown.
If no API argument is specified and multiple API support has been
compiled, the default order of use is JACK, ALSA, OSS (Linux
compiled, the default order of use is JACK, ALSA, OSS (GNU/Linux
systems) and ASIO, DS (Windows systems).
*/
RtAudio( RtAudio::Api api=UNSPECIFIED ) throw();
Expand Down
10 changes: 5 additions & 5 deletions rtaudio/configure.ac
Expand Up @@ -86,29 +86,29 @@ case $host in
;;

*-*-linux*)
AC_ARG_WITH(jack, [ --with-jack = choose JACK server support (mac and linux only)], [
AC_ARG_WITH(jack, [ --with-jack = choose JACK server support (Mac OSX and GNU/Linux only)], [
api="$api -D__UNIX_JACK__"
AC_MSG_RESULT(using JACK)
AC_CHECK_LIB(jack, jack_client_open, , AC_MSG_ERROR(JACK support requires the jack library!))
AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(Jack support also requires the asound library!))], )

# Look for ALSA flag
AC_ARG_WITH(alsa, [ --with-alsa = choose native ALSA API support (linux only)], [
AC_ARG_WITH(alsa, [ --with-alsa = choose native ALSA API support (GNU/Linux only)], [
api="$api -D__LINUX_ALSA__"
req="$req alsa"
AC_MSG_RESULT(using ALSA)
AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))], )

# Look for PULSE flag
AC_ARG_WITH(pulse, [ --with-pulse = choose PulseAudio API support (linux only)], [
AC_ARG_WITH(pulse, [ --with-pulse = choose PulseAudio API support (GNU/Linux only)], [
api="$api -D__LINUX_PULSE__"
req="$req libpulse-simple"
AC_MSG_RESULT(using PulseAudio)
PKG_CHECK_MODULES([PULSE], [libpulse-simple], , AC_MSG_ERROR(PulseAudio support requires the pulse-simple library!))
LIBS="$LIBS `pkg-config --libs libpulse-simple`" ], )

# Look for OSS flag
AC_ARG_WITH(oss, [ --with-oss = choose OSS API support (linux only)], [
AC_ARG_WITH(oss, [ --with-oss = choose OSS API support (GNU/Linux only)], [
api="$api -D__LINUX_OSS__"
AC_MSG_RESULT(using OSS)], )

Expand All @@ -134,7 +134,7 @@ case $host in


# Look for Core flag
AC_ARG_WITH(core, [ --with-core = choose CoreAudio API support (mac only)], [
AC_ARG_WITH(core, [ --with-core = choose CoreAudio API support (Mac OSX only)], [
api="$api -D__MACOSX_CORE__"
AC_MSG_RESULT(using CoreAudio)
AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [], [AC_MSG_ERROR(CoreAudio header files not found!)] )
Expand Down
12 changes: 6 additions & 6 deletions rtaudio/install
@@ -1,4 +1,4 @@
RtAudio - a set of C++ classes which 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 and ASIO) operating systems.
RtAudio - a set of C++ classes which provide a common API for realtime audio input/output across GNU/Linux (native ALSA, JACK, PulseAudio, and OSS), Macintosh OS X (CoreAudio and JACK), and Windows (DirectSound and ASIO) operating systems.

By Gary P. Scavone, 2001-2013.

Expand All @@ -16,10 +16,10 @@ To configure and compile (on Unix systems and MinGW):
A few options can be passed to configure, including:

--enable-debug = enable various debug output
--with-alsa = choose native ALSA API support (linux only)
--with-pulse = choose native PulseAudio API support (linux only)
--with-oss = choose OSS API support (linux only)
--with-jack = choose JACK server support (linux or Macintosh OS-X)
--with-alsa = choose native ALSA API support (GNU/Linux only)
--with-pulse = choose native PulseAudio API support (GNU/Linux only)
--with-oss = choose OSS API support (GNU/Linux only)
--with-jack = choose JACK server support (GNU/Linux or Macintosh OS-X)
--with-core = choose CoreAudio API support (Macintosh OS-X only)
--with-asio = choose ASIO API support (windows only)
--with-ds = choose DirectSound API support (windows only)
Expand All @@ -38,6 +38,6 @@ RtAudio compiles with the MinGW compiler or MS Visual Studio.
Visual C++ 6.0 project files (very old) are included for the test programs in the /tests/Windows/ directory. These projects compile API support for both ASIO and DirectSound.


LINUX OSS:
GNU/LINUX OSS:

The OSS API support in RtAudio has not been tested for many years. I'm not even sure there are OSS drivers supporting recent linux kernels. In all likelihood, the OSS API code in RtAudio will disappear within the next year or two (if you don't want this to happen, let me know).
4 changes: 2 additions & 2 deletions rtaudio/readme
@@ -1,4 +1,4 @@
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 and ASIO) operating systems.
RtAudio - a set of C++ classes that provide a common API for realtime audio input/output across GNU/Linux (native ALSA, JACK, PulseAudio and OSS), Macintosh OS X (CoreAudio and JACK), and Windows (DirectSound and ASIO) operating systems.

By Gary P. Scavone, 2001-2013.

Expand All @@ -11,7 +11,7 @@ tests/Windows: Visual C++ .net test program workspace and projects

OVERVIEW:

RtAudio is a set of C++ classes that provides a common API (Application Programming Interface) for realtime audio input/output across Linux (native ALSA, JACK, and OSS), Macintosh OS X, SGI, and Windows (DirectSound and ASIO) operating systems. RtAudio significantly simplifies the process of interacting with computer audio hardware. It was designed with the following objectives:
RtAudio is a set of C++ classes that provides a common API (Application Programming Interface) for realtime audio input/output across GNU/Linux (native ALSA, JACK, and OSS), Macintosh OS X, SGI, and Windows (DirectSound and ASIO) operating systems. RtAudio significantly simplifies the process of interacting with computer audio hardware. It was designed with the following objectives:

- object-oriented C++ design
- simple, common API across all supported platforms
Expand Down
14 changes: 7 additions & 7 deletions rtmidi/RtMidi.h
Expand Up @@ -57,7 +57,7 @@ class RtMidi
enum Api {
UNSPECIFIED, /*!< Search for a working compiled API. */
MACOSX_CORE, /*!< Macintosh OS-X Core Midi API. */
LINUX_ALSA, /*!< The Advanced Linux Sound Architecture API. */
LINUX_ALSA, /*!< The Advanced GNU/Linux Sound Architecture API. */
UNIX_JACK, /*!< The Jack Low-Latency MIDI Server API. */
WINDOWS_MM, /*!< The Microsoft Multimedia MIDI API. */
WINDOWS_KS, /*!< The Microsoft Kernel Streaming MIDI API. */
Expand Down Expand Up @@ -106,7 +106,7 @@ class RtMidi
retrieval using the getMessage() function or immediately passed to
a user-specified callback function. Create multiple instances of
this class to connect to more than one MIDI device at the same
time. With the OS-X and Linux ALSA MIDI APIs, it is also possible
time. With the OS-X and GNU/Linux ALSA MIDI APIs, it is also possible
to open a virtual input port to which other MIDI software clients
can connect.
Expand Down Expand Up @@ -147,7 +147,7 @@ class RtMidiIn : public RtMidi
incoming messages will be ignored.
If no API argument is specified and multiple API support has been
compiled, the default order of use is JACK, ALSA (Linux) and CORE,
compiled, the default order of use is JACK, ALSA (GNU/Linux) and CORE,
Jack (OS-X).
*/
RtMidiIn( RtMidi::Api api=UNSPECIFIED,
Expand All @@ -171,7 +171,7 @@ class RtMidiIn : public RtMidi
/*!
This function creates a virtual MIDI input port to which other
software applications can connect. This type of functionality
is currently only supported by the Macintosh OS-X and Linux ALSA
is currently only supported by the Macintosh OS-X and GNU/Linux ALSA
APIs (the function does nothing for the other APIs).
*/
void openVirtualPort( const std::string portName = std::string( "RtMidi Input" ) );
Expand Down Expand Up @@ -239,7 +239,7 @@ class RtMidiIn : public RtMidi
connect to one such port, and to send MIDI bytes immediately over
the connection. Create multiple instances of this class to
connect to more than one MIDI device at the same time. With the
OS-X and Linux ALSA MIDI APIs, it is also possible to open a
OS-X and GNU/Linux ALSA MIDI APIs, it is also possible to open a
virtual port to which other MIDI software clients can connect.
by Gary P. Scavone, 2003-2012.
Expand All @@ -255,7 +255,7 @@ class RtMidiOut : public RtMidi
An exception will be thrown if a MIDI system initialization error occurs.
If no API argument is specified and multiple API support has been
compiled, the default order of use is JACK, ALSA (Linux) and CORE,
compiled, the default order of use is JACK, ALSA (GNU/Linux) and CORE,
Jack (OS-X).
*/
RtMidiOut( RtMidi::Api api=UNSPECIFIED,
Expand Down Expand Up @@ -283,7 +283,7 @@ class RtMidiOut : public RtMidi
/*!
This function creates a virtual MIDI output port to which other
software applications can connect. This type of functionality
is currently only supported by the Macintosh OS-X and Linux ALSA
is currently only supported by the Macintosh OS-X and GNU/Linux ALSA
APIs (the function does nothing with the other APIs). An
exception is thrown if an error occurs while attempting to create
the virtual port.
Expand Down
8 changes: 4 additions & 4 deletions rtmidi/configure.ac
Expand Up @@ -61,13 +61,13 @@ AC_SUBST( api, [""] )
AC_MSG_CHECKING(for MIDI API)
case $host in
*-*-linux*)
AC_ARG_WITH(jack, [ --with-jack = choose JACK server support (mac and linux only)], [
AC_ARG_WITH(jack, [ --with-jack = choose JACK server support (Mac OSC and GNU/Linux only)], [
api="$api -D__UNIX_JACK__"
AC_MSG_RESULT(using JACK)
AC_CHECK_LIB(jack, jack_client_open, , AC_MSG_ERROR(JACK support requires the jack library!))], )

# Look for ALSA flag
AC_ARG_WITH(alsa, [ --with-alsa = choose native ALSA sequencer API support (linux only)], [
AC_ARG_WITH(alsa, [ --with-alsa = choose native ALSA sequencer API support (GNU/Linux only)], [
api="$api -D__LINUX_ALSA__"
AC_MSG_RESULT(using ALSA)
AC_CHECK_LIB(asound, snd_seq_open, , AC_MSG_ERROR(ALSA support requires the asound library!))], )
Expand All @@ -83,13 +83,13 @@ case $host in
;;

*-apple*)
AC_ARG_WITH(jack, [ --with-jack = choose JACK server support (mac and linux only)], [
AC_ARG_WITH(jack, [ --with-jack = choose JACK server support (Mac OSX and GNU/Linux only)], [
api="$api -D__UNIX_JACK__"
AC_MSG_RESULT(using JACK)
AC_CHECK_LIB(jack, jack_client_open, , AC_MSG_ERROR(JACK support requires the jack library!))], )

# Look for Core flag
AC_ARG_WITH(core, [ --with-core = choose CoreMidi API support (mac only)], [
AC_ARG_WITH(core, [ --with-core = choose CoreMidi API support (Mac OSX only)], [
api="$api -D__MACOSX_CORE__"
AC_MSG_RESULT(using CoreMidi)
AC_CHECK_HEADER(CoreMIDI/CoreMIDI.h, [], [AC_MSG_ERROR(CoreMIDI header files not found!)] )
Expand Down
4 changes: 2 additions & 2 deletions rtmidi/readme
@@ -1,4 +1,4 @@
RtMidi - a set of C++ classes that provide a common API for realtime MIDI input/output across Linux (ALSA & Jack), Macintosh OS X (CoreMidi) and Windows (Multimedia & Kernel Streaming).
RtMidi - a set of C++ classes that provide a common API for realtime MIDI input/output across GNU/Linux (ALSA & Jack), Macintosh OS X (CoreMidi) and Windows (Multimedia & Kernel Streaming).

By Gary P. Scavone, 2003-2012.

Expand All @@ -11,7 +11,7 @@ On unix systems, type "./configure" in the top level directory, then "make" in t

OVERVIEW:

RtMidi is a set of C++ classes (RtMidiIn, RtMidiOut, and API specific classes) that provide a common API (Application Programming Interface) for realtime MIDI input/output across Linux (ALSA, Jack), Macintosh OS X (CoreMidi, Jack), SGI, and Windows (Multimedia Library, Kernel Streming) operating systems. RtMidi significantly simplifies the process of interacting with computer MIDI hardware and software. It was designed with the following goals:
RtMidi is a set of C++ classes (RtMidiIn, RtMidiOut, and API specific classes) that provide a common API (Application Programming Interface) for realtime MIDI input/output across GNU/Linux (ALSA, Jack), Macintosh OS X (CoreMidi, Jack), SGI, and Windows (Multimedia Library, Kernel Streming) operating systems. RtMidi significantly simplifies the process of interacting with computer MIDI hardware and software. It was designed with the following goals:

- object oriented C++ design
- simple, common API across all supported platforms
Expand Down

0 comments on commit fb6ddc2

Please sign in to comment.