Merge branch 'noppc' of https://github.com/mojofunk/ardour into cairocanvas

[ardour.git] / libs / fst / vstwin.c

diff --git a/libs/fst/vstwin.c b/libs/fst/vstwin.c
index 6537918a7f129430d3338b97a888edd4354f4230..27fb3cbead21af949eb87ed6361e4d21df356f61 100644 (file)
--- a/libs/fst/vstwin.c
+++ b/libs/fst/vstwin.c
@@ -8,7 +8,6 @@
 
 #include <pthread.h>
 static UINT_PTR idle_timer_id   = 0;
-//extern char* basename(char *path);  //
 
 #else /* linux + wine */
 
@@ -224,7 +223,7 @@ fst_new (void)
        fst->n_pending_keys = 0;
        fst->has_editor = 0;
 #ifdef PLATFORM_WINDOWS
-       fst->voffset = 36;
+       fst->voffset = 50;
        fst->hoffset = 0;
 #else /* linux + wine */
        fst->voffset = 24;
@@ -466,7 +465,7 @@ fst_move_window_into_view (VSTState* fst)
 {
        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
@@ -490,9 +489,8 @@ fst_load (const char *path)
        if ((strlen(path)) && (NULL != (fhandle = fst_handle_new ())))
        {
                char* period;
-               fhandle->nameptr = strdup (path);
                fhandle->path = strdup (path);
-               fhandle->name = strdup (g_path_get_basename(fhandle->nameptr));
+               fhandle->name = g_path_get_basename(path);
                if ((period = strrchr (fhandle->name, '.'))) {
                        *period = '\0';
                }
@@ -541,9 +539,8 @@ fst_unload (VSTHandle** fhandle)
                (*fhandle)->path = NULL;
        }
 
-       if ((*fhandle)->nameptr) {
-               free ((*fhandle)->nameptr);
-               (*fhandle)->nameptr = NULL;
+       if ((*fhandle)->name) {
+               free ((*fhandle)->name);
                (*fhandle)->name = NULL;
        }