Update of /cvsroot/pure-data/externals/grill/vst/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14165/src
Modified Files:
editormac.hpp main.cpp vsthost.cpp vsthost.h
Log Message:
small OSX things
updated build system
Index: vsthost.h
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/vst/src/vsthost.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** vsthost.h 17 Mar 2005 04:57:22 -0000 1.7
--- vsthost.h 20 Mar 2005 04:57:22 -0000 1.8
***************
*** 325,330 ****
--- 325,332 ----
+ #if FLEXT_OS == FLEXT_OS_WIN
// the handle to the shared library
MHandle hdll;
+ #endif
// the handle to the plugin editor window
WHandle hwnd;
Index: vsthost.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/vst/src/vsthost.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** vsthost.cpp 17 Mar 2005 04:57:22 -0000 1.7
--- vsthost.cpp 20 Mar 2005 04:57:22 -0000 1.8
***************
*** 62,67 ****
VSTPlugin::VSTPlugin(Responder *resp)
! : hdll(NULL),hwnd(NULL)
! , effect(NULL),pluginmain(NULL),audiomaster(NULL)
, responder(resp)
, posx(0),posy(0),sizex(0),sizey(0)
--- 62,70 ----
VSTPlugin::VSTPlugin(Responder *resp)
! : 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)
***************
*** 162,170 ****
bool VSTPlugin::NewPlugin(const char *plugname)
{
! FLEXT_ASSERT(!hdll && !pluginmain && !audiomaster);
dllname = plugname;
#if FLEXT_OS == FLEXT_OS_WIN
hdll = LoadLibrary(dllname.c_str());
if(hdll) pluginmain = (PVSTMAIN)GetProcAddress(hdll,"main");
--- 165,174 ----
bool VSTPlugin::NewPlugin(const char *plugname)
{
! 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");
***************
*** 224,228 ****
#endif
! if(hdll && pluginmain && audiomaster)
return true;
else {
--- 228,232 ----
#endif
! if(pluginmain && audiomaster)
return true;
else {
***************
*** 235,239 ****
{
#if FLEXT_OS == FLEXT_OS_WIN
! if(hdll) FreeLibrary(hdll);
#elif FLEXT_OS == FLEXT_OS_MAC
--- 239,243 ----
{
#if FLEXT_OS == FLEXT_OS_WIN
! if(hdll) { FreeLibrary(hdll); hdll = NULL; }
#elif FLEXT_OS == FLEXT_OS_MAC
***************
*** 252,256 ****
audiomaster = NULL;
pluginmain = NULL;
- hdll = NULL;
}
--- 256,259 ----
***************
*** 275,279 ****
//This calls the "main" function and receives the pointer to the AEffect structure.
try { effect = pluginmain(audiomaster); }
! catch(exception &e) {
flext::post("vst~ - caught exception while instantiating plugin: %s",e.what());
}
--- 278,282 ----
//This calls the "main" function and receives the pointer to the AEffect structure.
try { effect = pluginmain(audiomaster); }
! catch(std::exception &e) {
flext::post("vst~ - caught exception while instantiating plugin: %s",e.what());
}
***************
*** 380,384 ****
}
! catch(exception &e) {
flext::post("vst~ - caught exception while loading plugin: %s",e.what());
ok = false;
--- 383,387 ----
}
! catch(std::exception &e) {
flext::post("vst~ - caught exception while loading plugin: %s",e.what());
ok = false;
***************
*** 420,424 ****
Dispatch(effMainsChanged,0,1);
}
! catch(exception &e) {
flext::post("vst~ - caught exception while initializing dsp: %s",e.what());
}
--- 423,427 ----
Dispatch(effMainsChanged,0,1);
}
! catch(std::exception &e) {
flext::post("vst~ - caught exception while initializing dsp: %s",e.what());
}
Index: editormac.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/vst/src/editormac.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** editormac.hpp 18 Dec 2004 05:06:58 -0000 1.1
--- editormac.hpp 20 Mar 2005 04:57:22 -0000 1.2
***************
*** 48,54 ****
}
! bool IsEditorShown(const VSTPlugin *p)
{
- return false;
}
--- 48,57 ----
}
! void HandleEditor(VSTPlugin *p,bool h)
! {
! }
!
! void FrontEditor(VSTPlugin *p)
{
}
Index: main.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/vst/src/main.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** main.cpp 17 Mar 2005 04:57:22 -0000 1.26
--- main.cpp 20 Mar 2005 04:57:22 -0000 1.27
***************
*** 466,470 ****
// \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
// vst would dump out a respective signal to the patcher
bool vst::LoadPlug()
--- 466,470 ----
// \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
// vst would dump out a respective signal to the patcher
bool vst::LoadPlug()