Skip to content

Commit 806e18f

Browse files
authored
Merge pull request #298 from luzpaz/typos
Fix typos
2 parents f104ca2 + 62e68bc commit 806e18f

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

RtMidi.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@ class RTMIDI_DLL_PUBLIC RtMidiError : public std::exception
8686
UNSPECIFIED, /*!< The default, unspecified error type. */
8787
NO_DEVICES_FOUND, /*!< No devices found on system. */
8888
INVALID_DEVICE, /*!< An invalid device ID was specified. */
89-
MEMORY_ERROR, /*!< An error occured during memory allocation. */
89+
MEMORY_ERROR, /*!< An error occurred during memory allocation. */
9090
INVALID_PARAMETER, /*!< An invalid parameter was specified to a function. */
9191
INVALID_USE, /*!< The function was called incorrectly. */
92-
DRIVER_ERROR, /*!< A system driver error occured. */
93-
SYSTEM_ERROR, /*!< A system error occured. */
94-
THREAD_ERROR /*!< A thread error occured. */
92+
DRIVER_ERROR, /*!< A system driver error occurred. */
93+
SYSTEM_ERROR, /*!< A system error occurred. */
94+
THREAD_ERROR /*!< A thread error occurred. */
9595
};
9696

9797
//! The constructor.
@@ -206,9 +206,9 @@ class RTMIDI_DLL_PUBLIC RtMidi
206206
*/
207207
virtual bool isPortOpen( void ) const = 0;
208208

209-
//! Set an error callback function to be invoked when an error has occured.
209+
//! Set an error callback function to be invoked when an error has occurred.
210210
/*!
211-
The callback function will be called whenever an error has occured. It is best
211+
The callback function will be called whenever an error has occurred. It is best
212212
to set the error callback function before opening a port.
213213
*/
214214
virtual void setErrorCallback( RtMidiErrorCallback errorCallback = NULL, void *userData = 0 ) = 0;
@@ -373,9 +373,9 @@ class RTMIDI_DLL_PUBLIC RtMidiIn : public RtMidi
373373
*/
374374
double getMessage( std::vector<unsigned char> *message );
375375

376-
//! Set an error callback function to be invoked when an error has occured.
376+
//! Set an error callback function to be invoked when an error has occurred.
377377
/*!
378-
The callback function will be called whenever an error has occured. It is best
378+
The callback function will be called whenever an error has occurred. It is best
379379
to set the error callback function before opening a port.
380380
*/
381381
virtual void setErrorCallback( RtMidiErrorCallback errorCallback = NULL, void *userData = 0 );
@@ -491,9 +491,9 @@ class RTMIDI_DLL_PUBLIC RtMidiOut : public RtMidi
491491
*/
492492
void sendMessage( const unsigned char *message, size_t size );
493493

494-
//! Set an error callback function to be invoked when an error has occured.
494+
//! Set an error callback function to be invoked when an error has occurred.
495495
/*!
496-
The callback function will be called whenever an error has occured. It is best
496+
The callback function will be called whenever an error has occurred. It is best
497497
to set the error callback function before opening a port.
498498
*/
499499
virtual void setErrorCallback( RtMidiErrorCallback errorCallback = NULL, void *userData = 0 );

contrib/go/rtmidi/rtmidi.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ func NewMIDIInDefault() (MIDIIn, error) {
209209
}
210210

211211
// Open a single MIDIIn port using the given API. One can provide a
212-
// custom port name and a desired queue size for the incomming MIDI messages.
212+
// custom port name and a desired queue size for the incoming MIDI messages.
213213
func NewMIDIIn(api API, name string, queueSize int) (MIDIIn, error) {
214214
p := C.CString(name)
215215
defer C.free(unsafe.Pointer(p))

rtmidi_c.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ struct RtMidiWrapper {
4444
//! True when the last function call was OK.
4545
bool ok;
4646

47-
//! If an error occured (ok != true), set to an error message.
47+
//! If an error occurred (ok != true), set to an error message.
4848
const char* msg;
4949
};
5050

@@ -75,12 +75,12 @@ enum RtMidiErrorType {
7575
RTMIDI_ERROR_UNSPECIFIED, /*!< The default, unspecified error type. */
7676
RTMIDI_ERROR_NO_DEVICES_FOUND, /*!< No devices found on system. */
7777
RTMIDI_ERROR_INVALID_DEVICE, /*!< An invalid device ID was specified. */
78-
RTMIDI_ERROR_MEMORY_ERROR, /*!< An error occured during memory allocation. */
78+
RTMIDI_ERROR_MEMORY_ERROR, /*!< An error occurred during memory allocation. */
7979
RTMIDI_ERROR_INVALID_PARAMETER, /*!< An invalid parameter was specified to a function. */
8080
RTMIDI_ERROR_INVALID_USE, /*!< The function was called incorrectly. */
81-
RTMIDI_ERROR_DRIVER_ERROR, /*!< A system driver error occured. */
82-
RTMIDI_ERROR_SYSTEM_ERROR, /*!< A system error occured. */
83-
RTMIDI_ERROR_THREAD_ERROR /*!< A thread error occured. */
81+
RTMIDI_ERROR_DRIVER_ERROR, /*!< A system driver error occurred. */
82+
RTMIDI_ERROR_SYSTEM_ERROR, /*!< A system error occurred. */
83+
RTMIDI_ERROR_THREAD_ERROR /*!< A thread error occurred. */
8484
};
8585

8686
/*! \brief The type of a RtMidi callback function.

0 commit comments

Comments
 (0)