From 7c87036ee3ba9dc4cc8b6f60c5a9e6dd399b1285 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 23 Nov 2011 19:31:04 +0000 Subject: [PATCH] Rename linux VST files to be more friendly. git-svn-id: svn://localhost/ardour2/branches/3.0@10808 d708f5d6-7413-0410-9779-e7cbd77b26cf --- .../{vstfxwin.cc => linux_vst_gui_support.cc} | 2 +- gtk2_ardour/lxvst_plugin_ui.cc | 2 +- gtk2_ardour/wscript | 2 +- libs/ardour/ardour/vstfx.h | 49 ------------------- libs/ardour/globals.cc | 2 +- ...stfxinfofile.cc => linux_vst_info_file.cc} | 2 +- .../ardour/{vstfx.cc => linux_vst_support.cc} | 2 +- libs/ardour/lxvst_plugin.cc | 2 +- libs/ardour/plugin_manager.cc | 6 +-- libs/ardour/test/dummy_lxvst.cc | 2 +- libs/ardour/wscript | 2 +- 11 files changed, 12 insertions(+), 61 deletions(-) rename gtk2_ardour/{vstfxwin.cc => linux_vst_gui_support.cc} (99%) mode change 100755 => 100644 delete mode 100755 libs/ardour/ardour/vstfx.h rename libs/ardour/{vstfxinfofile.cc => linux_vst_info_file.cc} (99%) mode change 100755 => 100644 rename libs/ardour/{vstfx.cc => linux_vst_support.cc} (99%) mode change 100755 => 100644 diff --git a/gtk2_ardour/vstfxwin.cc b/gtk2_ardour/linux_vst_gui_support.cc old mode 100755 new mode 100644 similarity index 99% rename from gtk2_ardour/vstfxwin.cc rename to gtk2_ardour/linux_vst_gui_support.cc index 0687d06b71..161b6495c1 --- a/gtk2_ardour/vstfxwin.cc +++ b/gtk2_ardour/linux_vst_gui_support.cc @@ -17,7 +17,7 @@ #include #include -#include "ardour/vstfx.h" +#include "ardour/linux_vst_support.h" #include #include diff --git a/gtk2_ardour/lxvst_plugin_ui.cc b/gtk2_ardour/lxvst_plugin_ui.cc index 31bb6c879b..5d86f428c2 100644 --- a/gtk2_ardour/lxvst_plugin_ui.cc +++ b/gtk2_ardour/lxvst_plugin_ui.cc @@ -18,7 +18,7 @@ */ #include "ardour/lxvst_plugin.h" -#include "ardour/vstfx.h" +#include "ardour/linux_vst_support.h" #include "lxvst_plugin_ui.h" #include "ardour_ui.h" #include diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 65e1da5186..3a5a301a13 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -399,7 +399,7 @@ def build(bld): obj.uselib += ' X11 ' if bld.is_defined('LXVST_SUPPORT'): - obj.source += [ 'vstfxwin.cc', 'lxvst_plugin_ui.cc' ] + obj.source += [ 'linux_vst_gui_support.cc', 'lxvst_plugin_ui.cc' ] obj.defines += [ 'LXVST_SUPPORT' ] obj.uselib += ' X11 ' diff --git a/libs/ardour/ardour/vstfx.h b/libs/ardour/ardour/vstfx.h deleted file mode 100755 index 31f8bafe51..0000000000 --- a/libs/ardour/ardour/vstfx.h +++ /dev/null @@ -1,49 +0,0 @@ -#ifndef __vstfx_h__ -#define __vstfx_h__ - -#include -#include -#include -#include - -#include "ardour/vst_types.h" - -/******************************************************************************************/ -/*VSTFX - an engine to manage native linux VST plugins - derived from FST for Windows VSTs*/ -/******************************************************************************************/ - -extern void (*vstfx_error_callback)(const char *msg); - -void vstfx_set_error_function (void (*func)(const char *)); - -void vstfx_error (const char *fmt, ...); - -/*API to vstfx*/ - -extern int vstfx_launch_editor (VSTState *); -extern int vstfx_init (void *); -extern void vstfx_exit (); -extern VSTHandle * vstfx_load (const char*); -extern int vstfx_unload (VSTHandle *); -extern VSTState * vstfx_instantiate (VSTHandle *, audioMasterCallback, void *); -extern void vstfx_close (VSTState*); - -extern int vstfx_create_editor (VSTState *); -extern int vstfx_run_editor (VSTState *); -extern void vstfx_destroy_editor (VSTState *); - -extern VSTInfo * vstfx_get_info (char *); -extern void vstfx_free_info (VSTInfo *); -extern void vstfx_event_loop_remove_plugin (VSTState *); -extern int vstfx_call_dispatcher (VSTState *, int, int, int, void *, float); - -/** Load a plugin state from a file.**/ - -extern int vstfx_load_state (VSTState* vstfx, char * filename); - -/** Save a plugin state to a file.**/ - -extern bool vstfx_save_state (VSTState* vstfx, char * filename); - - -#endif /* __vstfx_h__ */ diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index e07437ce9d..5a2a2addd6 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -34,7 +34,7 @@ #endif #ifdef LXVST_SUPPORT -#include "ardour/vstfx.h" +#include "ardour/linux_vst_support.h" #endif #ifdef AUDIOUNIT_SUPPORT diff --git a/libs/ardour/vstfxinfofile.cc b/libs/ardour/linux_vst_info_file.cc old mode 100755 new mode 100644 similarity index 99% rename from libs/ardour/vstfxinfofile.cc rename to libs/ardour/linux_vst_info_file.cc index 070c646dbe..58954c7261 --- a/libs/ardour/vstfxinfofile.cc +++ b/libs/ardour/linux_vst_info_file.cc @@ -20,7 +20,7 @@ #include #include -#include "ardour/vstfx.h" +#include "ardour/linux_vst_support.h" #define MAX_STRING_LEN 256 diff --git a/libs/ardour/vstfx.cc b/libs/ardour/linux_vst_support.cc old mode 100755 new mode 100644 similarity index 99% rename from libs/ardour/vstfx.cc rename to libs/ardour/linux_vst_support.cc index 5046afb737..e6f2735351 --- a/libs/ardour/vstfx.cc +++ b/libs/ardour/linux_vst_support.cc @@ -10,7 +10,7 @@ #include #include -#include "ardour/vstfx.h" +#include "ardour/linux_vst_support.h" #include "pbd/error.h" /***********************************************************/ diff --git a/libs/ardour/lxvst_plugin.cc b/libs/ardour/lxvst_plugin.cc index f14d052fd4..6e30e0c443 100755 --- a/libs/ardour/lxvst_plugin.cc +++ b/libs/ardour/lxvst_plugin.cc @@ -17,7 +17,7 @@ */ -#include "ardour/vstfx.h" +#include "ardour/linux_vst_support.h" #include "ardour/session.h" #include "ardour/lxvst_plugin.h" diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc index 0cfbdd17eb..54a130ec9c 100644 --- a/libs/ardour/plugin_manager.cc +++ b/libs/ardour/plugin_manager.cc @@ -31,14 +31,14 @@ #include #ifdef WINDOWS_VST_SUPPORT -#include +#include "fst.h" #include "pbd/basename.h" #include #endif // WINDOWS_VST_SUPPORT #ifdef LXVST_SUPPORT -#include -#include +#include "ardour/linux_vst_support.h" +#include "pbd/basename.h" #include #endif //LXVST_SUPPORT diff --git a/libs/ardour/test/dummy_lxvst.cc b/libs/ardour/test/dummy_lxvst.cc index 1c8b63e466..9f93b48c74 100644 --- a/libs/ardour/test/dummy_lxvst.cc +++ b/libs/ardour/test/dummy_lxvst.cc @@ -1,6 +1,6 @@ /* Dummy LXVST methods so that libardour can be linked against the test code */ -#include "ardour/vstfx.h" +#include "ardour/linux_vst_support.h" int vstfx_init (void* ptr) diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 6d79413a1f..d6b72dbf2d 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -391,7 +391,7 @@ def build(bld): obj.defines += [ 'WINDOWS_VST_SUPPORT' ] if bld.is_defined('LXVST_SUPPORT'): - obj.source += [ 'lxvst_plugin.cc', 'vstfx.cc', 'vstfxinfofile.cc' ] + obj.source += [ 'lxvst_plugin.cc', 'linux_vst_support.cc', 'linux_vst_info_file.cc' ] obj.defines += [ 'LXVST_SUPPORT' ] if bld.is_defined('WINDOWS_VST_SUPPORT') or bld.is_defined('LXVST_SUPPORT'):