Update of /cvsroot/pure-data/externals/grill/vst/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11594/src

Modified Files: editorwin.hpp vsthost.cpp vstmaster.cpp Log Message: experimenting a bit.... rename help file fixes for pthreads V2

Index: vstmaster.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/vst/src/vstmaster.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** vstmaster.cpp 25 Mar 2005 04:55:11 -0000 1.5 --- vstmaster.cpp 6 Dec 2005 21:54:51 -0000 1.6 *************** *** 182,186 **** case audioMasterGetCurrentProcessLevel: // 23 // return thread state ! return flext::GetThreadId() == flext::GetSysThreadId()?2:1;

case audioMasterGetAutomationState: // 24 --- 182,186 ---- case audioMasterGetCurrentProcessLevel: // 23 // return thread state ! return flext::IsSystemThread()?2:1;

case audioMasterGetAutomationState: // 24

Index: vsthost.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/vst/src/vsthost.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** vsthost.cpp 25 Mar 2005 04:55:11 -0000 1.9 --- vsthost.cpp 6 Dec 2005 21:54:51 -0000 1.10 *************** *** 123,126 **** --- 123,127 ---- if(p && p->plug->hwnd == NULL) { // yes, it is now safe to delete the plug + post("DELETE %s",p->plug->dllname.c_str()); delete p->plug; delete p; *************** *** 171,174 **** --- 172,186 ---- #if FLEXT_OS == FLEXT_OS_WIN hdll = LoadLibraryEx(dllname.c_str(),NULL,0 /*DONT_RESOLVE_DLL_REFERENCES*/); + /* + char buf[255],*c; + strcpy(buf,dllname.c_str()); + for(c = buf; *c; ++c) + if(*c == '/') + *c = '\'; + char *sl = strrchr(buf,'\'); + if(sl) *sl = 0; + SetCurrentDirectory(buf); + hdll = LoadLibrary(dllname.c_str()); + */ if(hdll) pluginmain = (PVSTMAIN)GetProcAddress(hdll,"main"); audiomaster = Master;

Index: editorwin.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/vst/src/editorwin.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** editorwin.hpp 25 Mar 2005 04:55:11 -0000 1.4 --- editorwin.hpp 6 Dec 2005 21:54:51 -0000 1.5 *************** *** 16,20 **** #include <windows.h>

! typedef std::map<flext::thrid_t,VSTPlugin *> WndMap; static WndMap wndmap; static flext::ThrMutex mapmutex; --- 16,32 ---- #include <windows.h>

! class ThrCmp ! { ! public: ! inline bool operator()(const flext::thrid_t &a,const flext::thrid_t &b) const ! { ! if(sizeof(a) == sizeof(size_t)) ! return *(size_t *)&a < *(size_t *)&b; ! else ! return memcmp(&a,&b,sizeof(a)) < 0; ! } ! }; ! ! typedef std::map<flext::thrid_t,VSTPlugin *,ThrCmp> WndMap; static WndMap wndmap; static flext::ThrMutex mapmutex; *************** *** 57,61 **** case WM_TIMER: // fall through case WM_ENTERIDLE: ! // plug->EditorIdle(); break; #if 0 --- 69,73 ---- case WM_TIMER: // fall through case WM_ENTERIDLE: ! plug->EditorIdle(); break; #if 0 *************** *** 137,141 **** default: #ifdef FLEXT_LOGGING ! flext::post("WND MSG %i, WP=%i, lp=%i",msg,wp,lp); #endif

--- 149,153 ---- default: #ifdef FLEXT_LOGGING ! // flext::post("WND MSG %i, WP=%i, lp=%i",msg,wp,lp); #endif