diff options
author | Thomas Grill <xovo@users.sourceforge.net> | 2005-03-20 04:57:22 +0000 |
---|---|---|
committer | Thomas Grill <xovo@users.sourceforge.net> | 2005-03-20 04:57:22 +0000 |
commit | dccb7f1e9f8454ddca9e1013e4c930f9cc699e86 (patch) | |
tree | ab94fefd9ba2b51fb55b3fed90eafe9fdf0d6759 /externals/grill/vst/src | |
parent | 2f61089735df22774c2fb257dd69ce3e8199577f (diff) |
small OSX things
updated build system
svn path=/trunk/; revision=2636
Diffstat (limited to 'externals/grill/vst/src')
-rw-r--r-- | externals/grill/vst/src/editormac.hpp | 7 | ||||
-rw-r--r-- | externals/grill/vst/src/main.cpp | 2 | ||||
-rw-r--r-- | externals/grill/vst/src/vsthost.cpp | 21 | ||||
-rw-r--r-- | externals/grill/vst/src/vsthost.h | 2 |
4 files changed, 20 insertions, 12 deletions
diff --git a/externals/grill/vst/src/editormac.hpp b/externals/grill/vst/src/editormac.hpp index f5316105..b519aa06 100644 --- a/externals/grill/vst/src/editormac.hpp +++ b/externals/grill/vst/src/editormac.hpp @@ -47,9 +47,12 @@ void TitleEditor(VSTPlugin *p,const char *t) { } -bool IsEditorShown(const VSTPlugin *p) +void HandleEditor(VSTPlugin *p,bool h) +{ +} + +void FrontEditor(VSTPlugin *p) { - return false; } #endif // FLEXT_OS_MAC diff --git a/externals/grill/vst/src/main.cpp b/externals/grill/vst/src/main.cpp index 29263cdd..d90cac4a 100644 --- a/externals/grill/vst/src/main.cpp +++ b/externals/grill/vst/src/main.cpp @@ -465,7 +465,7 @@ static std::string findFilePath(const std::string &path,const std::string &dllna } // \todo this should be in the background, because it can take some time -// ideally vst would get a response from VSTPlugin when readily, loaded and +// ideally vst would get a response from VSTPlugin when readily loaded and // vst would dump out a respective signal to the patcher bool vst::LoadPlug() { diff --git a/externals/grill/vst/src/vsthost.cpp b/externals/grill/vst/src/vsthost.cpp index 8cb69f93..384fca28 100644 --- a/externals/grill/vst/src/vsthost.cpp +++ b/externals/grill/vst/src/vsthost.cpp @@ -61,8 +61,11 @@ void VSTPlugin::Setup() } VSTPlugin::VSTPlugin(Responder *resp) - : hdll(NULL),hwnd(NULL) - , effect(NULL),pluginmain(NULL),audiomaster(NULL) + : effect(NULL),pluginmain(NULL),audiomaster(NULL) +#if FLEXT_OS == FLEXT_OS_WIN + , hdll(NULL) +#endif + , hwnd(NULL) , responder(resp) , posx(0),posy(0),sizex(0),sizey(0) , visible(true),caption(true),handle(false) @@ -161,11 +164,12 @@ BadParameter: // must be NULL beforehand! bool VSTPlugin::NewPlugin(const char *plugname) { - FLEXT_ASSERT(!hdll && !pluginmain && !audiomaster); + FLEXT_ASSERT(!pluginmain && !audiomaster); dllname = plugname; #if FLEXT_OS == FLEXT_OS_WIN + FLEXT_ASSERT(!hdll); hdll = LoadLibrary(dllname.c_str()); if(hdll) pluginmain = (PVSTMAIN)GetProcAddress(hdll,"main"); audiomaster = Master; @@ -223,7 +227,7 @@ bool VSTPlugin::NewPlugin(const char *plugname) #error Platform not supported #endif - if(hdll && pluginmain && audiomaster) + if(pluginmain && audiomaster) return true; else { FreePlugin(); @@ -234,7 +238,7 @@ bool VSTPlugin::NewPlugin(const char *plugname) void VSTPlugin::FreePlugin() { #if FLEXT_OS == FLEXT_OS_WIN - if(hdll) FreeLibrary(hdll); + if(hdll) { FreeLibrary(hdll); hdll = NULL; } #elif FLEXT_OS == FLEXT_OS_MAC #ifdef __MACOSX__ @@ -251,7 +255,6 @@ void VSTPlugin::FreePlugin() effect = NULL; audiomaster = NULL; pluginmain = NULL; - hdll = NULL; } /* @@ -274,7 +277,7 @@ bool VSTPlugin::InstPlugin(long plugid) //This calls the "main" function and receives the pointer to the AEffect structure. try { effect = pluginmain(audiomaster); } - catch(exception &e) { + catch(std::exception &e) { flext::post("vst~ - caught exception while instantiating plugin: %s",e.what()); } catch(...) { @@ -379,7 +382,7 @@ bool VSTPlugin::Instance(const char *name,const char *subname) } } - catch(exception &e) { + catch(std::exception &e) { flext::post("vst~ - caught exception while loading plugin: %s",e.what()); ok = false; } @@ -419,7 +422,7 @@ void VSTPlugin::DspInit(float sr,int blsz) // then signal that mains have changed! Dispatch(effMainsChanged,0,1); } - catch(exception &e) { + catch(std::exception &e) { flext::post("vst~ - caught exception while initializing dsp: %s",e.what()); } catch(...) { diff --git a/externals/grill/vst/src/vsthost.h b/externals/grill/vst/src/vsthost.h index d4365e97..0b055d40 100644 --- a/externals/grill/vst/src/vsthost.h +++ b/externals/grill/vst/src/vsthost.h @@ -324,8 +324,10 @@ private: inline bool HasFlags(long msk) const { return effect && (effect->flags&msk); } +#if FLEXT_OS == FLEXT_OS_WIN // the handle to the shared library MHandle hdll; +#endif // the handle to the plugin editor window WHandle hwnd; // the VST plugin instance |