}
-static void
-maybe_set_program (VSTState* fst)
-{
- if (fst->want_program != -1) {
- if (fst->vst_version >= 2) {
- fst->plugin->dispatcher (fst->plugin, effBeginSetProgram, 0, 0, NULL, 0);
- }
-
- fst->plugin->dispatcher (fst->plugin, effSetProgram, 0, fst->want_program, NULL, 0);
-
- if (fst->vst_version >= 2) {
- fst->plugin->dispatcher (fst->plugin, effEndSetProgram, 0, 0, NULL, 0);
- }
- fst->want_program = -1;
- }
-
- if (fst->want_chunk == 1) {
- // XXX check
- // 24 == audioMasterGetAutomationState,
- // 48 == audioMasterGetChunkFile
- fst->plugin->dispatcher (fst->plugin, 24 /* effSetChunk */, 1, fst->wanted_chunk_size, fst->wanted_chunk, 0);
- fst->want_chunk = 0;
- }
-}
-
static VOID CALLBACK
idle_hands(
HWND hwnd, // handle to window for timer messages
fst->n_pending_keys = 0;
#endif
- /* See comment for maybe_set_program call below */
- maybe_set_program (fst);
+ /* See comment for call below */
+ vststate_maybe_set_program (fst);
fst->want_program = -1;
fst->want_chunk = 0;
/* If we don't have an editor window yet, we still need to
* and so it will be done again if and when the GUI arrives.
*/
if (fst->program_set_without_editor == 0) {
- maybe_set_program (fst);
+ vststate_maybe_set_program (fst);
fst->program_set_without_editor = 1;
}
fst_new (void)
{
VSTState* fst = (VSTState*) calloc (1, sizeof (VSTState));
- pthread_mutex_init (&fst->lock, NULL);
- pthread_cond_init (&fst->window_status_change, NULL); // unused ?? -> TODO check gtk2ardour
- pthread_cond_init (&fst->plugin_dispatcher_called, NULL); // unused ??
- fst->want_program = -1;
- fst->want_chunk = 0;
- fst->n_pending_keys = 0;
- fst->has_editor = 0;
+ vststate_init (fst);
+
#ifdef PLATFORM_WINDOWS
fst->voffset = 50;
fst->hoffset = 0;
fst->voffset = 24;
fst->hoffset = 6;
#endif
- fst->program_set_without_editor = 0;
return fst;
}
int
fst_run_editor (VSTState* fst, void* window_parent)
{
+ /* For safety, remove any pre-existing editor window */
+ fst_destroy_editor (fst);
+
if (fst->windows_window == NULL) {
HMODULE hInst;
HWND window;
- struct ERect* er;
+ struct ERect* er = NULL;
if (!(fst->plugin->flags & effFlagsHasEditor)) {
fst_error ("Plugin \"%s\" has no editor", fst->handle->name);
fst->plugin->dispatcher (fst->plugin, effEditOpen, 0, 0, fst->windows_window, 0 );
fst->plugin->dispatcher (fst->plugin, effEditGetRect, 0, 0, &er, 0 );
- fst->width = er->right-er->left;
- fst->height = er->bottom-er->top;
-
+ if (er != NULL) {
+ fst->width = er->right - er->left;
+ fst->height = er->bottom - er->top;
+ }
fst->been_activated = TRUE;
return NULL;
}
- fhandle->main_entry = (main_entry_t) GetProcAddress ((HMODULE)fhandle->dll, "main");
+ fhandle->main_entry = (main_entry_t) GetProcAddress ((HMODULE)fhandle->dll, "VSTPluginMain");
if (fhandle->main_entry == 0) {
- if ((fhandle->main_entry = (main_entry_t) GetProcAddress ((HMODULE)fhandle->dll, "VSTPluginMain"))) {
- fprintf(stderr, "VST >= 2.4 plugin '%s'\n", path);
- //PBD::warning << path << _(": is a VST >= 2.4 - this plugin may or may not function correctly with this version of Ardour.") << endmsg;
- }
+ fhandle->main_entry = (main_entry_t) GetProcAddress ((HMODULE)fhandle->dll, "main");
}
if (fhandle->main_entry == 0) {