Skip to content

webmidi: do not call an observer callback that was not set #259

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.

Sign up for GitHub

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

Merged
jcelerier merged 2 commits into from
Sep 20, 2026
Merged

webmidi: do not call an observer callback that was not set #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
521c21a
webmidi: do not call an observer callback that was not set
jcelerier Sep 20, 2026
3a91ebd
webmidi: read the right EM_ASM argument when closing an input
jcelerier Sep 20, 2026
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
6 changes: 3 additions & 3 deletions include/libremidi/api.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ inline constexpr libremidi::API default_api() noexcept
return API::WINDOWS_MM;
#elif defined(LIBREMIDI_ALSA)
return API::ALSA_SEQ;
#elif defined(__emscripten__)
return API::EMSCRIPTEN_WEBMIDI;
#elif defined(__EMSCRIPTEN__)
return API::WEBMIDI;
#elif defined(LIBREMIDI_ANDROID)
return API::ANDROID_AMIDI;
#else
Expand All @@ -83,7 +83,7 @@ inline constexpr libremidi::API default_api() noexcept
return API::WINDOWS_MIDI_SERVICES;
#elif defined(LIBREMIDI_ALSA)
return API::ALSA_SEQ_UMP;
#elif defined(__emscripten__)
#elif defined(__EMSCRIPTEN__)
return API::DUMMY;
#else
return API::DUMMY;
Expand Down
4 changes: 2 additions & 2 deletions include/libremidi/backends/emscripten/midi_access.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,10 +303,10 @@ class midi_access_emscripten
return;

const auto& id = m_current_inputs[port_index].id;
EM_ASM(const id = UTF8ToString($1);
EM_ASM(const id = UTF8ToString($0);

let input = globalThis.__libreMidi_access.inputs.get(id);
input.onmidimessage = undefined;, id.c_str());
if (input) input.onmidimessage = null;, id.c_str());
}

std::vector<observer_emscripten*> m_observers;
Expand Down
4 changes: 2 additions & 2 deletions include/libremidi/backends/emscripten/observer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,14 @@ LIBREMIDI_INLINE void observer_emscripten::update(
for (std::size_t i = m_known_inputs.size(); i < current_inputs.size(); i++)
{
m_known_inputs.push_back(current_inputs[i]);
if (notify)
if (notify && configuration.input_added)
configuration.input_added(to_port_info<true>(i, m_known_inputs[i]));
}

for (std::size_t i = m_known_outputs.size(); i < current_outputs.size(); i++)
{
m_known_outputs.push_back(current_outputs[i]);
if (notify)
if (notify && configuration.output_added)
configuration.output_added(to_port_info<false>(i, m_known_outputs[i]));
}
}
Expand Down
Loading