orastron/tibia
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vst3 messaging: minor fixes

Browse Source
This commit is contained in:
Paolo Marrone 2025-06-11 15:35:55 +02:00
parent 7d9f2a0c3a
commit 010a8e314b
2 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
templates/vst3/src/vst3.c
View File

@ -322,7 +322,7 @@ typedef struct pluginInstance {
size_t message_data_size; size_t message_data_size;
char message_data_tosend; // This is to tell message_thread to send data char message_data_tosend; // This is to tell message_thread to send data
thrd_t message_thread; thrd_t message_thread;
int message_flag; int message_cmd;
mtx_t message_mutex; mtx_t message_mutex;
cnd_t message_cond; cnd_t message_cond;
@ -463,9 +463,9 @@ static Steinberg_tresult pluginIConnectionPointNotify(void* thisInterface, struc
const void *data = NULL; const void *data = NULL;
unsigned int size = 0; unsigned int size = 0;
alist->lpVtbl->getBinary(alist, "yoyoyo", &data, &size); alist->lpVtbl->getBinary(alist, "message_data", &data, &size);
if (!data || size <= 0) if (!data || size == 0)
return Steinberg_kResultFalse; return Steinberg_kResultFalse;
plugin_receive_from_ui(&(p->p), data, size); plugin_receive_from_ui(&(p->p), data, size);
@ -487,7 +487,7 @@ static Steinberg_Vst_IConnectionPointVtbl pluginVtblIConnectionPoint = {
// Assuming this gets called by audio thread only // Assuming this gets called by audio thread only
static char send_to_ui (void *handle, const void *data, size_t bytes) { static char send_to_ui (void *handle, const void *data, size_t bytes) {
pluginInstance *p = (pluginInstance *)handle; pluginInstance *p = (pluginInstance *)handle;
if (!data || bytes <= 0 || bytes > DATA_MESSAGING_MAX) { if (!data || bytes == 0 || bytes > DATA_MESSAGING_MAX) {
return 1; return 1;
} }
memcpy(p->message_data, data, bytes); memcpy(p->message_data, data, bytes);
@ -519,11 +519,11 @@ int message_thread_f(void *arg) {
while (1) { while (1) {
mtx_lock(&p->message_mutex); mtx_lock(&p->message_mutex);
while (p->message_flag == 0) { // Wait if (p->message_cmd == 0) { // Wait
cnd_wait(&p->message_cond, &p->message_mutex); cnd_wait(&p->message_cond, &p->message_mutex);
} }
if (p->message_flag == 1) { // do work if (p->message_cmd == 1) { // do work
if (!p->connectedPoint || ! p->context) { if (!p->connectedPoint || ! p->context) {
// TODO: What to do there? // TODO: What to do there?
continue; continue;
@ -539,21 +539,24 @@ int message_thread_f(void *arg) {
continue; continue;
} }
msg->lpVtbl->setMessageID(msg, "HelloMessage");
Steinberg_Vst_IAttributeList *alist = msg->lpVtbl->getAttributes(msg); Steinberg_Vst_IAttributeList *alist = msg->lpVtbl->getAttributes(msg);
if (!alist) { if (!alist) {
// TODO: what to do here? // TODO: what to do here?
continue; continue;
} }
alist->lpVtbl->setBinary(alist, "yoyoyo", p->message_data, p->message_data_size); alist->lpVtbl->setBinary(alist, "message_data", p->message_data, p->message_data_size);
ov->notify(p->connectedPoint, msg); Steinberg_tresult r = ov->notify(p->connectedPoint, msg);
if (r == Steinberg_kResultFalse) {
// TODO
continue;
}
msg->lpVtbl->release(msg); msg->lpVtbl->release(msg);
p->message_flag = 0; p->message_cmd = 0;
} else if (p->message_flag == 2) { // exit } else if (p->message_cmd == 2) { // exit
mtx_unlock(&p->message_mutex); mtx_unlock(&p->message_mutex);
break; break;
} }
@ -626,7 +629,6 @@ static Steinberg_tresult pluginInitialize(void *thisInterface, struct Steinberg_
mtx_init(&p->message_mutex, mtx_plain); mtx_init(&p->message_mutex, mtx_plain);
cnd_init(&p->message_cond); cnd_init(&p->message_cond);
if (thrd_create(&p->message_thread, message_thread_f, p) != thrd_success) { if (thrd_create(&p->message_thread, message_thread_f, p) != thrd_success) {
fprintf(stderr, "Failed to create message_thread\n");
return Steinberg_kResultFalse; return Steinberg_kResultFalse;
} }
#endif #endif
@ -644,7 +646,7 @@ static Steinberg_tresult pluginTerminate(void *thisInterface) {
#ifdef DATA_MESSAGING #ifdef DATA_MESSAGING
mtx_lock(&p->message_mutex); mtx_lock(&p->message_mutex);
p->message_flag = 2; p->message_cmd = 2;
cnd_signal(&p->message_cond); cnd_signal(&p->message_cond);
mtx_unlock(&p->message_mutex); mtx_unlock(&p->message_mutex);
thrd_join(p->message_thread, NULL); thrd_join(p->message_thread, NULL);
@ -1271,7 +1273,7 @@ static Steinberg_tresult pluginProcess(void* thisInterface, struct Steinberg_Vst
#ifdef DATA_MESSAGING #ifdef DATA_MESSAGING
if (p->message_data_tosend) { // message_data_tosend is manipulated by audio thread only if (p->message_data_tosend) { // message_data_tosend is manipulated by audio thread only
if (mtx_trylock(&p->message_mutex) == thrd_success) { if (mtx_trylock(&p->message_mutex) == thrd_success) {
p->message_flag = 1; p->message_cmd = 1;
cnd_signal(&p->message_cond); cnd_signal(&p->message_cond);
mtx_unlock(&p->message_mutex); mtx_unlock(&p->message_mutex);
p->message_data_tosend = 0; p->message_data_tosend = 0;
@ -1656,12 +1658,13 @@ static void plugViewSetParameterEndCb(void *handle, size_t index, float value) {
static char send_to_dsp (void *handle, const void *data, size_t bytes) { static char send_to_dsp (void *handle, const void *data, size_t bytes) {
plugView *v = (plugView *)handle; plugView *v = (plugView *)handle;
if (!data || bytes <= 0 || bytes > DATA_MESSAGING_MAX) { if (!data || bytes == 0 || bytes > DATA_MESSAGING_MAX) {
return 1; return 1;
} }
if (!v->ctrl->connectedPoint || !v->ctrl->context) if (!v->ctrl->connectedPoint || !v->ctrl->context) {
return 2; return 1;
}
Steinberg_Vst_IConnectionPointVtbl *ov = (Steinberg_Vst_IConnectionPointVtbl*) v->ctrl->connectedPoint->lpVtbl; Steinberg_Vst_IConnectionPointVtbl *ov = (Steinberg_Vst_IConnectionPointVtbl*) v->ctrl->connectedPoint->lpVtbl;
Steinberg_Vst_IHostApplication *app = (Steinberg_Vst_IHostApplication*) v->ctrl->context; Steinberg_Vst_IHostApplication *app = (Steinberg_Vst_IHostApplication*) v->ctrl->context;
@ -1669,19 +1672,23 @@ static char send_to_dsp (void *handle, const void *data, size_t bytes) {
app->lpVtbl->createInstance(app, (char*) Steinberg_Vst_IMessage_iid, (char*) Steinberg_Vst_IMessage_iid, (void**)&(msg)); app->lpVtbl->createInstance(app, (char*) Steinberg_Vst_IMessage_iid, (char*) Steinberg_Vst_IMessage_iid, (void**)&(msg));
if (!msg) if (!msg)
return 3; return 1;
msg->lpVtbl->setMessageID(msg, "HelloMessage");
Steinberg_Vst_IAttributeList *alist = msg->lpVtbl->getAttributes(msg); Steinberg_Vst_IAttributeList *alist = msg->lpVtbl->getAttributes(msg);
if (!alist) if (!alist) {
return 4; msg->lpVtbl->release(msg);
return 1;
}
alist->lpVtbl->setBinary(alist, "yoyoyo", data, bytes); alist->lpVtbl->setBinary(alist, "message_data", data, bytes);
ov->notify(v->ctrl->connectedPoint, msg); Steinberg_tresult r = ov->notify(v->ctrl->connectedPoint, msg);
if (r == Steinberg_kResultFalse) {
msg->lpVtbl->release(msg);
return 1;
}
msg->lpVtbl->release(msg); msg->lpVtbl->release(msg);
return 0; return 0;
} }
# endif # endif
@ -2572,9 +2579,9 @@ static Steinberg_tresult controllerIConnectionPointNotify(void* thisInterface, s
const void *data = NULL; const void *data = NULL;
unsigned int size = 0; unsigned int size = 0;
alist->lpVtbl->getBinary(alist, "yoyoyo", &data, &size); alist->lpVtbl->getBinary(alist, "message_data", &data, &size);
if (!data || size <= 0) if (!data || size == 0)
return Steinberg_kResultFalse; return Steinberg_kResultFalse;
for (size_t i = 0; i < c->viewsCount; i++) { for (size_t i = 0; i < c->viewsCount; i++) {

2
test/plugin_ui.h
View File

@ -38,7 +38,7 @@ typedef struct {
plugin_ui_callbacks cbs; plugin_ui_callbacks cbs;
} plugin_ui; } plugin_ui;
#if TEMPLATE_SUPPORTS_MESSAGING #ifdef TEMPLATE_SUPPORTS_MESSAGING
static void plugin_ui_receive_from_dsp (plugin_ui *instance, const void *data, size_t bytes) { static void plugin_ui_receive_from_dsp (plugin_ui *instance, const void *data, size_t bytes) {
(void) instance; (void) instance;
printf("plugin_ui_receive_from_dsp %ld bytes at %p: \n", bytes, data); printf("plugin_ui_receive_from_dsp %ld bytes at %p: \n", bytes, data);