working on win32 uwp! and libremidi update
This commit is contained in:
@@ -29,76 +29,63 @@ public:
|
||||
: configuration{std::move(conf), std::move(apiconf)}
|
||||
{
|
||||
assert(snd.ump.available);
|
||||
client_open_ = stdx::error{};
|
||||
}
|
||||
|
||||
~midi_out_impl() override
|
||||
{
|
||||
// Close a connection if it exists.
|
||||
midi_out_impl::close_port();
|
||||
client_open_ = std::errc::not_connected;
|
||||
}
|
||||
|
||||
libremidi::API get_current_api() const noexcept override { return libremidi::API::ALSA_RAW; }
|
||||
libremidi::API get_current_api() const noexcept override { return libremidi::API::ALSA_RAW_UMP; }
|
||||
|
||||
bool open_virtual_port(std::string_view) override
|
||||
{
|
||||
warning(configuration, "midi_out_alsa_raw: open_virtual_port unsupported");
|
||||
return false;
|
||||
}
|
||||
void set_client_name(std::string_view) override
|
||||
{
|
||||
warning(configuration, "midi_out_alsa_raw: set_client_name unsupported");
|
||||
}
|
||||
void set_port_name(std::string_view) override
|
||||
{
|
||||
warning(configuration, "midi_out_alsa_raw: set_port_name unsupported");
|
||||
}
|
||||
|
||||
int connect_port(const char* portname)
|
||||
stdx::error connect_port(const char* portname)
|
||||
{
|
||||
constexpr int mode = SND_RAWMIDI_SYNC;
|
||||
int status = snd.ump.open(NULL, &midiport_, portname, mode);
|
||||
if (status < 0)
|
||||
int ret = snd.ump.open(NULL, &midiport_, portname, mode);
|
||||
if (ret < 0)
|
||||
{
|
||||
error<driver_error>(
|
||||
this->configuration, "midi_out_alsa_raw::open_port: cannot open device.");
|
||||
return status;
|
||||
libremidi_handle_error(this->configuration, "cannot open device.");
|
||||
return from_errc(ret);
|
||||
}
|
||||
return status;
|
||||
return stdx::error{};
|
||||
}
|
||||
|
||||
bool open_port(const output_port& p, std::string_view) override
|
||||
stdx::error open_port(const output_port& p, std::string_view) override
|
||||
{
|
||||
return connect_port(raw_from_port_handle(p.port).to_string().c_str()) == 0;
|
||||
return connect_port(raw_from_port_handle(p.port).to_string().c_str());
|
||||
}
|
||||
|
||||
void close_port() override
|
||||
stdx::error close_port() override
|
||||
{
|
||||
if (midiport_)
|
||||
snd.ump.close(midiport_);
|
||||
midiport_ = nullptr;
|
||||
return stdx::error{};
|
||||
}
|
||||
|
||||
void send_ump(const uint32_t* ump_stream, std::size_t count) override
|
||||
stdx::error send_ump(const uint32_t* ump_stream, std::size_t count) override
|
||||
{
|
||||
if (!midiport_)
|
||||
error<invalid_use_error>(
|
||||
libremidi_handle_error(
|
||||
this->configuration,
|
||||
"midi_out_alsa_raw::send_message: trying to send a message without an open "
|
||||
"trying to send a message without an open "
|
||||
"port.");
|
||||
|
||||
write(ump_stream, count * sizeof(uint32_t));
|
||||
return write(ump_stream, count * sizeof(uint32_t));
|
||||
}
|
||||
|
||||
bool write(const uint32_t* ump_stream, size_t bytes)
|
||||
stdx::error write(const uint32_t* ump_stream, size_t bytes)
|
||||
{
|
||||
if (snd.ump.write(midiport_, ump_stream, bytes) < 0)
|
||||
if (auto err = snd.ump.write(midiport_, ump_stream, bytes); err < 0)
|
||||
{
|
||||
error<driver_error>(
|
||||
this->configuration, "midi_out_alsa_raw::send_message: cannot write message.");
|
||||
return false;
|
||||
libremidi_handle_error(this->configuration, "cannot write message.");
|
||||
return from_errc(err);
|
||||
}
|
||||
|
||||
return true;
|
||||
return stdx::error{};
|
||||
}
|
||||
|
||||
snd_ump_t* midiport_{};
|
||||
|
||||
Reference in New Issue
Block a user