#include <pthread.h>
static UINT_PTR idle_timer_id = 0;
-//extern char* basename(char *path); //
#else /* linux + wine */
#endif
+#ifndef COMPILER_MSVC
extern char * strdup (const char *);
+#endif
+
#include <glib.h>
-#include <glibmm/miscutils.h> //basename
#include "fst.h"
struct ERect {
// XXX check
// 24 == audioMasterGetAutomationState,
// 48 == audioMasterGetChunkFile
+ pthread_mutex_lock (&vstfx->state_lock);
fst->plugin->dispatcher (fst->plugin, 24 /* effSetChunk */, 1, fst->wanted_chunk_size, fst->wanted_chunk, 0);
fst->want_chunk = 0;
+ pthread_mutex_unlock (&vstfx->state_lock);
}
}
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;
+ fst->init();
#ifdef PLATFORM_WINDOWS
- fst->voffset = 36;
+ fst->voffset = 50;
fst->hoffset = 0;
#else /* linux + wine */
fst->voffset = 24;
fst->hoffset = 6;
#endif
- fst->program_set_without_editor = 0;
return fst;
}
return 0;
}
-#ifndef PLATFORM_WINDOWS /* linux + wine */
void
fst_start_threading(void)
{
+#ifndef PLATFORM_WINDOWS /* linux + wine */
if (idle_id == 0) {
gui_quit = 0;
idle_id = g_idle_add (g_idle_call, NULL);
}
-}
#endif
+}
-#ifndef PLATFORM_WINDOWS /* linux + wine */
void
fst_stop_threading(void) {
+#ifndef PLATFORM_WINDOWS /* linux + wine */
if (idle_id != 0) {
gui_quit = 1;
PostQuitMessage (0);
//g_source_remove(idle_id);
idle_id = 0;
}
-}
#endif
+}
void
fst_exit (void)
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;
{
if (fst->windows_window) {
#ifdef PLATFORM_WINDOWS
- SetWindowPos ((HWND)(fst->windows_window), 0, fst->hoffset, fst->voffset, fst->width, fst->height, 0);
+ SetWindowPos ((HWND)(fst->windows_window), 0, fst->hoffset, fst->voffset, fst->width + fst->hoffset, fst->height + fst->voffset, 0);
#else /* linux + wine */
SetWindowPos ((HWND)(fst->windows_window), 0, 0, 0, fst->width + fst->hoffset, fst->height + fst->voffset, 0);
#endif
if ((strlen(path)) && (NULL != (fhandle = fst_handle_new ())))
{
char* period;
- fhandle->nameptr = strdup (path);
fhandle->path = strdup (path);
- fhandle->name = strdup (Glib::path_get_basename(fhandle->nameptr).c_str());
+ fhandle->name = g_path_get_basename(path);
if ((period = strrchr (fhandle->name, '.'))) {
*period = '\0';
}
(*fhandle)->path = NULL;
}
- if ((*fhandle)->nameptr) {
- free ((*fhandle)->nameptr);
- (*fhandle)->nameptr = NULL;
+ if ((*fhandle)->name) {
+ free ((*fhandle)->name);
(*fhandle)->name = NULL;
}