Skip to content

Commit

Permalink
patch
Browse files Browse the repository at this point in the history
  • Loading branch information
ejconlon committed May 27, 2023
1 parent 3c68ed2 commit 8c3af73
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 7 deletions.
9 changes: 5 additions & 4 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ upload-docs: gen-docs

# Update RtMidi sources from upstream
update-sources:
curl --output rtmidi/RtMidi.cpp {{ rt_midi_url }}/RtMidi.cpp
curl --output rtmidi/RtMidi.h {{ rt_midi_url }}/RtMidi.h
curl --output rtmidi/rtmidi_c.cpp {{ rt_midi_url }}/rtmidi_c.cpp
curl --output rtmidi/rtmidi_c.h {{ rt_midi_url }}/rtmidi_c.h
curl --output rtmidi/RtMidi.cpp {{ rt_midi_url }}/RtMidi.cpp
curl --output rtmidi/RtMidi.h {{ rt_midi_url }}/RtMidi.h
curl --output rtmidi/rtmidi_c.cpp {{ rt_midi_url }}/rtmidi_c.cpp
curl --output rtmidi/rtmidi_c.h {{ rt_midi_url }}/rtmidi_c.h
git apply rtmidi.patch
51 changes: 51 additions & 0 deletions rtmidi.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
diff --git a/rtmidi/RtMidi.cpp b/rtmidi/RtMidi.cpp
index 6a1c89e..bcf88d1 100644
--- a/rtmidi/RtMidi.cpp
+++ b/rtmidi/RtMidi.cpp
@@ -378,8 +378,8 @@ const char* rtmidi_api_names[][2] = {
{ "alsa" , "ALSA" },
{ "jack" , "Jack" },
{ "winmm" , "Windows MultiMedia" },
- { "web" , "Web MIDI API" },
{ "dummy" , "Dummy" },
+ { "web" , "Web MIDI API" },
};
const unsigned int rtmidi_num_api_names =
sizeof(rtmidi_api_names)/sizeof(rtmidi_api_names[0]);
diff --git a/rtmidi/rtmidi_c.cpp b/rtmidi/rtmidi_c.cpp
index 19f586e..75fa1b1 100644
--- a/rtmidi/rtmidi_c.cpp
+++ b/rtmidi/rtmidi_c.cpp
@@ -17,6 +17,7 @@ class StaticAssertions { StaticAssertions() {
ENUM_EQUAL( RTMIDI_API_UNIX_JACK, RtMidi::UNIX_JACK );
ENUM_EQUAL( RTMIDI_API_WINDOWS_MM, RtMidi::WINDOWS_MM );
ENUM_EQUAL( RTMIDI_API_RTMIDI_DUMMY, RtMidi::RTMIDI_DUMMY );
+ ENUM_EQUAL( RTMIDI_API_WEB_MIDI_API, RtMidi::WEB_MIDI_API );

ENUM_EQUAL( RTMIDI_ERROR_WARNING, RtMidiError::WARNING );
ENUM_EQUAL( RTMIDI_ERROR_DEBUG_WARNING, RtMidiError::DEBUG_WARNING );
diff --git a/rtmidi/rtmidi_c.h b/rtmidi/rtmidi_c.h
index efbf977..41d4729 100644
--- a/rtmidi/rtmidi_c.h
+++ b/rtmidi/rtmidi_c.h
@@ -65,6 +65,7 @@ enum RtMidiApi {
RTMIDI_API_UNIX_JACK, /*!< The Jack Low-Latency MIDI Server API. */
RTMIDI_API_WINDOWS_MM, /*!< The Microsoft Multimedia MIDI API. */
RTMIDI_API_RTMIDI_DUMMY, /*!< A compilable but non-functional API. */
+ RTMIDI_API_WEB_MIDI_API, /*!< W3C Web MIDI API. */
RTMIDI_API_NUM /*!< Number of values in this enum. */
};

@@ -156,10 +157,10 @@ RTMIDIAPI void rtmidi_close_port (RtMidiPtr device);
RTMIDIAPI unsigned int rtmidi_get_port_count (RtMidiPtr device);

/*! \brief Access a string identifier for the specified MIDI input port number.
- *
+ *
* To prevent memory leaks a char buffer must be passed to this function.
* NULL can be passed as bufOut parameter, and that will write the required buffer length in the bufLen.
- *
+ *
* See RtMidi::getPortName().
*/
RTMIDIAPI int rtmidi_get_port_name (RtMidiPtr device, unsigned int portNumber, char * bufOut, int * bufLen);
2 changes: 1 addition & 1 deletion rtmidi/RtMidi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -378,8 +378,8 @@ const char* rtmidi_api_names[][2] = {
{ "alsa" , "ALSA" },
{ "jack" , "Jack" },
{ "winmm" , "Windows MultiMedia" },
{ "web" , "Web MIDI API" },
{ "dummy" , "Dummy" },
{ "web" , "Web MIDI API" },
};
const unsigned int rtmidi_num_api_names =
sizeof(rtmidi_api_names)/sizeof(rtmidi_api_names[0]);
Expand Down
1 change: 1 addition & 0 deletions rtmidi/rtmidi_c.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class StaticAssertions { StaticAssertions() {
ENUM_EQUAL( RTMIDI_API_UNIX_JACK, RtMidi::UNIX_JACK );
ENUM_EQUAL( RTMIDI_API_WINDOWS_MM, RtMidi::WINDOWS_MM );
ENUM_EQUAL( RTMIDI_API_RTMIDI_DUMMY, RtMidi::RTMIDI_DUMMY );
ENUM_EQUAL( RTMIDI_API_WEB_MIDI_API, RtMidi::WEB_MIDI_API );

ENUM_EQUAL( RTMIDI_ERROR_WARNING, RtMidiError::WARNING );
ENUM_EQUAL( RTMIDI_ERROR_DEBUG_WARNING, RtMidiError::DEBUG_WARNING );
Expand Down
5 changes: 3 additions & 2 deletions rtmidi/rtmidi_c.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ enum RtMidiApi {
RTMIDI_API_UNIX_JACK, /*!< The Jack Low-Latency MIDI Server API. */
RTMIDI_API_WINDOWS_MM, /*!< The Microsoft Multimedia MIDI API. */
RTMIDI_API_RTMIDI_DUMMY, /*!< A compilable but non-functional API. */
RTMIDI_API_WEB_MIDI_API, /*!< W3C Web MIDI API. */
RTMIDI_API_NUM /*!< Number of values in this enum. */
};

Expand Down Expand Up @@ -156,10 +157,10 @@ RTMIDIAPI void rtmidi_close_port (RtMidiPtr device);
RTMIDIAPI unsigned int rtmidi_get_port_count (RtMidiPtr device);

/*! \brief Access a string identifier for the specified MIDI input port number.
*
*
* To prevent memory leaks a char buffer must be passed to this function.
* NULL can be passed as bufOut parameter, and that will write the required buffer length in the bufLen.
*
*
* See RtMidi::getPortName().
*/
RTMIDIAPI int rtmidi_get_port_name (RtMidiPtr device, unsigned int portNumber, char * bufOut, int * bufLen);
Expand Down

0 comments on commit 8c3af73

Please sign in to comment.