sebastian/viseq
Public Access
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

upgrade to libremidi 5.1, raylib and raygui latest

Browse Source
This commit is contained in:
Sebastian @ HfG
2025-06-13 19:16:35 +02:00
parent 62454960d1
commit 2cc6839009
112 changed files with 6484 additions and 1946 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/libremidi/observer.cpp
+28 -23
View File
@@ -5,17 +5,19 @@
#include <libremidi/backends.hpp>
#include <libremidi/detail/midi_api.hpp>
#include <utility>
namespace libremidi
{
static LIBREMIDI_INLINE std::unique_ptr<observer_api> make_observer(auto base_conf)
static LIBREMIDI_INLINE std::unique_ptr<observer_api> make_observer(const auto& base_conf)
{
for (const auto& api : available_apis())
{
try
{
if (auto impl_ = make_observer(base_conf, observer_configuration_for(api)))
return impl_;
if (auto impl = make_observer(base_conf, observer_configuration_for(api)))
return impl;
}
catch (const std::exception& e)
{
@@ -26,8 +28,8 @@ static LIBREMIDI_INLINE std::unique_ptr<observer_api> make_observer(auto base_co
{
try
{
if (auto impl_ = make_observer(base_conf, observer_configuration_for(api)))
return impl_;
if (auto impl = make_observer(base_conf, observer_configuration_for(api)))
return impl;
}
catch (const std::exception& e)
{
@@ -37,11 +39,11 @@ static LIBREMIDI_INLINE std::unique_ptr<observer_api> make_observer(auto base_co
return std::make_unique<observer_dummy>(observer_configuration{}, dummy_configuration{});
}
LIBREMIDI_INLINE auto make_observer_impl(auto base_conf, std::any api_conf)
LIBREMIDI_INLINE auto make_observer_impl(auto base_conf, observer_api_configuration api_conf)
{
std::unique_ptr<observer_api> ptr;
auto from_api = [&]<typename T>(T& /*backend*/) mutable {
if (auto conf = std::any_cast<typename T::midi_observer_configuration>(&api_conf))
if (auto conf = std::get_if<typename T::midi_observer_configuration>(&api_conf))
{
ptr = libremidi::make<typename T::midi_observer>(std::move(base_conf), std::move(*conf));
return true;
@@ -49,17 +51,19 @@ LIBREMIDI_INLINE auto make_observer_impl(auto base_conf, std::any api_conf)
return false;
};
std::apply([&](auto&&... b) { (from_api(b) || ...); }, midi1::available_backends);
std::apply([&](auto&&... b) { (from_api(b) || ...); }, midi2::available_backends);
if (!ptr)
std::apply([&](auto&&... b) { (from_api(b) || ...); }, midi2::available_backends);
return ptr;
}
LIBREMIDI_INLINE std::unique_ptr<observer_api> make_observer(auto base_conf, std::any api_conf)
LIBREMIDI_INLINE std::unique_ptr<observer_api>
make_observer(const auto& base_conf, observer_api_configuration api_conf)
{
if (!api_conf.has_value())
if (std::get_if<unspecified_configuration>(&api_conf))
{
return make_observer(base_conf);
}
else if (auto api_p = std::any_cast<libremidi::API>(&api_conf))
else if (auto api_p = std::get_if<libremidi::API>(&api_conf))
{
if (*api_p == libremidi::API::UNSPECIFIED)
{
@@ -80,32 +84,33 @@ LIBREMIDI_INLINE std::unique_ptr<observer_api> make_observer(auto base_conf, std
}
LIBREMIDI_INLINE observer::observer(const observer_configuration& base_conf) noexcept
: impl_{make_observer(base_conf)}
: m_impl{make_observer(base_conf)}
{
}
LIBREMIDI_INLINE observer::observer(observer_configuration base_conf, std::any api_conf)
: impl_{make_observer(base_conf, api_conf)}
LIBREMIDI_INLINE
observer::observer(const observer_configuration& base_conf, observer_api_configuration api_conf)
: m_impl{make_observer(base_conf, std::move(api_conf))}
{
if (!impl_)
if (!m_impl)
{
error_handler e;
e.libremidi_handle_error(base_conf, "Could not open observer for the given api");
impl_ = std::make_unique<observer_dummy>(observer_configuration{}, dummy_configuration{});
m_impl = std::make_unique<observer_dummy>(observer_configuration{}, dummy_configuration{});
}
}
LIBREMIDI_INLINE observer::observer(observer&& other) noexcept
: impl_{std::move(other.impl_)}
: m_impl{std::move(other.m_impl)}
{
other.impl_ = std::make_unique<libremidi::observer_dummy>(
other.m_impl = std::make_unique<libremidi::observer_dummy>(
observer_configuration{}, dummy_configuration{});
}
LIBREMIDI_INLINE observer& observer::operator=(observer&& other) noexcept
{
this->impl_ = std::move(other.impl_);
other.impl_ = std::make_unique<libremidi::observer_dummy>(
this->m_impl = std::move(other.m_impl);
other.m_impl = std::make_unique<libremidi::observer_dummy>(
observer_configuration{}, dummy_configuration{});
return *this;
}
@@ -116,18 +121,18 @@ observer::~observer() = default;
LIBREMIDI_INLINE
libremidi::API observer::get_current_api() const noexcept
{
return impl_->get_current_api();
return m_impl->get_current_api();
}
LIBREMIDI_INLINE
std::vector<libremidi::input_port> observer::get_input_ports() const noexcept
{
return impl_->get_input_ports();
return m_impl->get_input_ports();
}
LIBREMIDI_INLINE
std::vector<libremidi::output_port> observer::get_output_ports() const noexcept
{
return impl_->get_output_ports();
return m_impl->get_output_ports();
}
}