projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 4c4e2888f55e6ccbaeedeb405b4a48167eadc498..27fb3cbead21af949eb87ed6361e4d21df356f61 100644
(file)
--- a/
libs/fst/vstwin.c
+++ b/
libs/fst/vstwin.c
@@
-2,16
+2,16
@@
#include <string.h>
#include <windows.h>
#include <string.h>
#include <windows.h>
+#define fst_error(...) fprintf(stderr, __VA_ARGS__)
+
#ifdef PLATFORM_WINDOWS
#include <pthread.h>
static UINT_PTR idle_timer_id = 0;
#ifdef PLATFORM_WINDOWS
#include <pthread.h>
static UINT_PTR idle_timer_id = 0;
-extern char *basename(char *path);
#else /* linux + wine */
#include <linux/limits.h> // PATH_MAX
#else /* linux + wine */
#include <linux/limits.h> // PATH_MAX
-#include <libgen.h> // basename
#include <winnt.h>
#include <wine/exception.h>
#include <pthread.h>
#include <winnt.h>
#include <wine/exception.h>
#include <pthread.h>
@@
-223,7
+223,7
@@
fst_new (void)
fst->n_pending_keys = 0;
fst->has_editor = 0;
#ifdef PLATFORM_WINDOWS
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;
fst->hoffset = 0;
#else /* linux + wine */
fst->voffset = 24;
@@
-465,7
+465,7
@@
fst_move_window_into_view (VSTState* fst)
{
if (fst->windows_window) {
#ifdef PLATFORM_WINDOWS
{
if (fst->windows_window) {
#ifdef PLATFORM_WINDOWS
- SetWindowPos ((HWND)(fst->windows_window), 0, fst->hoffset, fst->voffset, fst->width
, fst->heigh
t, 0);
+ SetWindowPos ((HWND)(fst->windows_window), 0, fst->hoffset, fst->voffset, fst->width
+ fst->hoffset, fst->height + fst->voffse
t, 0);
#else /* linux + wine */
SetWindowPos ((HWND)(fst->windows_window), 0, 0, 0, fst->width + fst->hoffset, fst->height + fst->voffset, 0);
#endif
#else /* linux + wine */
SetWindowPos ((HWND)(fst->windows_window), 0, 0, 0, fst->width + fst->hoffset, fst->height + fst->voffset, 0);
#endif
@@
-489,9
+489,8
@@
fst_load (const char *path)
if ((strlen(path)) && (NULL != (fhandle = fst_handle_new ())))
{
char* period;
if ((strlen(path)) && (NULL != (fhandle = fst_handle_new ())))
{
char* period;
- fhandle->nameptr = strdup (path);
fhandle->path = strdup (path);
fhandle->path = strdup (path);
- fhandle->name =
basename(fhandle->nameptr
);
+ fhandle->name =
g_path_get_basename(path
);
if ((period = strrchr (fhandle->name, '.'))) {
*period = '\0';
}
if ((period = strrchr (fhandle->name, '.'))) {
*period = '\0';
}
@@
-502,10
+501,10
@@
fst_load (const char *path)
return NULL;
}
return NULL;
}
- fhandle->main_entry = (main_entry_t) GetProcAddress (fhandle->dll, "main");
+ fhandle->main_entry = (main_entry_t) GetProcAddress (
(HMODULE)
fhandle->dll, "main");
if (fhandle->main_entry == 0) {
if (fhandle->main_entry == 0) {
- if ((fhandle->main_entry = (main_entry_t) GetProcAddress (fhandle->dll, "VSTPluginMain"))) {
+ 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;
}
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;
}
@@
-540,9
+539,8
@@
fst_unload (VSTHandle** fhandle)
(*fhandle)->path = NULL;
}
(*fhandle)->path = NULL;
}
- if ((*fhandle)->nameptr) {
- free ((*fhandle)->nameptr);
- (*fhandle)->nameptr = NULL;
+ if ((*fhandle)->name) {
+ free ((*fhandle)->name);
(*fhandle)->name = NULL;
}
(*fhandle)->name = NULL;
}