ardour/livetrax
13
0
Fork 0
Code

rework 8e3b6c9ac (fstwin is C code, not C++)

Browse Source
This commit is contained in:
Robin Gareus 2016-11-15 02:49:30 +01:00
parent 4e8d705d99
commit 5dc2497100
7 changed files with 45 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libs/ardour/ardour/vst_types.h
View File

@ -134,26 +134,10 @@ struct LIBARDOUR_API _VSTState
pthread_cond_t plugin_dispatcher_called;
pthread_cond_t window_created;
int been_activated;
void init () {
pthread_mutex_init (&lock, 0);
pthread_mutex_init (&state_lock, 0);
pthread_cond_init (&window_status_change, 0);
pthread_cond_init (&plugin_dispatcher_called, 0);
pthread_cond_init (&window_created, 0);
want_program = -1;
want_chunk = 0;
n_pending_keys = 0;
has_editor = 0;
program_set_without_editor = 0;
linux_window = 0;
linux_plugin_ui_window = 0;
eventProc = 0;
extra_data = 0;
want_resize = 0;
}
};
typedef struct _VSTState VSTState;
LIBARDOUR_API extern void vststate_init (VSTState* state);
#endif

2
libs/ardour/linux_vst_support.cc
View File

@ -83,7 +83,7 @@ static VSTState *
vstfx_new ()
{
VSTState* vstfx = (VSTState *) calloc (1, sizeof (VSTState));
vstfx->init ();
vststate_init (vstfx);
return vstfx;
}

2
libs/ardour/mac_vst_support.cc
View File

@ -80,7 +80,7 @@ static VSTState *
mac_vst_new ()
{
VSTState* mac_vst = (VSTState *) calloc (1, sizeof (VSTState));
mac_vst->init();
vststate_init (mac_vst);
return mac_vst;
}

38
libs/ardour/vst_helper.cc Normal file
View File

@ -0,0 +1,38 @@
/*
* Copyright (C) 2016 Robin Gareus <robin@gareus.org>
* Copyright (C) 2010 Paul Davis
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "ardour/vst_types.h"
void vststate_init (VSTState* state) {
pthread_mutex_init (&state->lock, 0);
pthread_mutex_init (&state->state_lock, 0);
pthread_cond_init (&state->window_status_change, 0);
pthread_cond_init (&state->plugin_dispatcher_called, 0);
pthread_cond_init (&state->window_created, 0);
state->want_program = -1;
state->want_chunk = 0;
state->n_pending_keys = 0;
state->has_editor = 0;
state->program_set_without_editor = 0;
state->linux_window = 0;
state->linux_plugin_ui_window = 0;
state->eventProc = 0;
state->extra_data = 0;
state->want_resize = 0;
}

2
libs/ardour/wscript
View File

@ -436,7 +436,7 @@ def build(bld):
obj.defines += [ 'LXVST_SUPPORT' ]
if bld.is_defined('WINDOWS_VST_SUPPORT') or bld.is_defined('LXVST_SUPPORT') or bld.is_defined('MACVST_SUPPORT'):
obj.source += [ 'session_vst.cc', 'vst_plugin.cc', 'vst_info_file.cc' ]
obj.source += [ 'session_vst.cc', 'vst_plugin.cc', 'vst_info_file.cc', 'vst_helper.cc' ]
if bld.is_defined('MACVST_SUPPORT'):
obj.source += [ 'mac_vst_plugin.cc', 'mac_vst_support.cc' ]

1
libs/fst/scanner.cc
View File

@ -36,6 +36,7 @@
#endif
#include "../ardour/filesystem_paths.cc"
#include "../ardour/directory_names.cc"
#include "../ardour/vst_helper.cc"
#ifdef LXVST_SUPPORT

2
libs/fst/vstwin.c
View File

@ -220,7 +220,7 @@ static VSTState*
fst_new (void)
{
VSTState* fst = (VSTState*) calloc (1, sizeof (VSTState));
fst->init();
vststate_init (fst);
#ifdef PLATFORM_WINDOWS
fst->voffset = 50;
fst->hoffset = 0;