vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-05-08 04:20:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Properly handle effGet{Input,Output}Properties

Browse Source 
Apparently the plugin needs the actual contents of the struct for this
to work.
This commit is contained in:
Robbert van der Helm
2020-03-26 16:24:49 +01:00
parent 0d7a5f10cd
commit cc52c87f34
4 changed files with 62 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/events.h
+8 -1
View File
@@ -135,6 +135,7 @@ intptr_t send_event(boost::asio::local::stream_protocol::socket& socket,
const std::optional<EventPayload> payload =
data_converter.read(opcode, index, value, data);
if (!payload.has_value()) {
// A 1 usually means that the event was processed succesfully
return 1;
}
@@ -217,7 +218,8 @@ void passthrough_event(boost::asio::local::stream_protocol::socket& socket,
return &events.as_c_events();
},
[&](WantsChunkBuffer&) -> void* { return string_buffer.data(); },
[&](const WantsVstRect&) -> void* { return string_buffer.data(); },
[&](VstIOProperties& props) -> void* { return &props; },
[&](WantsVstRect&) -> void* { return string_buffer.data(); },
[&](const WantsVstTimeInfo&) -> void* { return nullptr; },
[&](WantsString&) -> void* { return string_buffer.data(); }},
event.payload);
@@ -265,6 +267,11 @@ void passthrough_event(boost::asio::local::stream_protocol::socket& socket,
return std::string(*static_cast<char**>(data),
return_value);
},
[&](VstIOProperties& props) -> EventResposnePayload {
// The plugin has written a pointer to a VstRect struct
// into the data poitner
return props;
},
[&](WantsVstRect&) -> EventResposnePayload {
// The plugin has written a pointer to a VstRect struct
// into the data poitner
src/common/logging.cpp
+20 -17
View File
@@ -177,6 +177,7 @@ void Logger::log_event(bool is_dispatch,
[&](const WantsChunkBuffer&) {
message << "<writable_buffer>";
},
[&](const VstIOProperties&) { message << "<io_properties>"; },
[&](const WantsVstRect&) { message << "<writable_buffer>"; },
[&](const WantsVstTimeInfo&) { message << "<nullptr>"; },
[&](const WantsString&) { message << "<writable_string>"; }},
@@ -202,23 +203,25 @@ void Logger::log_event_response(bool is_dispatch,
message << return_value;
std::visit(
overload{[&](const std::monostate&) {},
[&](const std::string& s) {
if (s.size() < 32) {
message << ", \"" << s << "\"";
} else {
// Long strings contain binary data that we
// probably don't want to print
message << ", <" << s.size() << " bytes>";
}
},
[&](const AEffect&) { message << ", <AEffect_object>"; },
[&](const VstRect& rect) {
message << ", {l: " << rect.left << ", t: " << rect.top
<< ", r: " << rect.right
<< ", b: " << rect.bottom << "}";
},
[&](const VstTimeInfo&) { message << ", <time_info>"; }},
overload{
[&](const std::monostate&) {},
[&](const std::string& s) {
if (s.size() < 32) {
message << ", \"" << s << "\"";
} else {
// Long strings contain binary data that we probably
// don't want to print
message << ", <" << s.size() << " bytes>";
}
},
[&](const AEffect&) { message << ", <AEffect_object>"; },
[&](const VstIOProperties&) { message << ", <io_properties>"; },
[&](const VstRect& rect) {
message << ", {l: " << rect.left << ", t: " << rect.top
<< ", r: " << rect.right << ", b: " << rect.bottom
<< "}";
},
[&](const VstTimeInfo&) { message << ", <time_info>"; }},
payload);
log(message.str());
src/common/serialization.h
+16 -2
View File
@@ -27,6 +27,8 @@
#include <variant>
#include "vst24.h"
// These constants are limits used by bitsery
/**
@@ -83,6 +85,11 @@ void serialize(S& s, AEffect& plugin) {
s.value4b(plugin.version);
}
template <typename S>
void serialize(S& s, VstIOProperties& props) {
s.container1b(props.data);
}
template <typename S>
void serialize(S& s, VstRect& rect) {
s.value2b(rect.top);
@@ -212,6 +219,7 @@ using EventPayload = std::variant<std::nullptr_t,
AEffect,
DynamicVstEvents,
WantsChunkBuffer,
VstIOProperties,
WantsVstRect,
WantsVstTimeInfo,
WantsString>;
@@ -233,6 +241,7 @@ void serialize(S& s, EventPayload& payload) {
events.events, max_midi_events,
[](S& s, VstEvent& event) { s.container1b(event.dump); });
},
[](S& s, VstIOProperties& props) { s.object(props); },
[](S&, WantsChunkBuffer&) {}, [](S&, WantsVstRect&) {},
[](S&, WantsVstTimeInfo&) {}, [](S&, WantsString&) {}});
}
@@ -289,8 +298,12 @@ struct Event {
* `audioMasterIOChanged`.
* - An X11 window pointer for the editor window.
*/
using EventResposnePayload =
std::variant<std::monostate, std::string, AEffect, VstRect, VstTimeInfo>;
using EventResposnePayload = std::variant<std::monostate,
std::string,
AEffect,
VstIOProperties,
VstRect,
VstTimeInfo>;
template <typename S>
void serialize(S& s, EventResposnePayload& payload) {
@@ -304,6 +317,7 @@ void serialize(S& s, EventResposnePayload& payload) {
s.text1b(string, binary_buffer_size);
},
[](S& s, AEffect& effect) { s.object(effect); },
[](S& s, VstIOProperties& props) { s.object(props); },
[](S& s, VstRect& rect) { s.object(rect); },
[](S& s, VstTimeInfo& time_info) { s.object(time_info); }});
}