Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix capitalization of "CoreMIDI" #172

Merged
merged 1 commit into from
Aug 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![Build Status](https://travis-ci.org/thestk/rtmidi.svg?branch=master)](https://travis-ci.org/thestk/rtmidi)

A set of C++ classes that provide a common API for realtime MIDI input/output across Linux (ALSA & JACK), Macintosh OS X (CoreMidi & JACK) and Windows (Multimedia).
A set of C++ classes that provide a common API for realtime MIDI input/output across Linux (ALSA & JACK), Macintosh OS X (CoreMIDI & JACK) and Windows (Multimedia).

By Gary P. Scavone, 2003-2017.

Expand Down
2 changes: 1 addition & 1 deletion RtMidi.h
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ class RTMIDI_DLL_PUBLIC 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. */
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug], [enable various debugging output])])
AC_ARG_WITH(jack, [AS_HELP_STRING([--with-jack], [choose JACK server support])])
AC_ARG_WITH(alsa, [AS_HELP_STRING([--with-alsa], [choose native ALSA sequencer API support (linux only)])])
AC_ARG_WITH(core, [AS_HELP_STRING([--with-core], [ choose CoreMidi API support (mac only)])])
AC_ARG_WITH(core, [AS_HELP_STRING([--with-core], [ choose CoreMIDI API support (mac only)])])
AC_ARG_WITH(winmm, [AS_HELP_STRING([--with-winmm], [ choose Windows MultiMedia (MM) API support (win32 only)])])
AC_ARG_WITH(winks, [AS_HELP_STRING([--with-winks], [ choose kernel streaming support (win32 only)])])

Expand Down
2 changes: 1 addition & 1 deletion contrib/go/rtmidi/rtmidi.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ type API C.enum_RtMidiApi
const (
// APIUnspecified searches for a working compiled API.
APIUnspecified API = C.RT_MIDI_API_UNSPECIFIED
// APIMacOSXCore uses Macintosh OS-X Core Midi API.
// APIMacOSXCore uses Macintosh OS-X CoreMIDI API.
APIMacOSXCore = C.RT_MIDI_API_MACOSX_CORE
// APILinuxALSA uses the Advanced Linux Sound Architecture API.
APILinuxALSA = C.RT_MIDI_API_LINUX_ALSA
Expand Down
6 changes: 3 additions & 3 deletions doc/release.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RtMidi - a set of C++ classes that provides a common API for realtime MIDI input/output across Linux (ALSA & JACK), Macintosh OS X (CoreMidi & JACK), and Windows (Multimedia Library).
RtMidi - a set of C++ classes that provides a common API for realtime MIDI input/output across Linux (ALSA & JACK), Macintosh OS X (CoreMIDI & JACK), and Windows (Multimedia Library).

By Gary P. Scavone, 2003-2017 (with help from many others!)

Expand All @@ -20,11 +20,11 @@ v2.1.1: (11 February 2016)

v2.1.0: (30 March 2014)
- renamed RtError class to RtMidiError and embedded it in RtMidi.h (and deleted RtError.h)
- fix to CoreMidi implementation to support dynamic port changes
- fix to CoreMIDI implementation to support dynamic port changes
- removed global ALSA sequencer objects because they were not thread safe (Martin Koegler)
- fix for ALSA timing ignore flag (Devin Anderson)
- fix for ALSA incorrect use of snd_seq_create_port() function (Tobias Schlemmer)
- fix for international character support in CoreMidi (Martin Finke)
- fix for international character support in CoreMIDI (Martin Finke)
- fix for unicode conversion in WinMM (Dan Wilcox)
- added custom error hook that allows the client to capture an RtMidi error outside of the RtMidi code (Pavel Mogilevskiy)
- added RtMidi::isPortOpen function (Pavel Mogilevskiy)
Expand Down
2 changes: 1 addition & 1 deletion rtmidi_c.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ typedef struct RtMidiWrapper* RtMidiOutPtr;

enum RtMidiApi {
RT_MIDI_API_UNSPECIFIED, /*!< Search for a working compiled API. */
RT_MIDI_API_MACOSX_CORE, /*!< Macintosh OS-X Core Midi API. */
RT_MIDI_API_MACOSX_CORE, /*!< Macintosh OS-X CoreMIDI API. */
RT_MIDI_API_LINUX_ALSA, /*!< The Advanced Linux Sound Architecture API. */
RT_MIDI_API_UNIX_JACK, /*!< The Jack Low-Latency MIDI Server API. */
RT_MIDI_API_WINDOWS_MM, /*!< The Microsoft Multimedia MIDI API. */
Expand Down
2 changes: 1 addition & 1 deletion tests/midiprobe.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ int main()
{
// Create an api map.
std::map<int, std::string> apiMap;
apiMap[RtMidi::MACOSX_CORE] = "OS-X CoreMidi";
apiMap[RtMidi::MACOSX_CORE] = "OS-X CoreMIDI";
apiMap[RtMidi::WINDOWS_MM] = "Windows MultiMedia";
apiMap[RtMidi::UNIX_JACK] = "Jack Client";
apiMap[RtMidi::LINUX_ALSA] = "Linux ALSA";
Expand Down