X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Ffst%2Fvstwin.c;h=3a1f624934eff4335ce4d2d126ded79204d740a5;hb=ff2c3dbc81e3648e97cece22f0bcaca4a229f269;hp=18d35546a2ec2f640a55953f48ef73c89cc9389f;hpb=4d3e06f29d4f97b362fb1f69fde977cefd16cf9f;p=ardour.git

diff --git a/libs/fst/vstwin.c b/libs/fst/vstwin.c
index 18d35546a2..3a1f624934 100644
--- a/libs/fst/vstwin.c
+++ b/libs/fst/vstwin.c
@@ -1,563 +1,636 @@
 #include <stdio.h>
-#include <libgen.h>
+#include <string.h>
 #include <windows.h>
-#include <winnt.h>
-#include <wine/exception.h>
-#include <pthread.h>
-#include <signal.h>
-
-//#include <x11/xlib.h>
-//#include <x11/xresource.h>
-//#include <x11/xutil.h>
-//#include <x11/xatom.h>
 
-#include "fst.h"
+#define fst_error(...) fprintf(stderr, __VA_ARGS__)
 
+#ifdef PLATFORM_WINDOWS
 
-struct ERect{
-    short top;
-    short left;
-    short bottom;
-    short right;
-};
+#include <pthread.h>
+static UINT_PTR idle_timer_id   = 0;
 
-static pthread_mutex_t plugin_mutex;
-static FST* fst_first = NULL;
+#else /* linux + wine */
 
-DWORD  gui_thread_id = 0;
+#include <linux/limits.h> // PATH_MAX
+#include <winnt.h>
+#include <wine/exception.h>
+#include <pthread.h>
+static int gui_quit = 0;
+static unsigned int idle_id = 0;
 
+#endif
 
+#ifndef COMPILER_MSVC
+extern char * strdup (const char *);
+#endif
 
+#include <glib.h>
+#include "fst.h"
 
+struct ERect {
+	short top;
+	short left;
+	short bottom;
+	short right;
+};
 
+static pthread_mutex_t  plugin_mutex;
+static VSTState*        fst_first        = NULL; /**< Head of linked list of all FSTs */
+static int              host_initialized = 0;
+static const char       magic[]          =  "FST Plugin State v002";
 
 
-/* Define to a macro to generate an assembly function directive */
-#define __ASM_FUNC(name) ".type " __ASM_NAME(name) ",@function"
+static LRESULT WINAPI
+vstedit_wndproc (HWND w, UINT msg, WPARAM wp, LPARAM lp)
+{
+	switch (msg) {
+		case WM_KEYUP:
+		case WM_KEYDOWN:
+			break;
+
+		case WM_CLOSE:
+			/* we don't care about windows closing ...
+			 * WM_CLOSE is used for minimizing the window.
+			 * Our window has no frame so it shouldn't ever
+			 * get sent - but if it does, we don't want our
+			 * window to get minimized!
+			 */
+			return 0;
+			break;
+
+		case WM_DESTROY:
+		case WM_NCDESTROY:
+			/* we don't care about windows being destroyed ... */
+			return 0;
+			break;
+
+		default:
+			break;
+	}
 
-/* Define to a macro to generate an assembly name from a C symbol */
-#define __ASM_NAME(name) name
+	return DefWindowProcA (w, msg, wp, lp );
+}
 
-# define __ASM_GLOBAL_FUNC(name,code) \
-      __asm__( ".align 4\n\t" \
-               ".globl " __ASM_NAME(#name) "\n\t" \
-               __ASM_FUNC(#name) "\n" \
-               __ASM_NAME(#name) ":\n\t" \
-               code );
 
-__ASM_GLOBAL_FUNC( fst_get_teb, ".byte 0x64\n\tmovl 0x18,%eax\n\tret" );
+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;
+	}
 
-#define DELAYED_WINDOW
+	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 LRESULT WINAPI 
-my_window_proc (HWND w, UINT msg, WPARAM wp, LPARAM lp)
+static VOID CALLBACK
+idle_hands(
+		HWND hwnd,        // handle to window for timer messages
+		UINT message,     // WM_TIMER message
+		UINT idTimer,     // timer identifier
+		DWORD dwTime)     // current system time
 {
-	FST* fst;
-	LRESULT result;
+	VSTState* fst;
 
-//	if (msg != WM_TIMER) {
-//		fst_error ("window callback handler, msg = 0x%x win=%p\n", msg, w);
-//	}
+	pthread_mutex_lock (&plugin_mutex);
 
-	switch (msg) {
-	case WM_KEYUP:
-	case WM_KEYDOWN:
-	    printf( "got a key\n" );
-		break;
+	for (fst = fst_first; fst; fst = fst->next) {
+		if (fst->gui_shown) {
+			// this seems insane, but some plugins will not draw their meters if you don't
+			// call this every time.  Example Ambience by Magnus @ Smartelectron:x
+			fst->plugin->dispatcher (fst->plugin, effEditIdle, 0, 0, NULL, 0);
 
-	case WM_CLOSE:
-		printf("wtf.\n" );
-		PostQuitMessage (0);
-	case WM_DESTROY:
-	case WM_NCDESTROY:
-		/* we should never get these */
-		//return 0;
-		break;
-	
-
-	case WM_PAINT:
-//	case WM_ACTIVATE:
-#ifdef DELAYED_WINDOW
-		//if (wp & WA_ACTIVE) {
-			if ((fst = GetPropA (w, "fst_ptr")) != NULL) {
-				if (fst->window && !fst->been_activated) {
-					fst->been_activated = TRUE;
-//	{
-//	    XSetWindowAttributes attr;
-//
-//	    attr.override_redirect = TRUE;
-////	XChangeWindowAttributes( thread_display(), fst->xid, CWOverrideRedirect, &attr );
-//	}
-					pthread_cond_signal (&fst->window_status_change);
-					pthread_mutex_unlock (&fst->lock);
-				}
+			if (fst->wantIdle) {
+				fst->wantIdle = fst->plugin->dispatcher (fst->plugin, effIdle, 0, 0, NULL, 0);
 			}
-//		}
-#endif
-		break;
+		}
 
-	default:
-		break;
-	}
+		pthread_mutex_lock (&fst->lock);
+#ifndef PLATFORM_WINDOWS /* linux + wine */
+		/* Dispatch messages to send keypresses to the plugin */
+		int i;
+
+		for (i = 0; i < fst->n_pending_keys; ++i) {
+			MSG msg;
+			/* I'm not quite sure what is going on here; it seems
+			 * `special' keys must be delivered with WM_KEYDOWN,
+			 * but that alphanumerics etc. must use WM_CHAR or
+			 * they will be ignored.  Ours is not to reason why ...
+			 */
+			if (fst->pending_keys[i].special != 0) {
+				msg.message = WM_KEYDOWN;
+				msg.wParam = fst->pending_keys[i].special;
+			} else {
+				msg.message = WM_CHAR;
+				msg.wParam = fst->pending_keys[i].character;
+			}
+			msg.hwnd = GetFocus ();
+			msg.lParam = 0;
+			DispatchMessageA (&msg);
+		}
 
-	return DefWindowProcA (w, msg, wp, lp );
-}
+		fst->n_pending_keys = 0;
+#endif
 
-static FST* 
-fst_new ()
-{
-	FST* fst = (FST*) calloc (1, sizeof (FST));
+		/* See comment for maybe_set_program call below */
+		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
+		 * set up the program, otherwise when we load a plugin without
+		 * opening its window it will sound wrong.  However, it seems
+		 * that if you don't also load the program after opening the GUI,
+		 * the GUI does not reflect the program properly.  So we'll not
+		 * mark that we've done this (ie we won't set want_program to -1)
+		 * and so it will be done again if and when the GUI arrives.
+		 */
+		if (fst->program_set_without_editor == 0) {
+			maybe_set_program (fst);
+			fst->program_set_without_editor = 1;
+		}
 
-	pthread_mutex_init (&fst->lock, NULL);
-	pthread_cond_init (&fst->window_status_change, NULL);
+		pthread_mutex_unlock (&fst->lock);
+	}
 
-	return fst;
+	pthread_mutex_unlock (&plugin_mutex);
 }
 
-static FSTHandle* 
-fst_handle_new ()
+static void
+fst_idle_timer_add_plugin (VSTState* fst)
 {
-	FSTHandle* fst = (FSTHandle*) calloc (1, sizeof (FSTHandle));
-	return fst;
-}
-
-#ifdef HAVE_TLS
-static __thread int ejmpbuf_valid = FALSE;
-static __thread jmp_buf ejmpbuf;
-#else
-static pthread_key_t ejmpbuf_valid_key;
-static pthread_key_t ejmpbuf_key;
-#endif
-
-void debreak( void ) { printf( "debreak\n" ); }
-
+	pthread_mutex_lock (&plugin_mutex);
 
-int
-fst_init (void (*sighandler)(int,siginfo_t*,void*))
-{
-	//SharedWineInit (sighandler);
-	wine_shared_premain();
+	if (fst_first == NULL) {
+		fst_first = fst;
+	} else {
+		VSTState* p = fst_first;
+		while (p->next) {
+			p = p->next;
+		}
+		p->next = fst;
+	}
 
-	return 0;
+	pthread_mutex_unlock (&plugin_mutex);
 }
 
-DWORD WINAPI gui_event_loop (LPVOID param)
+static void
+fst_idle_timer_remove_plugin (VSTState* fst)
 {
-	MSG msg;
-	FST* fst;
-	char c;
-	HMODULE hInst;
-	HWND window;
+	VSTState* p;
+	VSTState* prev;
 
-	gui_thread_id = GetCurrentThreadId ();
-
-	/* create a dummy window for timer events */
+	pthread_mutex_lock (&plugin_mutex);
 
-	if ((hInst = GetModuleHandleA (NULL)) == NULL) {
-		fst_error ("can't get module handle");
-		return 1;
-	}
-	
-	if ((window = CreateWindowExA (0, "FST", "dummy",
-				       WS_OVERLAPPEDWINDOW & ~WS_THICKFRAME & ~WS_MAXIMIZEBOX,
-				       CW_USEDEFAULT, CW_USEDEFAULT,
-				       CW_USEDEFAULT, CW_USEDEFAULT,
-				       NULL, NULL,
-				       hInst,
-				       NULL )) == NULL) {
-		fst_error ("cannot create dummy timer window");
+	for (p = fst_first, prev = NULL; p; prev = p, p = p->next) {
+		if (p == fst) {
+			if (prev) {
+				prev->next = p->next;
+			}
+			break;
+		}
+		if (!p->next) {
+			break;
+		}
 	}
 
-	if (!SetTimer (window, 1000, 100, NULL)) {
-		fst_error ("cannot set timer on dummy window");
+	if (fst_first == fst) {
+		fst_first = fst_first->next;
 	}
 
-	while (GetMessageA (&msg, NULL, 0,0)) {
-	    if( msg.message == WM_KEYDOWN ) debreak();
-		TranslateMessage( &msg );
-		DispatchMessageA (&msg);
+	pthread_mutex_unlock (&plugin_mutex);
+}
 
-		/* handle window creation requests, destroy requests, 
-		   and run idle callbacks 
-		*/
-		
-
-		if( msg.message == WM_TIMER  ) {
-		pthread_mutex_lock (&plugin_mutex);
-again:
-		    for (fst = fst_first; fst; fst = fst->next) {
-
-			if (fst->destroy) {
-			    if (fst->window) {
-				fst->plugin->dispatcher( fst->plugin, effEditClose, 0, 0, NULL, 0.0 );
-				CloseWindow (fst->window);
-				fst->window = NULL;
-				fst->destroy = FALSE;
-			    }
-			    fst_event_loop_remove_plugin (fst);
-			    fst->been_activated = FALSE;
-			    pthread_mutex_lock (&fst->lock);
-			    pthread_cond_signal (&fst->window_status_change);
-			    pthread_mutex_unlock (&fst->lock);
-			    goto again;
-			} 
-
-			if (fst->window == NULL) {
-			    pthread_mutex_lock (&fst->lock);
-			    if (fst_create_editor (fst)) {
-				fst_error ("cannot create editor for plugin %s", fst->handle->name);
-				fst_event_loop_remove_plugin (fst);
-				pthread_cond_signal (&fst->window_status_change);
-				pthread_mutex_unlock (&fst->lock);
-				goto again;
-			    }
-			    /* condition/unlock handled when we receive WM_ACTIVATE */
-			}
+static VSTState*
+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;
+#ifdef PLATFORM_WINDOWS
+	fst->voffset = 50;
+	fst->hoffset = 0;
+#else /* linux + wine */
+	fst->voffset = 24;
+	fst->hoffset = 6;
+#endif
+	fst->program_set_without_editor = 0;
+	return fst;
+}
 
-			fst->plugin->dispatcher (fst->plugin, effEditIdle, 0, 0, NULL, 0);
-		    }
-		    pthread_mutex_unlock (&plugin_mutex);
-		}
+static void
+fst_delete (VSTState* fst)
+{
+	if (fst) {
+		free((void*)fst);
+		fst = NULL;
 	}
-	printf( "quit........\n" );
-	exit(0);
-	gtk_main_quit();
 }
 
-void
-fst_set_focus (FST* fst)
+static VSTHandle*
+fst_handle_new (void)
 {
-	if (fst->window) {
-		SetFocus (fst->window);
+	VSTHandle* fst = (VSTHandle*) calloc (1, sizeof (VSTHandle));
+	return fst;
+}
+
+#ifndef PLATFORM_WINDOWS /* linux + wine */
+static gboolean
+g_idle_call (gpointer ignored) {
+	if (gui_quit) return FALSE;
+	MSG msg;
+	if (PeekMessageA (&msg, NULL, 0, 0, 1)) {
+		TranslateMessage (&msg);
+		DispatchMessageA (&msg);
 	}
+	idle_hands(NULL, 0, 0, 0);
+	g_main_context_iteration(NULL, FALSE);
+	return gui_quit ? FALSE : TRUE;
 }
+#endif
+
 
 int
-wine_shared_premain ()
+fst_init (void* possible_hmodule)
 {
-	WNDCLASSA wc;
+	if (host_initialized) return 0;
 	HMODULE hInst;
 
-	if ((hInst = GetModuleHandleA (NULL)) == NULL) {
+	if (possible_hmodule) {
+#ifdef PLATFORM_WINDOWS
+		fst_error ("Error in fst_init(): (module handle is unnecessary for Win32 build)");
+		return -1;
+#else /* linux + wine */
+		hInst = (HMODULE) possible_hmodule;
+#endif
+	} else if ((hInst = GetModuleHandleA (NULL)) == NULL) {
 		fst_error ("can't get module handle");
 		return -1;
 	}
-	wc.style = 0;
-	wc.lpfnWndProc = my_window_proc;
-	wc.cbClsExtra = 0;
-	wc.cbWndExtra = 0;
-	wc.hInstance = hInst;
-	wc.hIcon = LoadIconA( hInst, "FST");
-	wc.hCursor = LoadCursorA( NULL, IDI_APPLICATION );
-	wc.hbrBackground = GetStockObject( BLACK_BRUSH );
-	wc.lpszMenuName = "MENU_FST";
-	wc.lpszClassName = "FST";
-
-	if (!RegisterClassA(&wc)){
-		return 1;
-	}
 
-	if (CreateThread (NULL, 0, gui_event_loop, NULL, 0, NULL) == NULL) {
-		fst_error ("could not create new thread proxy");
+	if (!hInst) {
+		fst_error ("Cannot initialise VST host");
 		return -1;
 	}
 
+	WNDCLASSEX wclass;
+
+	wclass.cbSize = sizeof(WNDCLASSEX);
+#ifdef PLATFORM_WINDOWS
+	wclass.style = (CS_HREDRAW | CS_VREDRAW);
+	wclass.hIcon = NULL;
+	wclass.hCursor = LoadCursor(0, IDC_ARROW);
+#else /* linux + wine */
+	wclass.style = 0;
+	wclass.hIcon = LoadIcon(hInst, "FST");
+	wclass.hCursor = LoadCursor(0, IDI_APPLICATION);
+#endif
+	wclass.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH);
+	wclass.lpfnWndProc = vstedit_wndproc;
+	wclass.cbClsExtra = 0;
+	wclass.cbWndExtra = 0;
+	wclass.hInstance = hInst;
+	wclass.lpszMenuName = "MENU_FST";
+	wclass.lpszClassName = "FST";
+	wclass.hIconSm = 0;
+
+	pthread_mutex_init (&plugin_mutex, NULL);
+	host_initialized = -1;
+
+	if (!RegisterClassExA(&wclass)){
+		fst_error ("Error in fst_init(): (class registration failed");
+		return -1;
+	}
 	return 0;
 }
 
-int
-fst_run_editor (FST* fst)
+void
+fst_start_threading(void)
 {
-	pthread_mutex_lock (&plugin_mutex);
-
-	if (fst_first == NULL) {
-		fst_first = fst;
-	} else {
-		FST* p = fst_first;
-		while (p->next) {
-			p = p->next;
-		}
-		p->next = fst;
+#ifndef PLATFORM_WINDOWS /* linux + wine */
+	if (idle_id == 0) {
+		gui_quit = 0;
+		idle_id = g_idle_add (g_idle_call, NULL);
 	}
+#endif
+}
 
-	printf( "gui_thread_id = %d\n", gui_thread_id );
-	if (!PostThreadMessageA (gui_thread_id, WM_USER, 0, 0)) {
-		fst_error ("could not post message to gui thread");
-		return -1;
+void
+fst_stop_threading(void) {
+#ifndef PLATFORM_WINDOWS /* linux + wine */
+	if (idle_id != 0) {
+		gui_quit = 1;
+		PostQuitMessage (0);
+		g_main_context_iteration(NULL, FALSE);
+		//g_source_remove(idle_id);
+		idle_id = 0;
 	}
+#endif
+}
 
-	pthread_mutex_unlock (&plugin_mutex);
-
-	/* wait for the plugin editor window to be created (or not) */
-
-	pthread_mutex_lock (&fst->lock);
-	if (!fst->window) {
-		pthread_cond_wait (&fst->window_status_change, &fst->lock);
-	} 
-	pthread_mutex_unlock (&fst->lock);
-
-	if (!fst->window) {
-		fst_error ("no window created for VST plugin editor");
-		return -1;
+void
+fst_exit (void)
+{
+	if (!host_initialized) return;
+	VSTState* fst;
+	// If any plugins are still open at this point, close them!
+	while ((fst = fst_first))
+		fst_close (fst);
+
+#ifdef PLATFORM_WINDOWS
+	if (idle_timer_id != 0) {
+		KillTimer(NULL, idle_timer_id);
 	}
+#else /* linux + wine */
+	if (idle_id) {
+		gui_quit = 1;
+		PostQuitMessage (0);
+	}
+#endif
 
-	return 0;
+	host_initialized = FALSE;
+	pthread_mutex_destroy (&plugin_mutex);
 }
 
+
 int
-fst_create_editor (FST* fst)
+fst_run_editor (VSTState* fst, void* window_parent)
 {
-	HMODULE hInst;
-	char class[20];
-	HWND window;
-
-	/* "guard point" to trap errors that occur during plugin loading */
+	if (fst->windows_window == NULL) {
+		HMODULE hInst;
+		HWND window;
+		struct ERect* er = NULL;
+
+		if (!(fst->plugin->flags & effFlagsHasEditor)) {
+			fst_error ("Plugin \"%s\" has no editor", fst->handle->name);
+			return -1;
+		}
 
-	/* Note: fst->lock is held while this function is called */
+		if ((hInst = GetModuleHandleA (NULL)) == NULL) {
+			fst_error ("fst_create_editor() can't get module handle");
+			return 1;
+		}
 
-	if (!(fst->plugin->flags & effFlagsHasEditor)) {
-		fst_error ("Plugin \"%s\" has no editor", fst->handle->name);
-		return -1;
-	}
+		if ((window = CreateWindowExA (0, "FST", fst->handle->name,
+						window_parent ? WS_CHILD : (WS_OVERLAPPEDWINDOW & ~WS_THICKFRAME & ~WS_MAXIMIZEBOX),
+						CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
+						(HWND)window_parent, NULL,
+						hInst,
+						NULL) ) == NULL) {
+			fst_error ("fst_create_editor() cannot create editor window");
+			return 1;
+		}
 
-	if ((hInst = GetModuleHandleA (NULL)) == NULL) {
-		fst_error ("can't get module handle");
-		return 1;
-	}
-	
-//	if ((window = CreateWindowExA (WS_EX_TOOLWINDOW | WS_EX_TRAYWINDOW, "FST", fst->handle->name,
-	if ((window = CreateWindowExA (0, "FST", fst->handle->name,
-				       (WS_OVERLAPPEDWINDOW & ~WS_THICKFRAME & ~WS_MAXIMIZEBOX),
-				       0, 0, 1, 1,
-				       NULL, NULL,
-				       hInst,
-				       NULL)) == NULL) {
-		fst_error ("cannot create editor window");
-		return 1;
-	}
+		if (!SetPropA (window, "fst_ptr", fst)) {
+			fst_error ("fst_create_editor() cannot set fst_ptr on window");
+		}
 
-	if (!SetPropA (window, "fst_ptr", fst)) {
-		fst_error ("cannot set fst_ptr on window");
-	}
+		fst->windows_window = window;
 
-	fst->window = window;
-	fst->xid = (int) GetPropA (window, "__wine_x11_whole_window");
+		if (window_parent) {
+			// This is requiredv for some reason. Note the parent is set above when the window
+			// is created. Without this extra call the actual plugin window will draw outside
+			// of our plugin window.
+			SetParent((HWND)fst->windows_window, (HWND)window_parent);
+			fst->xid = 0;
+#ifndef PLATFORM_WINDOWS /* linux + wine */
+		} else {
+			SetWindowPos (fst->windows_window, 0, 9999, 9999, 2, 2, 0);
+			ShowWindow (fst->windows_window, SW_SHOWNA);
+			fst->xid = (int) GetPropA (fst->windows_window, "__wine_x11_whole_window");
+#endif
+		}
 
-//	XChangeWindowAttributes( XOpenDisplay(NULL), fst->xid, CWOverrideRedirect, ~0 );
+		// This is the suggested order of calls.
+		fst->plugin->dispatcher (fst->plugin, effEditGetRect, 0, 0, &er, 0 );
+		fst->plugin->dispatcher (fst->plugin, effEditOpen, 0, 0, fst->windows_window, 0 );
+		fst->plugin->dispatcher (fst->plugin, effEditGetRect, 0, 0, &er, 0 );
 
+		if (er != NULL) {
+			fst->width = er->right - er->left;
+			fst->height = er->bottom - er->top;
+		}
 
-#ifdef DELAYED_WINDOW
-	{
-		struct ERect* er;
+		fst->been_activated = TRUE;
 
-		ShowWindow (fst->window, SW_SHOW);
-	
-		fst->plugin->dispatcher (fst->plugin, effEditOpen, 0, 0, fst->window, 0 );
-		fst->plugin->dispatcher (fst->plugin, effEditGetRect, 0, 0, &er, 0 );
-		
-		fst->width =  er->right-er->left;
-		fst->height =  er->bottom-er->top;
-		
-		SetWindowPos (fst->window, 0, 0, 0, er->right-er->left+8, er->bottom-er->top+26, SWP_SHOWWINDOW|SWP_NOMOVE|SWP_NOZORDER);
 	}
-#else
 
-	pthread_cond_signal (&fst->window_status_change);
-	pthread_mutex_unlock (&fst->lock);
+	if (fst->windows_window) {
+#ifdef PLATFORM_WINDOWS
+		if (idle_timer_id == 0) {
+			// Init the idle timer if needed, so that the main window calls us.
+			idle_timer_id = SetTimer(NULL, idle_timer_id, 50, (TIMERPROC) idle_hands);
+		}
+#endif
 
-#endif 
-	return 0;
+		fst_idle_timer_add_plugin (fst);
+	}
+
+	return fst->windows_window == NULL ? -1 : 0;
 }
 
 void
-fst_show_editor (FST* fst)
+fst_destroy_editor (VSTState* fst)
 {
-#ifndef DELAYED_WINDOW
-	struct ERect* er;
+	if (fst->windows_window) {
+		fprintf (stderr, "%s destroying edit window\n", fst->handle->name);
 
-	fst->plugin->dispatcher (fst->plugin, effEditOpen, 0, 0, fst->window, 0 );
-	fst->plugin->dispatcher (fst->plugin, effEditGetRect, 0, 0, &er, 0 );
-	fst->width =  er->right-er->left;
-	fst->height =  er->bottom-er->top;
+		fst_idle_timer_remove_plugin (fst);
+		fst->plugin->dispatcher( fst->plugin, effEditClose, 0, 0, NULL, 0.0 );
 
-	SetWindowPos (window, 0, 0, 0, er->right-er->left+8, er->bottom-er->top+26, SWP_NOMOVE | SWP_NOZORDER);
-	*ejmpbuf_valid = FALSE;
-#endif
-}
-
-void
-fst_destroy_editor (FST* fst)
-{
-	FST* p;
-	FST* prev;
-
-	pthread_mutex_lock (&fst->lock);
-	if (fst->window) {
-		fst->destroy = TRUE;
-		if (!PostThreadMessageA (gui_thread_id, WM_USER, 0, 0)) {
-			fst_error ("could not post message to gui thread");
-		}
-		pthread_cond_wait (&fst->window_status_change, &fst->lock);
+		DestroyWindow ((HWND)(fst->windows_window));
 
+		fst->windows_window = NULL;
 	}
-	pthread_mutex_unlock (&fst->lock);
+
+	fst->been_activated = FALSE;
 }
 
 void
-fst_event_loop_remove_plugin (FST* fst)
+fst_move_window_into_view (VSTState* fst)
 {
-	FST* p;
-	FST* prev;
-
-	for (p = fst_first, prev = NULL; p->next; prev = p, p = p->next) {
-		if (p == fst) {
-			if (prev) {
-				prev->next = p->next;
-			}
-		}
-	}
-
-	if (fst_first == fst) {
-		fst_first = fst_first->next;
+	if (fst->windows_window) {
+#ifdef PLATFORM_WINDOWS
+		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
+		ShowWindow ((HWND)(fst->windows_window), SW_SHOWNA);
 	}
+}
 
+static HMODULE
+fst_load_vst_library(const char * path)
+{
+	char legalized_path[PATH_MAX];
+	strcpy (legalized_path, g_locale_from_utf8(path, -1, NULL, NULL, NULL));
+	return ( LoadLibraryA (legalized_path) );
 }
 
-FSTHandle*
+VSTHandle *
 fst_load (const char *path)
 {
-	char* buf, *buf2;
-	FSTHandle* fhandle;
-	char* period;
-
-	fhandle = fst_handle_new ();
-	
-	// XXX: Would be nice to find the correct call for this.
-	//      if the user does not configure Z: to be / we are doomed :(
-
-	if (strstr (path, ".dll") == NULL) {
-
-		buf = (char *) malloc (strlen (path) + 7);
+	VSTHandle* fhandle = NULL;
 
-		if( path[0] == '/' ) {
-		    sprintf (buf, "Z:%s.dll", path);
-		} else {
-		    sprintf (buf, "%s.dll", path);
+	if ((strlen(path)) && (NULL != (fhandle = fst_handle_new ())))
+	{
+		char* period;
+		fhandle->path = strdup (path);
+		fhandle->name = g_path_get_basename(path);
+		if ((period = strrchr (fhandle->name, '.'))) {
+			*period = '\0';
 		}
 
-		fhandle->nameptr = strdup (path);
-
-	} else {
-
-		buf = (char *) malloc (strlen (path) + 3);
-
-		if( path[0] == '/' ) {
-		    sprintf (buf, "Z:%s", path);
-		} else {
-		    sprintf (buf, "%s", path);
+		// See if we can load the plugin DLL
+		if ((fhandle->dll = (HMODULE)fst_load_vst_library (path)) == NULL) {
+			fst_unload (&fhandle);
+			return NULL;
 		}
 
-		fhandle->nameptr = strdup (path);
-	}
-	
-	fhandle->name = basename (fhandle->nameptr);
-
-	/* strip off .dll */
-
-	if ((period = strrchr (fhandle->name, '.')) != NULL) {
-		*period = '\0';
-	}
+		fhandle->main_entry = (main_entry_t) GetProcAddress ((HMODULE)fhandle->dll, "main");
 
-	if ((fhandle->dll = LoadLibraryA (buf)) == NULL) {
-		fst_unload (fhandle);
-		return NULL;
-	}
+		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;
+			}
+		}
 
-	if ((fhandle->main_entry = GetProcAddress (fhandle->dll, "main")) == NULL) {
-		fst_unload (fhandle);
-		return NULL;
+		if (fhandle->main_entry == 0) {
+			fst_unload (&fhandle);
+			return NULL;
+		}
 	}
-
 	return fhandle;
 }
 
 int
-fst_unload (FSTHandle* fhandle)
+fst_unload (VSTHandle** fhandle)
 {
-	if (fhandle->plugincnt) {
+	if (!(*fhandle)) {
+		return -1;
+	}
+
+	if ((*fhandle)->plugincnt) {
 		return -1;
 	}
 
-	if (fhandle->dll) {
-		FreeLibrary (fhandle->dll);
-		fhandle->dll = NULL;
+	if ((*fhandle)->dll) {
+		FreeLibrary ((HMODULE)(*fhandle)->dll);
+		(*fhandle)->dll = NULL;
 	}
 
-	if (fhandle->nameptr) {
-		free (fhandle->nameptr);
-		fhandle->name = NULL;
+	if ((*fhandle)->path) {
+		free ((*fhandle)->path);
+		(*fhandle)->path = NULL;
 	}
-	
-	free (fhandle);
+
+	if ((*fhandle)->name) {
+		free ((*fhandle)->name);
+		(*fhandle)->name = NULL;
+	}
+
+	free (*fhandle);
+	*fhandle = NULL;
+
 	return 0;
 }
 
-FST*
-fst_instantiate (FSTHandle* fhandle, audioMasterCallback amc, void* userptr)
+VSTState*
+fst_instantiate (VSTHandle* fhandle, audioMasterCallback amc, void* userptr)
 {
-	FST* fst = fst_new ();
+	VSTState* fst = NULL;
 
 	if( fhandle == NULL ) {
-	    fst_error( "the handle was NULL\n" );
-	    return NULL;
+		fst_error( "fst_instantiate(): (the handle was NULL)\n" );
+		return NULL;
 	}
 
+	fst = fst_new ();
+
 	if ((fst->plugin = fhandle->main_entry (amc)) == NULL)  {
-		fst_error ("%s could not be instantiated\n", fhandle->name);
+		fst_error ("fst_instantiate: %s could not be instantiated\n", fhandle->name);
 		free (fst);
 		return NULL;
 	}
-	
+
 	fst->handle = fhandle;
 	fst->plugin->user = userptr;
-		
+
 	if (fst->plugin->magic != kEffectMagic) {
-		fst_error ("%s is not a VST plugin\n", fhandle->name);
-		free (fst);
+		fst_error ("fst_instantiate: %s is not a vst plugin\n", fhandle->name);
+		fst_close(fst);
 		return NULL;
 	}
-	
+
 	fst->plugin->dispatcher (fst->plugin, effOpen, 0, 0, 0, 0);
-	//fst->plugin->dispatcher (fst->plugin, effMainsChanged, 0, 0, NULL, 0);
+	fst->vst_version = fst->plugin->dispatcher (fst->plugin, effGetVstVersion, 0, 0, 0, 0);
 
 	fst->handle->plugincnt++;
+	fst->wantIdle = 0;
 
 	return fst;
 }
 
+void fst_audio_master_idle(void) {
+	while(g_main_context_iteration(NULL, FALSE)) ;
+}
+
 void
-fst_close (FST* fst)
+fst_close (VSTState* fst)
 {
-	fst_destroy_editor (fst);
+	if (fst != NULL) {
+		fst_destroy_editor (fst);
 
-	fst->plugin->dispatcher (fst->plugin, effMainsChanged, 0, 0, NULL, 0);
-	fst->plugin->dispatcher (fst->plugin, effClose, 0, 0, 0, 0);
+		if (fst->plugin) {
+			fst->plugin->dispatcher (fst->plugin, effMainsChanged, 0, 0, NULL, 0);
+			fst->plugin->dispatcher (fst->plugin, effClose, 0, 0, 0, 0);
+			fst->plugin = NULL;
+		}
 
-	if (fst->handle->plugincnt) {
-		--fst->handle->plugincnt;
-	}
-}
+		if (fst->handle) {
+			if (fst->handle->plugincnt && --fst->handle->plugincnt == 0) {
 
-int
-fst_get_XID (FST* fst)
-{
-	return fst->xid;
+				fst->handle->main_entry = NULL;
+				fst_unload (&fst->handle); // XXX
+			}
+		}
+
+		/* It might be good for this to be in it's own cleanup function
+			since it will free the memory for the fst leaving the caller
+			with an invalid pointer.  Caller beware */
+		fst_delete(fst);
+	}
 }
 
-int
-fst_adopt_thread ()
+#if 0 // ?? who needs this, where?
+float htonf (float v)
 {
-	return 0;
+	float result;
+	char * fin = (char*)&v;
+	char * fout = (char*)&result;
+	fout[0] = fin[3];
+	fout[1] = fin[2];
+	fout[2] = fin[1];
+	fout[3] = fin[0];
+	return result;
 }
+#endif