Pd-cvs August 2004

pd-cvs@lists.iem.at

10 participants
171 discussions

pd/portaudio/pa_beos PlaybackNode.cc,1.1.1.1.2.2,1.1.1.1.2.2.2.1 PlaybackNode.h,1.1.1.1.2.2,1.1.1.1.2.2.2.1 pa_beos_mk.cc,1.1.1.1.2.2,1.1.1.1.2.2.2.1
by carmen rocco 24 Aug '04

24 Aug '04

Update of /cvsroot/pure-data/pd/portaudio/pa_beos In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5913/pa_beos Modified Files: Tag: impd_0_37 PlaybackNode.cc PlaybackNode.h pa_beos_mk.cc Log Message: new snapshot

1 0

pd/portaudio/pa_common pa_host.h,1.1.1.1.16.2,1.1.1.1.16.2.2.1 pa_lib.c,1.1.1.1.16.2,1.1.1.1.16.2.2.1 pa_trace.c,1.1.1.2.2.2,1.1.1.2.2.2.2.1 pa_trace.h,1.1.1.2.2.2,1.1.1.2.2.2.2.1 portaudio.h,1.1.1.2.2.2,1.1.1.2.2.2.2.1
by carmen rocco 24 Aug '04

24 Aug '04

Update of /cvsroot/pure-data/pd/portaudio/pa_common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5913/pa_common Modified Files: Tag: impd_0_37 pa_host.h pa_lib.c pa_trace.c pa_trace.h portaudio.h Log Message: new snapshot

1 0

pd/portaudio/pa_asio asio.cpp,NONE,1.1.2.1 asiodrivers.cpp,NONE,1.1.2.1 asiodrvr.cpp,NONE,1.1.2.1 asiodrvr.h,NONE,1.1.2.1 asiolist.cpp,NONE,1.1.2.1 asioshlib.cpp,NONE,1.1.2.1 asiosmpl.cpp,NONE,1.1.2.1 asiosmpl.h,NONE,1.1.2.1 combase.cpp,NONE,1.1.2.1 combase.h,NONE,1.1.2.1 debugmessage.cpp,NONE,1.1.2.1 dllentry.cpp,NONE,1.1.2.1 iasiodrv.h,NONE,1.1.2.1 iasiothiscallresolver.cpp,NONE,1.1.2.1 iasiothiscallresolver.h,NONE,1.1.2.1 wxdebug.h,NONE,1.1.2.1 asio.h,1.1.2.1,1.1.2.2 asiodrivers.h,1.1.2.1,1.1.2.
by carmen rocco 24 Aug '04

24 Aug '04

Update of /cvsroot/pure-data/pd/portaudio/pa_asio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5913/pa_asio Modified Files: Tag: impd_0_37 asio.h asiodrivers.h asiolist.h asiosys.h ginclude.h pa_asio.cpp Added Files: Tag: impd_0_37 asio.cpp asiodrivers.cpp asiodrvr.cpp asiodrvr.h asiolist.cpp asioshlib.cpp asiosmpl.cpp asiosmpl.h combase.cpp combase.h debugmessage.cpp dllentry.cpp iasiodrv.h iasiothiscallresolver.cpp iasiothiscallresolver.h wxdebug.h Removed Files: Tag: impd_0_37 Callback_adaptation_.pdf Pa_ASIO.pdf Log Message: new snapshot Index: asiodrivers.h =================================================================== RCS file: /cvsroot/pure-data/pd/portaudio/pa_asio/Attic/asiodrivers.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** asiodrivers.h 7 Jun 2004 17:16:11 -0000 1.1.2.1 --- asiodrivers.h 24 Aug 2004 04:12:57 -0000 1.1.2.2 *************** *** 1,41 **** ! #ifndef __AsioDrivers__ ! #define __AsioDrivers__ ! ! #include "ginclude.h" ! ! #if MAC ! #include "CodeFragments.hpp" ! ! class AsioDrivers : public CodeFragments ! ! #elif WINDOWS ! #include <windows.h> ! #include "asiolist.h" ! ! class AsioDrivers : public AsioDriverList ! ! #elif SGI || BEOS ! #include "asiolist.h" ! ! class AsioDrivers : public AsioDriverList ! ! #else ! #error implement me ! #endif ! ! { ! public: ! AsioDrivers(); ! ~AsioDrivers(); ! ! bool getCurrentDriverName(char *name); ! long getDriverNames(char **names, long maxDrivers); ! bool loadDriver(char *name); ! void removeCurrentDriver(); ! long getCurrentDriverIndex() {return curIndex;} ! protected: ! unsigned long connID; ! long curIndex; ! }; ! ! #endif --- 1,41 ---- ! #ifndef __AsioDrivers__ ! #define __AsioDrivers__ ! ! #include "ginclude.h" ! ! #if MAC ! #include "CodeFragments.hpp" ! ! class AsioDrivers : public CodeFragments ! ! #elif WINDOWS ! #include <windows.h> ! #include "asiolist.h" ! ! class AsioDrivers : public AsioDriverList ! ! #elif SGI || BEOS ! #include "asiolist.h" ! ! class AsioDrivers : public AsioDriverList ! ! #else ! #error implement me ! #endif ! ! { ! public: ! AsioDrivers(); ! ~AsioDrivers(); ! ! bool getCurrentDriverName(char *name); ! long getDriverNames(char **names, long maxDrivers); ! bool loadDriver(char *name); ! void removeCurrentDriver(); ! long getCurrentDriverIndex() {return curIndex;} ! protected: ! unsigned long connID; ! long curIndex; ! }; ! ! #endif --- NEW FILE: debugmessage.cpp --- #include "asiosys.h" #if DEBUG #if MAC #include <TextUtils.h> void DEBUGGERMESSAGE(char *string) { c2pstr(string); DebugStr((unsigned char *)string); } #else #error debugmessage #endif #endif --- NEW FILE: iasiothiscallresolver.cpp --- /* IASIOThiscallResolver.cpp see the comments in iasiothiscallresolver.h for the top level description - this comment describes the technical details of the implementation. The latest version of this file is available from: http://www.audiomulch.com/~rossb/code/calliasio please email comments to Ross Bencina <rossb(a)audiomulch.com> BACKGROUND The IASIO interface declared in the Steinberg ASIO 2 SDK declares functions with no explicit calling convention. This causes MSVC++ to default to using the thiscall convention, which is a proprietary convention not implemented by some non-microsoft compilers - notably borland BCC, C++Builder, and gcc. MSVC++ is the defacto standard compiler used by Steinberg. As a result of this situation, the ASIO sdk will compile with any compiler, however attempting to execute the compiled code will cause a crash due to different default calling conventions on non-Microsoft compilers. IASIOThiscallResolver solves the problem by providing an adapter class that delegates to the IASIO interface using the correct calling convention (thiscall). Due to the lack of support for thiscall in the Borland and GCC compilers, the calls have been implemented in assembly language. A number of macros are defined for thiscall function calls with different numbers of parameters, with and without return values - it may be possible to modify the format of these macros to make them work with other inline assemblers. THISCALL DEFINITION A number of definitions of the thiscall calling convention are floating around the internet. The following definition has been validated against output from the MSVC++ compiler: For non-vararg functions, thiscall works as follows: the object (this) pointer is passed in ECX. All arguments are passed on the stack in right to left order. The return value is placed in EAX. The callee clears the passed arguments from the stack. FINDING FUNCTION POINTERS FROM AN IASIO POINTER The first field of a COM object is a pointer to its vtble. Thus a pointer to an object implementing the IASIO interface also points to a pointer to that object's vtbl. The vtble is a table of function pointers for all of the virtual functions exposed by the implemented interfaces. If we consider a variable declared as a pointer to IASO: IASIO *theAsioDriver theAsioDriver points to: object implementing IASIO { IASIOvtbl *vtbl other data } in other words, theAsioDriver points to a pointer to an IASIOvtbl vtbl points to a table of function pointers: IASIOvtbl ( interface IASIO : public IUnknown ) { (IUnknown functions) 0 virtual HRESULT STDMETHODCALLTYPE (*QueryInterface)(REFIID riid, void **ppv) = 0; 4 virtual ULONG STDMETHODCALLTYPE (*AddRef)() = 0; 8 virtual ULONG STDMETHODCALLTYPE (*Release)() = 0; (IASIO functions) 12 virtual ASIOBool (*init)(void *sysHandle) = 0; 16 virtual void (*getDriverName)(char *name) = 0; 20 virtual long (*getDriverVersion)() = 0; 24 virtual void (*getErrorMessage)(char *string) = 0; 28 virtual ASIOError (*start)() = 0; 32 virtual ASIOError (*stop)() = 0; 36 virtual ASIOError (*getChannels)(long *numInputChannels, long *numOutputChannels) = 0; 40 virtual ASIOError (*getLatencies)(long *inputLatency, long *outputLatency) = 0; 44 virtual ASIOError (*getBufferSize)(long *minSize, long *maxSize, long *preferredSize, long *granularity) = 0; 48 virtual ASIOError (*canSampleRate)(ASIOSampleRate sampleRate) = 0; 52 virtual ASIOError (*getSampleRate)(ASIOSampleRate *sampleRate) = 0; 56 virtual ASIOError (*setSampleRate)(ASIOSampleRate sampleRate) = 0; 60 virtual ASIOError (*getClockSources)(ASIOClockSource *clocks, long *numSources) = 0; 64 virtual ASIOError (*setClockSource)(long reference) = 0; 68 virtual ASIOError (*getSamplePosition)(ASIOSamples *sPos, ASIOTimeStamp *tStamp) = 0; 72 virtual ASIOError (*getChannelInfo)(ASIOChannelInfo *info) = 0; 76 virtual ASIOError (*createBuffers)(ASIOBufferInfo *bufferInfos, long numChannels, long bufferSize, ASIOCallbacks *callbacks) = 0; 80 virtual ASIOError (*disposeBuffers)() = 0; 84 virtual ASIOError (*controlPanel)() = 0; 88 virtual ASIOError (*future)(long selector,void *opt) = 0; 92 virtual ASIOError (*outputReady)() = 0; }; The numbers in the left column show the byte offset of each function ptr from the beginning of the vtbl. These numbers are used in the code below to select different functions. In order to find the address of a particular function, theAsioDriver must first be dereferenced to find the value of the vtbl pointer: mov eax, theAsioDriver mov edx, [theAsioDriver] // edx now points to vtbl[0] Then an offset must be added to the vtbl pointer to select a particular function, for example vtbl+44 points to the slot containing a pointer to the getBufferSize function. Finally vtbl+x must be dereferenced to obtain the value of the function pointer stored in that address: call [edx+44] // call the function pointed to by // the value in the getBufferSize field of the vtbl SEE ALSO Martin Fay's OpenASIO DLL at http://www.martinfay.com solves the same problem by providing a new COM interface which wraps IASIO with an interface that uses portable calling conventions. OpenASIO must be compiled with MSVC, and requires that you ship the OpenASIO DLL with your application. ACKNOWLEDGEMENTS Ross Bencina: worked out the thiscall details above, wrote the original Borland asm macros, and a patch for asio.cpp (which is no longer needed). Thanks to Martin Fay for introducing me to the issues discussed here, and to Rene G. Ceballos for assisting with asm dumps from MSVC++. Antti Silvast: converted the original calliasio to work with gcc and NASM by implementing the asm code in a separate file. Fraser Adams: modified the original calliasio containing the Borland inline asm to add inline asm for gcc i.e. Intel syntax for Borland and AT&T syntax for gcc. This seems a neater approach for gcc than to have a separate .asm file and it means that we only need one version of the thiscall patch. Fraser Adams: rewrote the original calliasio patch in the form of the IASIOThiscallResolver class in order to avoid modifications to files from the Steinberg SDK, which may have had potential licence issues. Andrew Baldwin: contributed fixes for compatibility problems with more recent versions of the gcc assembler. */ // We only need IASIOThiscallResolver at all if we are on Win32. For other // platforms we simply bypass the IASIOThiscallResolver definition to allow us // to be safely #include'd whatever the platform to keep client code portable #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) // If microsoft compiler we can call IASIO directly so IASIOThiscallResolver // is not used. #if !defined(_MSC_VER) #include <new> #include <assert.h> // We have a mechanism in iasiothiscallresolver.h to ensure that asio.h is // #include'd before it in client code, we do NOT want to do this test here. #define iasiothiscallresolver_sourcefile 1 #include "iasiothiscallresolver.h" #undef iasiothiscallresolver_sourcefile // iasiothiscallresolver.h redefines ASIOInit for clients, but we don't want // this macro defined in this translation unit. #undef ASIOInit // theAsioDriver is a global pointer to the current IASIO instance which the // ASIO SDK uses to perform all actions on the IASIO interface. We substitute // our own forwarding interface into this pointer. extern IASIO* theAsioDriver; // The following macros define the inline assembler for BORLAND first then gcc #if defined(__BCPLUSPLUS__) || defined(__BORLANDC__) #define CALL_THISCALL_0( resultName, thisPtr, funcOffset )\ void *this_ = (thisPtr); \ __asm { \ mov ecx, this_ ; \ mov eax, [ecx] ; \ call [eax+funcOffset] ; \ mov resultName, eax ; \ } #define CALL_VOID_THISCALL_1( thisPtr, funcOffset, param1 )\ void *this_ = (thisPtr); \ __asm { \ mov eax, param1 ; \ push eax ; \ mov ecx, this_ ; \ mov eax, [ecx] ; \ call [eax+funcOffset] ; \ } #define CALL_THISCALL_1( resultName, thisPtr, funcOffset, param1 )\ void *this_ = (thisPtr); \ __asm { \ mov eax, param1 ; \ push eax ; \ mov ecx, this_ ; \ mov eax, [ecx] ; \ call [eax+funcOffset] ; \ mov resultName, eax ; \ } #define CALL_THISCALL_1_DOUBLE( resultName, thisPtr, funcOffset, param1 )\ void *this_ = (thisPtr); \ void *doubleParamPtr_ (&param1); \ __asm { \ mov eax, doubleParamPtr_ ; \ push [eax+4] ; \ push [eax] ; \ mov ecx, this_ ; \ mov eax, [ecx] ; \ call [eax+funcOffset] ; \ mov resultName, eax ; \ } #define CALL_THISCALL_2( resultName, thisPtr, funcOffset, param1, param2 )\ void *this_ = (thisPtr); \ __asm { \ mov eax, param2 ; \ push eax ; \ mov eax, param1 ; \ push eax ; \ mov ecx, this_ ; \ mov eax, [ecx] ; \ call [eax+funcOffset] ; \ mov resultName, eax ; \ } #define CALL_THISCALL_4( resultName, thisPtr, funcOffset, param1, param2, param3, param4 )\ void *this_ = (thisPtr); \ __asm { \ mov eax, param4 ; \ push eax ; \ mov eax, param3 ; \ push eax ; \ mov eax, param2 ; \ push eax ; \ mov eax, param1 ; \ push eax ; \ mov ecx, this_ ; \ mov eax, [ecx] ; \ call [eax+funcOffset] ; \ mov resultName, eax ; \ } #elif defined(__GNUC__) #define CALL_THISCALL_0( resultName, thisPtr, funcOffset ) \ __asm__ __volatile__ ("movl (%1), %%edx\n\t" \ "call *"#funcOffset"(%%edx)\n\t" \ :"=a"(resultName) /* Output Operands */ \ :"c"(thisPtr) /* Input Operands */ \ ); \ #define CALL_VOID_THISCALL_1( thisPtr, funcOffset, param1 ) \ __asm__ __volatile__ ("pushl %0\n\t" \ "movl (%1), %%edx\n\t" \ "call *"#funcOffset"(%%edx)\n\t" \ : /* Output Operands */ \ :"r"(param1), /* Input Operands */ \ "c"(thisPtr) \ ); \ #define CALL_THISCALL_1( resultName, thisPtr, funcOffset, param1 ) \ __asm__ __volatile__ ("pushl %1\n\t" \ "movl (%2), %%edx\n\t" \ "call *"#funcOffset"(%%edx)\n\t" \ :"=a"(resultName) /* Output Operands */ \ :"r"(param1), /* Input Operands */ \ "c"(thisPtr) \ ); \ #define CALL_THISCALL_1_DOUBLE( resultName, thisPtr, funcOffset, param1 ) \ __asm__ __volatile__ ("pushl 4(%1)\n\t" \ "pushl (%1)\n\t" \ "movl (%2), %%edx\n\t" \ "call *"#funcOffset"(%%edx);\n\t" \ :"=a"(resultName) /* Output Operands */ \ :"a"(&param1), /* Input Operands */ \ /* Note: Using "r" above instead of "a" fails */ \ /* when using GCC 3.3.3, and maybe later versions*/\ "c"(thisPtr) \ ); \ #define CALL_THISCALL_2( resultName, thisPtr, funcOffset, param1, param2 ) \ __asm__ __volatile__ ("pushl %1\n\t" \ "pushl %2\n\t" \ "movl (%3), %%edx\n\t" \ "call *"#funcOffset"(%%edx)\n\t" \ :"=a"(resultName) /* Output Operands */ \ :"r"(param2), /* Input Operands */ \ "r"(param1), \ "c"(thisPtr) \ ); \ #define CALL_THISCALL_4( resultName, thisPtr, funcOffset, param1, param2, param3, param4 )\ __asm__ __volatile__ ("pushl %1\n\t" \ "pushl %2\n\t" \ "pushl %3\n\t" \ "pushl %4\n\t" \ "movl (%5), %%edx\n\t" \ "call *"#funcOffset"(%%edx)\n\t" \ :"=a"(resultName) /* Output Operands */ \ :"r"(param4), /* Input Operands */ \ "r"(param3), \ "r"(param2), \ "r"(param1), \ "c"(thisPtr) \ ); \ #endif // Our static singleton instance. IASIOThiscallResolver IASIOThiscallResolver::instance; // Constructor called to initialize static Singleton instance above. Note that // it is important not to clear that_ incase it has already been set by the call // to placement new in ASIOInit(). IASIOThiscallResolver::IASIOThiscallResolver() { } // Constructor called from ASIOInit() below IASIOThiscallResolver::IASIOThiscallResolver(IASIO* that) : that_( that ) { } // Implement IUnknown methods as assert(false). IASIOThiscallResolver is not // really a COM object, just a wrapper which will work with the ASIO SDK. // If you wanted to use ASIO without the SDK you might want to implement COM // aggregation in these methods. HRESULT STDMETHODCALLTYPE IASIOThiscallResolver::QueryInterface(REFIID riid, void **ppv) { (void)riid; // suppress unused variable warning assert( false ); // this function should never be called by the ASIO SDK. *ppv = NULL; return E_NOINTERFACE; } ULONG STDMETHODCALLTYPE IASIOThiscallResolver::AddRef() { assert( false ); // this function should never be called by the ASIO SDK. return 1; } ULONG STDMETHODCALLTYPE IASIOThiscallResolver::Release() { assert( false ); // this function should never be called by the ASIO SDK. return 1; } // Implement the IASIO interface methods by performing the vptr manipulation // described above then delegating to the real implementation. ASIOBool IASIOThiscallResolver::init(void *sysHandle) { ASIOBool result; CALL_THISCALL_1( result, that_, 12, sysHandle ); return result; } void IASIOThiscallResolver::getDriverName(char *name) { CALL_VOID_THISCALL_1( that_, 16, name ); } long IASIOThiscallResolver::getDriverVersion() { ASIOBool result; CALL_THISCALL_0( result, that_, 20 ); return result; } void IASIOThiscallResolver::getErrorMessage(char *string) { CALL_VOID_THISCALL_1( that_, 24, string ); } ASIOError IASIOThiscallResolver::start() { ASIOBool result; CALL_THISCALL_0( result, that_, 28 ); return result; } ASIOError IASIOThiscallResolver::stop() { ASIOBool result; CALL_THISCALL_0( result, that_, 32 ); return result; } ASIOError IASIOThiscallResolver::getChannels(long *numInputChannels, long *numOutputChannels) { ASIOBool result; CALL_THISCALL_2( result, that_, 36, numInputChannels, numOutputChannels ); return result; } ASIOError IASIOThiscallResolver::getLatencies(long *inputLatency, long *outputLatency) { ASIOBool result; CALL_THISCALL_2( result, that_, 40, inputLatency, outputLatency ); return result; } ASIOError IASIOThiscallResolver::getBufferSize(long *minSize, long *maxSize, long *preferredSize, long *granularity) { ASIOBool result; CALL_THISCALL_4( result, that_, 44, minSize, maxSize, preferredSize, granularity ); return result; } ASIOError IASIOThiscallResolver::canSampleRate(ASIOSampleRate sampleRate) { ASIOBool result; CALL_THISCALL_1_DOUBLE( result, that_, 48, sampleRate ); return result; } ASIOError IASIOThiscallResolver::getSampleRate(ASIOSampleRate *sampleRate) { ASIOBool result; CALL_THISCALL_1( result, that_, 52, sampleRate ); return result; } ASIOError IASIOThiscallResolver::setSampleRate(ASIOSampleRate sampleRate) { ASIOBool result; CALL_THISCALL_1_DOUBLE( result, that_, 56, sampleRate ); return result; } ASIOError IASIOThiscallResolver::getClockSources(ASIOClockSource *clocks, long *numSources) { ASIOBool result; CALL_THISCALL_2( result, that_, 60, clocks, numSources ); return result; } ASIOError IASIOThiscallResolver::setClockSource(long reference) { ASIOBool result; CALL_THISCALL_1( result, that_, 64, reference ); return result; } ASIOError IASIOThiscallResolver::getSamplePosition(ASIOSamples *sPos, ASIOTimeStamp *tStamp) { ASIOBool result; CALL_THISCALL_2( result, that_, 68, sPos, tStamp ); return result; } ASIOError IASIOThiscallResolver::getChannelInfo(ASIOChannelInfo *info) { ASIOBool result; CALL_THISCALL_1( result, that_, 72, info ); return result; } ASIOError IASIOThiscallResolver::createBuffers(ASIOBufferInfo *bufferInfos, long numChannels, long bufferSize, ASIOCallbacks *callbacks) { ASIOBool result; CALL_THISCALL_4( result, that_, 76, bufferInfos, numChannels, bufferSize, callbacks ); return result; } ASIOError IASIOThiscallResolver::disposeBuffers() { ASIOBool result; CALL_THISCALL_0( result, that_, 80 ); return result; } ASIOError IASIOThiscallResolver::controlPanel() { ASIOBool result; CALL_THISCALL_0( result, that_, 84 ); return result; } ASIOError IASIOThiscallResolver::future(long selector,void *opt) { ASIOBool result; CALL_THISCALL_2( result, that_, 88, selector, opt ); return result; } ASIOError IASIOThiscallResolver::outputReady() { ASIOBool result; CALL_THISCALL_0( result, that_, 92 ); return result; } // Implement our substitute ASIOInit() method ASIOError IASIOThiscallResolver::ASIOInit(ASIODriverInfo *info) { // To ensure that our instance's vptr is correctly constructed, even if // ASIOInit is called prior to main(), we explicitly call its constructor // (potentially over the top of an existing instance). Note that this is // pretty ugly, and is only safe because IASIOThiscallResolver has no // destructor and contains no objects with destructors. new((void*)&instance) IASIOThiscallResolver( theAsioDriver ); // Interpose between ASIO client code and the real driver. theAsioDriver = &instance; // Note that we never need to switch theAsioDriver back to point to the // real driver because theAsioDriver is reset to zero in ASIOExit(). // Delegate to the real ASIOInit return ::ASIOInit(info); } #endif /* !defined(_MSC_VER) */ #endif /* Win32 */ --- NEW FILE: asiolist.cpp --- #include <windows.h> #include "iasiodrv.h" #include "asiolist.h" #define ASIODRV_DESC "description" #define INPROC_SERVER "InprocServer32" #define ASIO_PATH "software\\asio" #define COM_CLSID "clsid" // ****************************************************************** // Local Functions // ****************************************************************** static LONG findDrvPath (char *clsidstr,char *dllpath,int dllpathsize) { HKEY hkEnum,hksub,hkpath; char databuf[512]; LONG cr,rc = -1; DWORD datatype,datasize; DWORD index; OFSTRUCT ofs; HFILE hfile; BOOL found = FALSE; CharLowerBuff(clsidstr,strlen(clsidstr)); if ((cr = RegOpenKey(HKEY_CLASSES_ROOT,COM_CLSID,&hkEnum)) == ERROR_SUCCESS) { index = 0; while (cr == ERROR_SUCCESS && !found) { cr = RegEnumKey(hkEnum,index++,(LPTSTR)databuf,512); if (cr == ERROR_SUCCESS) { CharLowerBuff(databuf,strlen(databuf)); if (!(strcmp(databuf,clsidstr))) { if ((cr = RegOpenKeyEx(hkEnum,(LPCTSTR)databuf,0,KEY_READ,&hksub)) == ERROR_SUCCESS) { if ((cr = RegOpenKeyEx(hksub,(LPCTSTR)INPROC_SERVER,0,KEY_READ,&hkpath)) == ERROR_SUCCESS) { datatype = REG_SZ; datasize = (DWORD)dllpathsize; cr = RegQueryValueEx(hkpath,0,0,&datatype,(LPBYTE)dllpath,&datasize); if (cr == ERROR_SUCCESS) { memset(&ofs,0,sizeof(OFSTRUCT)); ofs.cBytes = sizeof(OFSTRUCT); hfile = OpenFile(dllpath,&ofs,OF_EXIST); if (hfile) rc = 0; } RegCloseKey(hkpath); } RegCloseKey(hksub); } found = TRUE; // break out } } } RegCloseKey(hkEnum); } return rc; } static LPASIODRVSTRUCT newDrvStruct (HKEY hkey,char *keyname,int drvID,LPASIODRVSTRUCT lpdrv) { HKEY hksub; char databuf[256]; char dllpath[MAXPATHLEN]; WORD wData[100]; CLSID clsid; DWORD datatype,datasize; LONG cr,rc; if (!lpdrv) { if ((cr = RegOpenKeyEx(hkey,(LPCTSTR)keyname,0,KEY_READ,&hksub)) == ERROR_SUCCESS) { datatype = REG_SZ; datasize = 256; cr = RegQueryValueEx(hksub,COM_CLSID,0,&datatype,(LPBYTE)databuf,&datasize); if (cr == ERROR_SUCCESS) { rc = findDrvPath (databuf,dllpath,MAXPATHLEN); if (rc == 0) { lpdrv = new ASIODRVSTRUCT[1]; if (lpdrv) { memset(lpdrv,0,sizeof(ASIODRVSTRUCT)); lpdrv->drvID = drvID; MultiByteToWideChar(CP_ACP,0,(LPCSTR)databuf,-1,(LPWSTR)wData,100); if ((cr = CLSIDFromString((LPOLESTR)wData,(LPCLSID)&clsid)) == S_OK) { memcpy(&lpdrv->clsid,&clsid,sizeof(CLSID)); } datatype = REG_SZ; datasize = 256; cr = RegQueryValueEx(hksub,ASIODRV_DESC,0,&datatype,(LPBYTE)databuf,&datasize); if (cr == ERROR_SUCCESS) { strcpy(lpdrv->drvname,databuf); } else strcpy(lpdrv->drvname,keyname); } } } RegCloseKey(hksub); } } else lpdrv->next = newDrvStruct(hkey,keyname,drvID+1,lpdrv->next); return lpdrv; } static void deleteDrvStruct (LPASIODRVSTRUCT lpdrv) { IASIO *iasio; if (lpdrv != 0) { deleteDrvStruct(lpdrv->next); if (lpdrv->asiodrv) { iasio = (IASIO *)lpdrv->asiodrv; iasio->Release(); } delete lpdrv; } } static LPASIODRVSTRUCT getDrvStruct (int drvID,LPASIODRVSTRUCT lpdrv) { while (lpdrv) { if (lpdrv->drvID == drvID) return lpdrv; lpdrv = lpdrv->next; } return 0; } // ****************************************************************** // ****************************************************************** // AsioDriverList // ****************************************************************** AsioDriverList::AsioDriverList () { HKEY hkEnum = 0; char keyname[MAXDRVNAMELEN]; LPASIODRVSTRUCT pdl; LONG cr; DWORD index = 0; BOOL fin = FALSE; numdrv = 0; lpdrvlist = 0; cr = RegOpenKey(HKEY_LOCAL_MACHINE,ASIO_PATH,&hkEnum); while (cr == ERROR_SUCCESS) { if ((cr = RegEnumKey(hkEnum,index++,(LPTSTR)keyname,MAXDRVNAMELEN))== ERROR_SUCCESS) { lpdrvlist = newDrvStruct (hkEnum,keyname,0,lpdrvlist); } else fin = TRUE; } if (hkEnum) RegCloseKey(hkEnum); pdl = lpdrvlist; while (pdl) { numdrv++; pdl = pdl->next; } if (numdrv) CoInitialize(0); // initialize COM } AsioDriverList::~AsioDriverList () { if (numdrv) { deleteDrvStruct(lpdrvlist); CoUninitialize(); } } LONG AsioDriverList::asioGetNumDev (VOID) { return (LONG)numdrv; } LONG AsioDriverList::asioOpenDriver (int drvID,LPVOID *asiodrv) { LPASIODRVSTRUCT lpdrv = 0; long rc; if (!asiodrv) return DRVERR_INVALID_PARAM; if ((lpdrv = getDrvStruct(drvID,lpdrvlist)) != 0) { if (!lpdrv->asiodrv) { rc = CoCreateInstance(lpdrv->clsid,0,CLSCTX_INPROC_SERVER,lpdrv->clsid,asiodrv); if (rc == S_OK) { lpdrv->asiodrv = *asiodrv; return 0; } // else if (rc == REGDB_E_CLASSNOTREG) // strcpy (info->messageText, "Driver not registered in the Registration Database!"); } else rc = DRVERR_DEVICE_ALREADY_OPEN; } else rc = DRVERR_DEVICE_NOT_FOUND; return rc; } LONG AsioDriverList::asioCloseDriver (int drvID) { LPASIODRVSTRUCT lpdrv = 0; IASIO *iasio; if ((lpdrv = getDrvStruct(drvID,lpdrvlist)) != 0) { if (lpdrv->asiodrv) { iasio = (IASIO *)lpdrv->asiodrv; iasio->Release(); lpdrv->asiodrv = 0; } } return 0; } LONG AsioDriverList::asioGetDriverName (int drvID,char *drvname,int drvnamesize) { LPASIODRVSTRUCT lpdrv = 0; if (!drvname) return DRVERR_INVALID_PARAM; if ((lpdrv = getDrvStruct(drvID,lpdrvlist)) != 0) { if (strlen(lpdrv->drvname) < (unsigned int)drvnamesize) { strcpy(drvname,lpdrv->drvname); } else { memcpy(drvname,lpdrv->drvname,drvnamesize-4); drvname[drvnamesize-4] = '.'; drvname[drvnamesize-3] = '.'; drvname[drvnamesize-2] = '.'; drvname[drvnamesize-1] = 0; } return 0; } return DRVERR_DEVICE_NOT_FOUND; } LONG AsioDriverList::asioGetDriverPath (int drvID,char *dllpath,int dllpathsize) { LPASIODRVSTRUCT lpdrv = 0; if (!dllpath) return DRVERR_INVALID_PARAM; if ((lpdrv = getDrvStruct(drvID,lpdrvlist)) != 0) { if (strlen(lpdrv->dllpath) < (unsigned int)dllpathsize) { strcpy(dllpath,lpdrv->dllpath); return 0; } dllpath[0] = 0; return DRVERR_INVALID_PARAM; } return DRVERR_DEVICE_NOT_FOUND; } LONG AsioDriverList::asioGetDriverCLSID (int drvID,CLSID *clsid) { LPASIODRVSTRUCT lpdrv = 0; if (!clsid) return DRVERR_INVALID_PARAM; if ((lpdrv = getDrvStruct(drvID,lpdrvlist)) != 0) { memcpy(clsid,&lpdrv->clsid,sizeof(CLSID)); return 0; } return DRVERR_DEVICE_NOT_FOUND; } --- NEW FILE: combase.cpp --- //==========================================================================; // // THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY // KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE // IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR // PURPOSE. // // Copyright (c) 1992 - 1996 Microsoft Corporation. All Rights Reserved. // //--------------------------------------------------------------------------; // Base class hierachy for creating COM objects, December 1994 #include <windows.h> #include "wxdebug.h" #include "combase.h" #pragma warning( disable : 4514 ) // Disable warnings re unused inline functions /* Define the static member variable */ LONG CBaseObject::m_cObjects = 0; /* Constructor */ CBaseObject::CBaseObject(TCHAR *pName) { /* Increment the number of active objects */ InterlockedIncrement(&m_cObjects); #ifdef DEBUG m_dwCookie = DbgRegisterObjectCreation(pName); #endif } /* Destructor */ CBaseObject::~CBaseObject() { /* Decrement the number of objects active */ InterlockedDecrement(&m_cObjects); #ifdef DEBUG DbgRegisterObjectDestruction(m_dwCookie); #endif } /* Constructor */ // We know we use "this" in the initialization list, we also know we don't modify *phr. #pragma warning( disable : 4355 4100 ) CUnknown::CUnknown(TCHAR *pName, LPUNKNOWN pUnk, HRESULT *phr) : CBaseObject(pName) /* Start the object with a reference count of zero - when the */ /* object is queried for it's first interface this may be */ /* incremented depending on whether or not this object is */ /* currently being aggregated upon */ , m_cRef(0) /* Set our pointer to our IUnknown interface. */ /* If we have an outer, use its, otherwise use ours. */ /* This pointer effectivly points to the owner of */ /* this object and can be accessed by the GetOwner() method. */ , m_pUnknown( pUnk != 0 ? pUnk : reinterpret_cast<LPUNKNOWN>( static_cast<PNDUNKNOWN>(this) ) ) /* Why the double cast? Well, the inner cast is a type-safe cast */ /* to pointer to a type from which we inherit. The second is */ /* type-unsafe but works because INonDelegatingUnknown "behaves */ /* like" IUnknown. (Only the names on the methods change.) */ { // Everything we need to do has been done in the initializer list } #pragma warning( default : 4355 4100 ) /* QueryInterface */ STDMETHODIMP CUnknown::NonDelegatingQueryInterface(REFIID riid, void ** ppv) { CheckPointer(ppv,E_POINTER); ValidateReadWritePtr(ppv,sizeof(PVOID)); /* We know only about IUnknown */ if (riid == IID_IUnknown) { GetInterface((LPUNKNOWN) (PNDUNKNOWN) this, ppv); return NOERROR; } else { *ppv = NULL; return E_NOINTERFACE; } } /* We have to ensure that we DON'T use a max macro, since these will typically */ /* lead to one of the parameters being evaluated twice. Since we are worried */ /* about concurrency, we can't afford to access the m_cRef twice since we can't */ /* afford to run the risk that its value having changed between accesses. */ #ifdef max #undef max #endif template<class T> inline static T max( const T & a, const T & b ) { return a > b ? a : b; } /* AddRef */ STDMETHODIMP_(ULONG) CUnknown::NonDelegatingAddRef() { LONG lRef = InterlockedIncrement( &m_cRef ); ASSERT(lRef > 0); DbgLog((LOG_MEMORY,3,TEXT(" Obj %d ref++ = %d"), m_dwCookie, m_cRef)); return max(ULONG(m_cRef), 1ul); } /* Release */ STDMETHODIMP_(ULONG) CUnknown::NonDelegatingRelease() { /* If the reference count drops to zero delete ourselves */ LONG lRef = InterlockedDecrement( &m_cRef ); ASSERT(lRef >= 0); DbgLog((LOG_MEMORY,3,TEXT(" Object %d ref-- = %d"), m_dwCookie, m_cRef)); if (lRef == 0) { // COM rules say we must protect against re-entrancy. // If we are an aggregator and we hold our own interfaces // on the aggregatee, the QI for these interfaces will // addref ourselves. So after doing the QI we must release // a ref count on ourselves. Then, before releasing the // private interface, we must addref ourselves. When we do // this from the destructor here it will result in the ref // count going to 1 and then back to 0 causing us to // re-enter the destructor. Hence we add an extra refcount here // once we know we will delete the object. // for an example aggregator see filgraph\distrib.cpp. m_cRef++; delete this; return ULONG(0); } else { return max(ULONG(m_cRef), 1ul); } } /* Return an interface pointer to a requesting client performing a thread safe AddRef as necessary */ HRESULT CUnknown::GetInterface(LPUNKNOWN pUnk, void **ppv) { CheckPointer(ppv, E_POINTER); *ppv = pUnk; pUnk->AddRef(); return NOERROR; } /* Compares two interfaces and returns TRUE if they are on the same object */ BOOL IsEqualObject(IUnknown *pFirst, IUnknown *pSecond) { /* Different objects can't have the same interface pointer for any interface */ if (pFirst == pSecond) { return TRUE; } /* OK - do it the hard way - check if they have the same IUnknown pointers - a single object can only have one of these */ LPUNKNOWN pUnknown1; // Retrieve the IUnknown interface LPUNKNOWN pUnknown2; // Retrieve the other IUnknown interface HRESULT hr; // General OLE return code ASSERT(pFirst); ASSERT(pSecond); /* See if the IUnknown pointers match */ hr = pFirst->QueryInterface(IID_IUnknown,(void **) &pUnknown1); ASSERT(SUCCEEDED(hr)); ASSERT(pUnknown1); hr = pSecond->QueryInterface(IID_IUnknown,(void **) &pUnknown2); ASSERT(SUCCEEDED(hr)); ASSERT(pUnknown2); /* Release the extra interfaces we hold */ pUnknown1->Release(); pUnknown2->Release(); return (pUnknown1 == pUnknown2); } --- NEW FILE: asiodrivers.cpp --- #include <string.h> #include "asiodrivers.h" AsioDrivers* asioDrivers = 0; bool loadAsioDriver(char *name); bool loadAsioDriver(char *name) { if(!asioDrivers) asioDrivers = new AsioDrivers(); if(asioDrivers) return asioDrivers->loadDriver(name); return false; } //------------------------------------------------------------------------------------ #if MAC bool resolveASIO(unsigned long aconnID); AsioDrivers::AsioDrivers() : CodeFragments("ASIO Drivers", 'AsDr', 'Asio') { connID = -1; curIndex = -1; } AsioDrivers::~AsioDrivers() { removeCurrentDriver(); } bool AsioDrivers::getCurrentDriverName(char *name) { if(curIndex >= 0) return getName(curIndex, name); return false; } long AsioDrivers::getDriverNames(char **names, long maxDrivers) { for(long i = 0; i < getNumFragments() && i < maxDrivers; i++) getName(i, names[i]); return getNumFragments() < maxDrivers ? getNumFragments() : maxDrivers; } bool AsioDrivers::loadDriver(char *name) { char dname[64]; unsigned long newID; for(long i = 0; i < getNumFragments(); i++) { if(getName(i, dname) && !strcmp(name, dname)) { if(newInstance(i, &newID)) { if(resolveASIO(newID)) { if(connID != -1) removeInstance(curIndex, connID); curIndex = i; connID = newID; return true; } } break; } } return false; } void AsioDrivers::removeCurrentDriver() { if(connID != -1) removeInstance(curIndex, connID); connID = -1; curIndex = -1; } //------------------------------------------------------------------------------------ #elif WINDOWS #include "iasiodrv.h" extern IASIO* theAsioDriver; AsioDrivers::AsioDrivers() : AsioDriverList() { curIndex = -1; } AsioDrivers::~AsioDrivers() { } bool AsioDrivers::getCurrentDriverName(char *name) { if(curIndex >= 0) return asioGetDriverName(curIndex, name, 32) == 0 ? true : false; name[0] = 0; return false; } long AsioDrivers::getDriverNames(char **names, long maxDrivers) { for(long i = 0; i < asioGetNumDev() && i < maxDrivers; i++) asioGetDriverName(i, names[i], 32); return asioGetNumDev() < maxDrivers ? asioGetNumDev() : maxDrivers; } bool AsioDrivers::loadDriver(char *name) { char dname[64]; char curName[64]; for(long i = 0; i < asioGetNumDev(); i++) { if(!asioGetDriverName(i, dname, 32) && !strcmp(name, dname)) { curName[0] = 0; getCurrentDriverName(curName); // in case we fail... removeCurrentDriver(); if(!asioOpenDriver(i, (void **)&theAsioDriver)) { curIndex = i; return true; } else { theAsioDriver = 0; if(curName[0] && strcmp(dname, curName)) loadDriver(curName); // try restore } break; } } return false; } void AsioDrivers::removeCurrentDriver() { if(curIndex != -1) asioCloseDriver(curIndex); curIndex = -1; } #elif SGI || BEOS #include "asiolist.h" AsioDrivers::AsioDrivers() : AsioDriverList() { curIndex = -1; } AsioDrivers::~AsioDrivers() { } bool AsioDrivers::getCurrentDriverName(char *name) { return false; } long AsioDrivers::getDriverNames(char **names, long maxDrivers) { return 0; } bool AsioDrivers::loadDriver(char *name) { return false; } void AsioDrivers::removeCurrentDriver() { } #else #error implement me #endif --- NEW FILE: asioshlib.cpp --- // asio code fragment 'linker' // mac specific // loads the symbols via the fragment manager, and // translates them into function pointers. this // means no asio lib must be linked, as the // 'real' asio functions are here #include "ginclude.h" #include <macheaders.c> #include <string.h> #include <CodeFragments.h> #include "asio.h" // Macro below has to 0 if external drivers will be used. // Can be set to 1 if a specific ASIO driver should be linked into the program #define ASIOINCLUDED 0 // export bool resolveASIO(unsigned long aconnID); //------------------------------------------------------------------------------------------------------ // private #if ASIOINCLUDED bool resolveASIO(unsigned long aconnID) {aconnID = aconnID; return true;} #else enum { kASIOInit = 0, kASIOExit, kASIOStart, kASIOStop, kASIOGetChannels, kASIOGetLatencies, kASIOGetBufferSize, kASIOCanSampleRate, kASIOGetSampleRate, kASIOSetSampleRate, kASIOGetClockSources, kASIOSetClockSource, kASIOGetSamplePosition, kASIOGetChannelInfo, kASIOCreateBuffers, kASIODisposeBuffers, kASIOControlPanel, kASIOFuture, kASIOOutputReady, kNumSymbols, kRequiredSymbols = kNumSymbols - 1 }; static char *asioTable[kNumSymbols] = { "ASIOInit", "ASIOExit", "ASIOStart", "ASIOStop", "ASIOGetChannels", "ASIOGetLatencies", "ASIOGetBufferSize", "ASIOCanSampleRate", "ASIOGetSampleRate", "ASIOSetSampleRate", "ASIOGetClockSources", "ASIOSetClockSource", "ASIOGetSamplePosition", "ASIOGetChannelInfo", "ASIOCreateBuffers", "ASIODisposeBuffers", "ASIOControlPanel", "ASIOFuture", "ASIOOutputReady" }; typedef ASIOError (*fasioInit) (ASIODriverInfo *info); typedef ASIOError (*fasioExit) (void); typedef ASIOError (*fasioStart) (void); typedef ASIOError (*fasioStop) (void); typedef ASIOError (*asioGetChannels) (long *numInputChannels, long *numOutputChannels); typedef ASIOError (*asioGetLatencies) (long *inputLatency, long *outputLatency); typedef ASIOError (*asioGetBufferSize) (long *minSize, long *maxSize, long *preferredSize, long *granularity); typedef ASIOError (*asioCanSampleRate) (ASIOSampleRate sampleRate); typedef ASIOError (*asioGetSampleRate) (ASIOSampleRate *currentRate); typedef ASIOError (*asioSetSampleRate) (ASIOSampleRate sampleRate); typedef ASIOError (*asioGetClockSources) (ASIOClockSource *clocks, long *numSources); typedef ASIOError (*asioSetClockSource) (long reference); typedef ASIOError (*asioGetSamplePosition) (ASIOSamples *sPos, ASIOTimeStamp *tStamp); typedef ASIOError (*asioGetChannelInfo) (ASIOChannelInfo *info); typedef ASIOError (*asioCreateBuffers) (ASIOBufferInfo *channelInfos, long numChannels, long bufferSize, ASIOCallbacks *callbacks); typedef ASIOError (*asioDisposeBuffers) (void); typedef ASIOError (*asioControlPanel) (void); typedef ASIOError (*asioFuture)(long selector, void *opt); typedef ASIOError (*asioOutputReady) (void); static void *functionTable[kNumSymbols] = {0}; static bool inited = false; //--------------------------------------------------------------------------------------------------------- #include <CodeFragments.h> bool resolveASIO(unsigned long aconnID) { OSErr err; CFragConnectionID connID = (CFragConnectionID)aconnID; CFragSymbolClass symClass; Ptr symAddr = nil; Str255 myName; long myCount = 0; err = CountSymbols(connID, &myCount); if(err != noErr || myCount < (kRequiredSymbols + 1)) // there must be a main() return false; long n, c = 0; for(n = kRequiredSymbols; n < kNumSymbols; n++) functionTable[n] = 0; for(n = 0; n < myCount; n++) { // we can't use FindSymbol(), as the compiler adds mangling // (such as ASIOInit__Fv). also, the symbols don't appear // in the order they are declared or implemented. // so we use strncmp() err = GetIndSymbol(connID, n, myName, &symAddr, &symClass); if(err != noErr) break; PtoCstr(myName); if(!strncmp((char *)myName, "main", 4L)) c++; else { for(long i = 0; i < kNumSymbols; i++) { long sc = strlen(asioTable[i]); if(!strncmp((char *)myName, asioTable[i], sc)) { functionTable[i] = symAddr; if(i < kRequiredSymbols) c++; break; } } } // if(c >= kNumSymbols + 1) // break; } if(c >= kRequiredSymbols + 1) { inited = true; return true; } return false; } //--------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------- #pragma export on static short curRes = 0; #define saveRes() curRes = CurResFile() #define restRes() UseResFile(curRes); ASIOError ASIOInit(ASIODriverInfo *info) { saveRes(); strcpy(info->errorMessage, "No ASIO Driver could be Loaded!"); if(!inited) return ASE_NotPresent; fasioInit f = (fasioInit)functionTable[kASIOInit]; ASIOError e = (*f)(info); restRes(); return e; } ASIOError ASIOExit(void) { if(!inited) return ASE_NotPresent; saveRes(); fasioExit f = (fasioExit)functionTable[kASIOExit]; ASIOError e = (*f)(); restRes(); return e; } ASIOError ASIOStart(void) { if(!inited) return ASE_NotPresent; fasioStart f = (fasioStart)functionTable[kASIOStart]; return (*f)(); } ASIOError ASIOStop(void) { if(!inited) return ASE_NotPresent; fasioStop f = (fasioStop)functionTable[kASIOStop]; return (*f)(); } ASIOError ASIOGetChannels(long *numInputChannels, long *numOutputChannels) { if(!inited) return ASE_NotPresent; asioGetChannels f = (asioGetChannels)functionTable[kASIOGetChannels]; return (*f)(numInputChannels, numOutputChannels); } ASIOError ASIOGetLatencies(long *inputLatency, long *outputLatency) { if(!inited) return ASE_NotPresent; asioGetLatencies f = (asioGetLatencies)functionTable[kASIOGetLatencies]; return (*f)(inputLatency, outputLatency); } ASIOError ASIOGetBufferSize(long *minSize, long *maxSize, long *preferredSize, long *granularity) { if(!inited) return ASE_NotPresent; asioGetBufferSize f = (asioGetBufferSize)functionTable[kASIOGetBufferSize]; return (*f)(minSize, maxSize, preferredSize, granularity); } ASIOError ASIOCanSampleRate(ASIOSampleRate sampleRate) { if(!inited) return ASE_NotPresent; asioCanSampleRate f = (asioCanSampleRate)functionTable[kASIOCanSampleRate]; return (*f)(sampleRate); } ASIOError ASIOGetSampleRate(ASIOSampleRate *currentRate) { if(!inited) return ASE_NotPresent; asioGetSampleRate f = (asioGetSampleRate)functionTable[kASIOGetSampleRate]; return (*f)(currentRate); } ASIOError ASIOSetSampleRate(ASIOSampleRate sampleRate) { if(!inited) return ASE_NotPresent; asioSetSampleRate f = (asioSetSampleRate)functionTable[kASIOSetSampleRate]; return (*f)(sampleRate); } ASIOError ASIOGetClockSources(ASIOClockSource *clocks, long *numSources) { if(!inited) return ASE_NotPresent; asioGetClockSources f = (asioGetClockSources)functionTable[kASIOGetClockSources]; return (*f)(clocks, numSources); } ASIOError ASIOSetClockSource(long reference) { if(!inited) return ASE_NotPresent; asioSetClockSource f = (asioSetClockSource)functionTable[kASIOSetClockSource]; return (*f)(reference); } ASIOError ASIOGetSamplePosition(ASIOSamples *sPos, ASIOTimeStamp *tStamp) { if(!inited) return ASE_NotPresent; asioGetSamplePosition f = (asioGetSamplePosition)functionTable[kASIOGetSamplePosition]; return (*f)(sPos, tStamp); } ASIOError ASIOGetChannelInfo(ASIOChannelInfo *info) { if(!inited) return ASE_NotPresent; asioGetChannelInfo f = (asioGetChannelInfo)functionTable[kASIOGetChannelInfo]; return (*f)(info); } ASIOError ASIOCreateBuffers(ASIOBufferInfo *channelInfos, long numChannels, long bufferSize, ASIOCallbacks *callbacks) { if(!inited) return ASE_NotPresent; saveRes(); asioCreateBuffers f = (asioCreateBuffers)functionTable[kASIOCreateBuffers]; ASIOError e = (*f)(channelInfos, numChannels, bufferSize, callbacks); restRes(); return e; } ASIOError ASIODisposeBuffers(void) { if(!inited) return ASE_NotPresent; asioDisposeBuffers f = (asioDisposeBuffers)functionTable[kASIODisposeBuffers]; return (*f)(); } ASIOError ASIOControlPanel(void) { if(!inited) return ASE_NotPresent; saveRes(); asioControlPanel f = (asioControlPanel)functionTable[kASIOControlPanel]; ASIOError e = (*f)(); restRes(); return e; } ASIOError ASIOFuture(long selector, void *opt) { if(!inited) return 0; saveRes(); asioFuture f = (asioFuture)functionTable[kASIOFuture]; ASIOError e = (*f)(selector, opt); restRes(); return e; } ASIOError ASIOOutputReady(void) { asioOutputReady f = (asioControlPanel)functionTable[kASIOOutputReady]; if(!inited || !f) return ASE_NotPresent; return (*f)(); } #pragma export off #endif // ASIOINCLUDED --- Pa_ASIO.pdf DELETED --- Index: pa_asio.cpp =================================================================== RCS file: /cvsroot/pure-data/pd/portaudio/pa_asio/Attic/pa_asio.cpp,v retrieving revision 1.1.1.2.2.2 retrieving revision 1.1.1.2.2.2.2.1 diff -C2 -d -r1.1.1.2.2.2 -r1.1.1.2.2.2.2.1 *** pa_asio.cpp 13 Sep 2003 09:03:07 -0000 1.1.1.2.2.2 --- pa_asio.cpp 24 Aug 2004 04:12:57 -0000 1.1.1.2.2.2.2.1 *************** *** 86,90 **** #include "asio.h" #include "asiodrivers.h" ! #if MAC --- 86,90 ---- #include "asio.h" #include "asiodrivers.h" ! #include "iasiothiscallresolver.h" #if MAC --- NEW FILE: wxdebug.h --- //==========================================================================; // // THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY // KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE // IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR // PURPOSE. // // Copyright (c) 1992 - 1996 Microsoft Corporation. All Rights Reserved. // //--------------------------------------------------------------------------; // Debugging facilities, January 1995 #ifndef __WXDEBUG__ #define __WXDEBUG__ // Avoid conflict with MFC #undef ASSERT // This library provides fairly straight forward debugging functionality, this // is split into two main sections. The first is assertion handling, there are // three types of assertions provided here. The most commonly used one is the // ASSERT(condition) macro which will pop up a message box including the file // and line number if the condition evaluates to FALSE. Then there is the // EXECUTE_ASSERT macro which is the same as ASSERT except the condition will // still be executed in NON debug builds. The final type of assertion is the // KASSERT macro which is more suitable for pure (perhaps kernel) filters as // the condition is printed onto the debugger rather than in a message box. // // The other part of the debug module facilties is general purpose logging. // This is accessed by calling DbgLog(). The function takes a type and level // field which define the type of informational string you are presenting and // it's relative importance. The type field can be a combination (one or more) // of LOG_TIMING, LOG_TRACE, LOG_MEMORY, LOG_LOCKING and LOG_ERROR. The level // is a DWORD value where zero defines highest important. Use of zero as the // debug logging level is to be encouraged ONLY for major errors or events as // they will ALWAYS be displayed on the debugger. Other debug output has it's // level matched against the current debug output level stored in the registry // for this module and if less than the current setting it will be displayed. // // Each module or executable has it's own debug output level for each of the // five types. These are read in when the DbgInitialise function is called // for DLLs linking to STRMBASE.LIB this is done automatically when the DLL // is loaded, executables must call it explicitely with the module instance // handle given to them through the WINMAIN entry point. An executable must // also call DbgTerminate when they have finished to clean up the resources // the debug library uses, once again this is done automatically for DLLs // These are the five different categories of logging information enum { LOG_TIMING = 0x01, // Timing and performance measurements LOG_TRACE = 0x02, // General step point call tracing LOG_MEMORY = 0x04, // Memory and object allocation/destruction LOG_LOCKING = 0x08, // Locking/unlocking of critical sections LOG_ERROR = 0x10 }; // Debug error notification enum { CDISP_HEX = 0x01, CDISP_DEC = 0x02}; // For each object created derived from CBaseObject (in debug builds) we // create a descriptor that holds it's name (statically allocated memory) // and a cookie we assign it. We keep a list of all the active objects // we have registered so that we can dump a list of remaining objects typedef struct tag_ObjectDesc { TCHAR *m_pName; DWORD m_dwCookie; tag_ObjectDesc *m_pNext; } ObjectDesc; #define DLLIMPORT __declspec(dllimport) #define DLLEXPORT __declspec(dllexport) #ifdef DEBUG #define NAME(x) TEXT(x) // These are used internally by the debug library (PRIVATE) void DbgInitKeyLevels(HKEY hKey); void DbgInitGlobalSettings(); void DbgInitModuleSettings(); void DbgInitModuleName(); DWORD DbgRegisterObjectCreation(TCHAR *pObjectName); BOOL DbgRegisterObjectDestruction(DWORD dwCookie); // These are the PUBLIC entry points BOOL DbgCheckModuleLevel(DWORD Type,DWORD Level); void DbgSetModuleLevel(DWORD Type,DWORD Level); // Initialise the library with the module handle void DbgInitialise(HINSTANCE hInst); void DbgTerminate(); void DbgDumpObjectRegister(); // Display error and logging to the user void DbgAssert(const TCHAR *pCondition,const TCHAR *pFileName,INT iLine); void DbgBreakPoint(const TCHAR *pCondition,const TCHAR *pFileName,INT iLine); void DbgKernelAssert(const TCHAR *pCondition,const TCHAR *pFileName,INT iLine); void DbgLogInfo(DWORD Type,DWORD Level,const TCHAR *pFormat,...); void DbgOutString(LPCTSTR psz); // Debug infinite wait stuff DWORD DbgWaitForSingleObject(HANDLE h); DWORD DbgWaitForMultipleObjects(DWORD nCount, CONST HANDLE *lpHandles, BOOL bWaitAll); void DbgSetWaitTimeout(DWORD dwTimeout); #ifdef __strmif_h__ void DisplayType(LPSTR label, const AM_MEDIA_TYPE *pmtIn); #endif #define KASSERT(_x_) if (!(_x_)) \ DbgKernelAssert(TEXT(#_x_),TEXT(__FILE__),__LINE__) // Break on the debugger without putting up a message box // message goes to debugger instead #define KDbgBreak(_x_) \ DbgKernelAssert(TEXT(#_x_),TEXT(__FILE__),__LINE__) #define ASSERT(_x_) if (!(_x_)) \ DbgAssert(TEXT(#_x_),TEXT(__FILE__),__LINE__) // Put up a message box informing the user of a halt // condition in the program #define DbgBreak(_x_) \ DbgBreakPoint(TEXT(#_x_),TEXT(__FILE__),__LINE__) #define EXECUTE_ASSERT(_x_) ASSERT(_x_) #define DbgLog(_x_) DbgLogInfo _x_ // MFC style trace macros #define NOTE(_x_) DbgLog((LOG_TRACE,5,TEXT(_x_))); #define NOTE1(_x_,a) DbgLog((LOG_TRACE,5,TEXT(_x_),a)); #define NOTE2(_x_,a,b) DbgLog((LOG_TRACE,5,TEXT(_x_),a,b)); #define NOTE3(_x_,a,b,c) DbgLog((LOG_TRACE,5,TEXT(_x_),a,b,c)); #define NOTE4(_x_,a,b,c,d) DbgLog((LOG_TRACE,5,TEXT(_x_),a,b,c,d)); #define NOTE5(_x_,a,b,c,d,e) DbgLog((LOG_TRACE,5,TEXT(_x_),a,b,c,d,e)); #else // Retail builds make public debug functions inert - WARNING the source // files do not define or build any of the entry points in debug builds // (public entry points compile to nothing) so if you go trying to call // any of the private entry points in your source they won't compile #define NAME(_x_) NULL #define DbgInitialise(hInst) #define DbgTerminate() #define DbgLog(_x_) #define DbgOutString(psz) #define DbgRegisterObjectCreation(pObjectName) #define DbgRegisterObjectDestruction(dwCookie) #define DbgDumpObjectRegister() #define DbgCheckModuleLevel(Type,Level) #define DbgSetModuleLevel(Type,Level) #define DbgWaitForSingleObject(h) WaitForSingleObject(h, INFINITE) #define DbgWaitForMultipleObjects(nCount, lpHandles, bWaitAll) \ WaitForMultipleObjects(nCount, lpHandles, bWaitAll, INFINITE) #define DbgSetWaitTimeout(dwTimeout) #define KDbgBreak(_x_) #define DbgBreak(_x_) #define KASSERT(_x_) #define ASSERT(_x_) #define EXECUTE_ASSERT(_x_) _x_ // MFC style trace macros #define NOTE(_x_) #define NOTE1(_x_,a) #define NOTE2(_x_,a,b) #define NOTE3(_x_,a,b,c) #define NOTE4(_x_,a,b,c,d) #define NOTE5(_x_,a,b,c,d,e) #define DisplayType(label, pmtIn) #endif // Checks a pointer which should be non NULL - can be used as follows. #define CheckPointer(p,ret) {if((p)==NULL) return (ret);} // HRESULT Foo(VOID *pBar) // { // CheckPointer(pBar,E_INVALIDARG) // } // // Or if the function returns a boolean // // BOOL Foo(VOID *pBar) // { // CheckPointer(pBar,FALSE) // } // These validate pointers when symbol VFWROBUST is defined // This will normally be defined in debug not retail builds #ifdef DEBUG #define VFWROBUST #endif #ifdef VFWROBUST #define ValidateReadPtr(p,cb) \ {if(IsBadReadPtr((PVOID)p,cb) == TRUE) \ DbgBreak("Invalid read pointer");} #define ValidateWritePtr(p,cb) \ {if(IsBadWritePtr((PVOID)p,cb) == TRUE) \ DbgBreak("Invalid write pointer");} #define ValidateReadWritePtr(p,cb) \ {ValidateReadPtr(p,cb) ValidateWritePtr(p,cb)} #define ValidateStringPtr(p) \ {if(IsBadStringPtr((LPCTSTR)p,INFINITE) == TRUE) \ DbgBreak("Invalid string pointer");} #define ValidateStringPtrA(p) \ {if(IsBadStringPtrA((LPCSTR)p,INFINITE) == TRUE) \ DbgBreak("Invalid ANSII string pointer");} #define ValidateStringPtrW(p) \ {if(IsBadStringPtrW((LPCWSTR)p,INFINITE) == TRUE) \ DbgBreak("Invalid UNICODE string pointer");} #else #define ValidateReadPtr(p,cb) #define ValidateWritePtr(p,cb) #define ValidateReadWritePtr(p,cb) #define ValidateStringPtr(p) #define ValidateStringPtrA(p) #define ValidateStringPtrW(p) #endif #ifdef _OBJBASE_H_ // Outputting GUID names. If you want to include the name // associated with a GUID (eg CLSID_...) then // // GuidNames[yourGUID] // // Returns the name defined in uuids.h as a string typedef struct { TCHAR *szName; GUID guid; } GUID_STRING_ENTRY; class CGuidNameList { public: TCHAR *operator [] (const GUID& guid); }; extern CGuidNameList GuidNames; #endif // REMIND macro - generates warning as reminder to complete coding // (eg) usage: // // #pragma message (REMIND("Add automation support")) #define QUOTE(x) #x #define QQUOTE(y) QUOTE(y) #define REMIND(str) __FILE__ "(" QQUOTE(__LINE__) ") : " str // Hack to display objects in a useful format // // eg If you want to display a LONGLONG ll in a debug string do (eg) // // DbgLog((LOG_TRACE, n, TEXT("Value is %s"), (LPCTSTR)CDisp(ll, CDISP_HEX))); class CDispBasic { public: CDispBasic() { m_pString = m_String; }; ~CDispBasic(); protected: PTCHAR m_pString; // normally points to m_String... unless too much data TCHAR m_String[50]; }; class CDisp : public CDispBasic { public: CDisp(LONGLONG ll, int Format = CDISP_HEX); // Display a LONGLONG in CDISP_HEX or CDISP_DEC form CDisp(REFCLSID clsid); // Display a GUID CDisp(double d); // Display a floating point number #ifdef __strmif_h__ #ifdef __STREAMS__ CDisp(CRefTime t); // Display a Reference Time #endif CDisp(IPin *pPin); // Display a pin as {filter clsid}(pin name) #endif // __strmif_h__ ~CDisp(); // Implement cast to (LPCTSTR) as parameter to logger operator LPCTSTR() { return (LPCTSTR)m_pString; }; }; #endif // __WXDEBUG__ Index: ginclude.h =================================================================== RCS file: /cvsroot/pure-data/pd/portaudio/pa_asio/Attic/ginclude.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** ginclude.h 7 Jun 2004 17:16:22 -0000 1.1.2.1 --- ginclude.h 24 Aug 2004 04:12:57 -0000 1.1.2.2 *************** *** 1,38 **** ! #ifndef __gInclude__ ! #define __gInclude__ ! ! #if SGI ! #undef BEOS ! #undef MAC ! #undef WINDOWS ! // ! #define ASIO_BIG_ENDIAN 1 ! #define ASIO_CPU_MIPS 1 ! #elif defined WIN32 ! #undef BEOS ! #undef MAC ! #undef SGI ! #define WINDOWS 1 ! #define ASIO_LITTLE_ENDIAN 1 ! #define ASIO_CPU_X86 1 ! #elif BEOS ! #undef MAC ! #undef SGI ! #undef WINDOWS ! #define ASIO_LITTLE_ENDIAN 1 ! #define ASIO_CPU_X86 1 ! // ! #else ! #define MAC 1 ! #undef BEOS ! #undef WINDOWS ! #undef SGI ! #define ASIO_BIG_ENDIAN 1 ! #define ASIO_CPU_PPC 1 ! #endif ! ! // always ! #define NATIVE_INT64 0 ! #define IEEE754_64FLOAT 1 ! ! #endif // __gInclude__ --- 1,38 ---- ! #ifndef __gInclude__ ! #define __gInclude__ ! ! #if SGI ! #undef BEOS ! #undef MAC ! #undef WINDOWS ! // ! #define ASIO_BIG_ENDIAN 1 ! #define ASIO_CPU_MIPS 1 ! #elif defined WIN32 ! #undef BEOS ! #undef MAC ! #undef SGI ! #define WINDOWS 1 ! #define ASIO_LITTLE_ENDIAN 1 ! #define ASIO_CPU_X86 1 ! #elif BEOS ! #undef MAC ! #undef SGI ! #undef WINDOWS ! #define ASIO_LITTLE_ENDIAN 1 ! #define ASIO_CPU_X86 1 ! // ! #else ! #define MAC 1 ! #undef BEOS ! #undef WINDOWS ! #undef SGI ! #define ASIO_BIG_ENDIAN 1 ! #define ASIO_CPU_PPC 1 ! #endif ! ! // always ! #define NATIVE_INT64 0 ! #define IEEE754_64FLOAT 1 ! ! #endif // __gInclude__ --- NEW FILE: iasiodrv.h --- #include "asiosys.h" #include "asio.h" /* Forward Declarations */ #ifndef __ASIODRIVER_FWD_DEFINED__ #define __ASIODRIVER_FWD_DEFINED__ typedef interface IASIO IASIO; #endif /* __ASIODRIVER_FWD_DEFINED__ */ interface IASIO : public IUnknown { virtual ASIOBool init(void *sysHandle) = 0; virtual void getDriverName(char *name) = 0; virtual long getDriverVersion() = 0; virtual void getErrorMessage(char *string) = 0; virtual ASIOError start() = 0; virtual ASIOError stop() = 0; virtual ASIOError getChannels(long *numInputChannels, long *numOutputChannels) = 0; virtual ASIOError getLatencies(long *inputLatency, long *outputLatency) = 0; virtual ASIOError getBufferSize(long *minSize, long *maxSize, long *preferredSize, long *granularity) = 0; virtual ASIOError canSampleRate(ASIOSampleRate sampleRate) = 0; virtual ASIOError getSampleRate(ASIOSampleRate *sampleRate) = 0; virtual ASIOError setSampleRate(ASIOSampleRate sampleRate) = 0; virtual ASIOError getClockSources(ASIOClockSource *clocks, long *numSources) = 0; virtual ASIOError setClockSource(long reference) = 0; virtual ASIOError getSamplePosition(ASIOSamples *sPos, ASIOTimeStamp *tStamp) = 0; virtual ASIOError getChannelInfo(ASIOChannelInfo *info) = 0; virtual ASIOError createBuffers(ASIOBufferInfo *bufferInfos, long numChannels, long bufferSize, ASIOCallbacks *callbacks) = 0; virtual ASIOError disposeBuffers() = 0; virtual ASIOError controlPanel() = 0; virtual ASIOError future(long selector,void *opt) = 0; virtual ASIOError outputReady() = 0; }; Index: asiolist.h =================================================================== RCS file: /cvsroot/pure-data/pd/portaudio/pa_asio/Attic/asiolist.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** asiolist.h 7 Jun 2004 17:16:22 -0000 1.1.2.1 --- asiolist.h 24 Aug 2004 04:12:57 -0000 1.1.2.2 *************** *** 1,46 **** ! #ifndef __asiolist__ ! #define __asiolist__ ! ! #define DRVERR -5000 ! #define DRVERR_INVALID_PARAM DRVERR-1 ! #define DRVERR_DEVICE_ALREADY_OPEN DRVERR-2 ! #define DRVERR_DEVICE_NOT_FOUND DRVERR-3 ! ! #define MAXPATHLEN 512 ! #define MAXDRVNAMELEN 128 ! ! struct asiodrvstruct ! { ! int drvID; ! CLSID clsid; ! char dllpath[MAXPATHLEN]; ! char drvname[MAXDRVNAMELEN]; ! LPVOID asiodrv; ! struct asiodrvstruct *next; ! }; ! ! typedef struct asiodrvstruct ASIODRVSTRUCT; ! typedef ASIODRVSTRUCT *LPASIODRVSTRUCT; ! ! class AsioDriverList { ! public: ! AsioDriverList(); ! ~AsioDriverList(); ! ! LONG asioOpenDriver (int,VOID **); ! LONG asioCloseDriver (int); ! ! // nice to have ! LONG asioGetNumDev (VOID); ! LONG asioGetDriverName (int,char *,int); ! LONG asioGetDriverPath (int,char *,int); ! LONG asioGetDriverCLSID (int,CLSID *); ! ! // or use directly access ! LPASIODRVSTRUCT lpdrvlist; ! int numdrv; ! }; ! ! typedef class AsioDriverList *LPASIODRIVERLIST; ! ! #endif --- 1,46 ---- ! #ifndef __asiolist__ ! #define __asiolist__ ! ! #define DRVERR -5000 ! #define DRVERR_INVALID_PARAM DRVERR-1 ! #define DRVERR_DEVICE_ALREADY_OPEN DRVERR-2 ! #define DRVERR_DEVICE_NOT_FOUND DRVERR-3 ! ! #define MAXPATHLEN 512 ! #define MAXDRVNAMELEN 128 ! ! struct asiodrvstruct ! { ! int drvID; ! CLSID clsid; ! char dllpath[MAXPATHLEN]; ! char drvname[MAXDRVNAMELEN]; ! LPVOID asiodrv; ! struct asiodrvstruct *next; ! }; ! ! typedef struct asiodrvstruct ASIODRVSTRUCT; ! typedef ASIODRVSTRUCT *LPASIODRVSTRUCT; ! ! class AsioDriverList { ! public: ! AsioDriverList(); ! ~AsioDriverList(); ! ! LONG asioOpenDriver (int,VOID **); ! LONG asioCloseDriver (int); ! ! // nice to have ! LONG asioGetNumDev (VOID); ! LONG asioGetDriverName (int,char *,int); ! LONG asioGetDriverPath (int,char *,int); ! LONG asioGetDriverCLSID (int,CLSID *); ! ! // or use directly access ! LPASIODRVSTRUCT lpdrvlist; ! int numdrv; ! }; ! ! typedef class AsioDriverList *LPASIODRIVERLIST; ! ! #endif --- NEW FILE: combase.h --- //==========================================================================; // // THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY // KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE // IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR // PURPOSE. // // Copyright (c) 1992 - 1996 Microsoft Corporation. All Rights Reserved. // //--------------------------------------------------------------------------; // Base class hierachy for creating COM objects, December 1994 /* a. Derive your COM object from CUnknown b. Make a static CreateInstance function that takes an LPUNKNOWN, an HRESULT * and a TCHAR *. The LPUNKNOWN defines the object to delegate IUnknown calls to. The HRESULT * allows error codes to be passed around constructors and the TCHAR * is a descriptive name that can be printed on the debugger. It is important that constructors only change the HRESULT * if they have to set an ERROR code, if it was successful then leave it alone or you may overwrite an error code from an object previously created. When you call a constructor the descriptive name should be in static store as we do not copy the string. To stop large amounts of memory being used in retail builds by all these static strings use the NAME macro, CMyFilter = new CImplFilter(NAME("My filter"),pUnknown,phr); if (FAILED(hr)) { return hr; } In retail builds NAME(_x_) compiles to NULL, the base CBaseObject class knows not to do anything with objects that don't have a name. c. Have a constructor for your object that passes the LPUNKNOWN, HRESULT * and TCHAR * to the CUnknown constructor. You can set the HRESULT if you have an error, or just simply pass it through to the constructor. The object creation will fail in the class factory if the HRESULT indicates an error (ie FAILED(HRESULT) == TRUE) d. Create a FactoryTemplate with your object's class id and CreateInstance function. Then (for each interface) either Multiple inheritance 1. Also derive it from ISomeInterface 2. Include DECLARE_IUNKNOWN in your class definition to declare implementations of QueryInterface, AddRef and Release that call the outer unknown 3. Override NonDelegatingQueryInterface to expose ISomeInterface by code something like if (riid == IID_ISomeInterface) { return GetInterface((ISomeInterface *) this, ppv); } else { return CUnknown::NonDelegatingQueryInterface(riid, ppv); } 4. Declare and implement the member functions of ISomeInterface. or: Nested interfaces 1. Declare a class derived from CUnknown 2. Include DECLARE_IUNKNOWN in your class definition 3. Override NonDelegatingQueryInterface to expose ISomeInterface by code something like if (riid == IID_ISomeInterface) { return GetInterface((ISomeInterface *) this, ppv); } else { return CUnknown::NonDelegatingQueryInterface(riid, ppv); } 4. Implement the member functions of ISomeInterface. Use GetOwner() to access the COM object class. And in your COM object class: 5. Make the nested class a friend of the COM object class, and declare an instance of the nested class as a member of the COM object class. NOTE that because you must always pass the outer unknown and an hResult to the CUnknown constructor you cannot use a default constructor, in other words you will have to make the member variable a pointer to the class and make a NEW call in your constructor to actually create it. 6. override the NonDelegatingQueryInterface with code like this: if (riid == IID_ISomeInterface) { return m_pImplFilter-> NonDelegatingQueryInterface(IID_ISomeInterface, ppv); } else { return CUnknown::NonDelegatingQueryInterface(riid, ppv); } You can have mixed classes which support some interfaces via multiple inheritance and some via nested classes */ #ifndef __COMBASE__ #define __COMBASE__ /* The DLLENTRY module initialises the module handle on loading */ extern HINSTANCE g_hInst; /* On DLL load remember which platform we are running on */ extern DWORD g_amPlatform; extern OSVERSIONINFO g_osInfo; // Filled in by GetVersionEx /* Version of IUnknown that is renamed to allow a class to support both non delegating and delegating IUnknowns in the same COM object */ DECLARE_INTERFACE(INonDelegatingUnknown) { STDMETHOD(NonDelegatingQueryInterface) (THIS_ REFIID, LPVOID *) PURE; STDMETHOD_(ULONG, NonDelegatingAddRef)(THIS) PURE; STDMETHOD_(ULONG, NonDelegatingRelease)(THIS) PURE; }; typedef INonDelegatingUnknown *PNDUNKNOWN; /* This is the base object class that supports active object counting. As part of the debug facilities we trace every time a C++ object is created or destroyed. The name of the object has to be passed up through the class derivation list during construction as you cannot call virtual functions in the constructor. The downside of all this is that every single object constructor has to take an object name parameter that describes it */ class CBaseObject { private: // Disable the copy constructor and assignment by default so you will get // compiler errors instead of unexpected behaviour if you pass objects // by value or assign objects. CBaseObject(const CBaseObject& objectSrc); // no implementation void operator=(const CBaseObject& objectSrc); // no implementation private: static LONG m_cObjects; /* Total number of objects active */ protected: #ifdef DEBUG DWORD m_dwCookie; /* Cookie identifying this object */ #endif public: /* These increment and decrement the number of active objects */ CBaseObject(TCHAR *pName); ~CBaseObject(); /* Call this to find if there are any CUnknown derived objects active */ static LONG ObjectsActive() { return m_cObjects; }; }; /* An object that supports one or more COM interfaces will be based on this class. It supports counting of total objects for DLLCanUnloadNow support, and an implementation of the core non delegating IUnknown */ class CUnknown : public INonDelegatingUnknown, public CBaseObject { private: const LPUNKNOWN m_pUnknown; /* Owner of this object */ protected: /* So we can override NonDelegatingRelease() */ volatile LONG m_cRef; /* Number of reference counts */ public: CUnknown(TCHAR *pName, LPUNKNOWN pUnk, HRESULT *phr); virtual ~CUnknown() {}; /* Return the owner of this object */ LPUNKNOWN GetOwner() const { return m_pUnknown; }; /* Called from the class factory to create a new instance, it is pure virtual so it must be overriden in your derived class */ /* static CUnknown *CreateInstance(LPUNKNOWN, HRESULT *) */ /* Non delegating unknown implementation */ STDMETHODIMP NonDelegatingQueryInterface(REFIID, void **); STDMETHODIMP_(ULONG) NonDelegatingAddRef(); STDMETHODIMP_(ULONG) NonDelegatingRelease(); /* Return an interface pointer to a requesting client performing a thread safe AddRef as necessary */ HRESULT GetInterface(LPUNKNOWN pUnk, void **ppv); }; /* The standard InterlockedXXX functions won't take volatiles */ static inline LONG InterlockedIncrement( volatile LONG * plong ) { return InterlockedIncrement( const_cast<LONG*>( plong ) ); } static inline LONG InterlockedDecrement( volatile LONG * plong ) { return InterlockedDecrement( const_cast<LONG*>( plong ) ); } static inline LONG InterlockedExchange( volatile LONG * plong, LONG new_value ) { return InterlockedExchange( const_cast<LONG*>( plong ), new_value ); } /* A function that can create a new COM object */ typedef CUnknown *(*LPFNNewCOMObject)(LPUNKNOWN pUnkOuter, HRESULT *phr); /* A function (can be NULL) which is called from the DLL entrypoint routine for each factory template: bLoading - TRUE on DLL load, FALSE on DLL unload rclsid - the m_ClsID of the entry */ typedef void (*LPFNInitRoutine)(BOOL bLoading, const CLSID *rclsid); /* Create one of these per object class in an array so that the default class factory code can create new instances */ class CFactoryTemplate { public: const WCHAR *m_Name; const CLSID *m_ClsID; LPFNNewCOMObject m_lpfnNew; LPFNInitRoutine m_lpfnInit; BOOL IsClassID(REFCLSID rclsid) const { return (IsEqualCLSID(*m_ClsID,rclsid)); }; CUnknown *CreateInstance(LPUNKNOWN pUnk, HRESULT *phr) const { return m_lpfnNew(pUnk, phr); }; }; /* You must override the (pure virtual) NonDelegatingQueryInterface to return interface pointers (using GetInterface) to the interfaces your derived class supports (the default implementation only supports IUnknown) */ #define DECLARE_IUNKNOWN \ STDMETHODIMP QueryInterface(REFIID riid, void **ppv) { \ return GetOwner()->QueryInterface(riid,ppv); \ }; \ STDMETHODIMP_(ULONG) AddRef() { \ return GetOwner()->AddRef(); \ }; \ STDMETHODIMP_(ULONG) Release() { \ return GetOwner()->Release(); \ }; #endif /* __COMBASE__ */ --- NEW FILE: asio.cpp --- /* Steinberg Audio Stream I/O API (c) 1996, Steinberg Soft- und Hardware GmbH asio.cpp asio functions entries which translate the asio interface to the asiodrvr class methods */ #include <string.h> #include "asiosys.h" // platform definition #include "asio.h" #if MAC #include "asiodrvr.h" #pragma export on AsioDriver *theAsioDriver = 0; extern "C" { long main() { return 'ASIO'; } #elif WINDOWS #include "windows.h" #include "iasiodrv.h" #include "asiodrivers.h" IASIO *theAsioDriver = 0; extern AsioDrivers *asioDrivers; #elif SGI || SUN || BEOS || LINUX #include "asiodrvr.h" static AsioDriver *theAsioDriver = 0; #endif //----------------------------------------------------------------------------------------------------- ASIOError ASIOInit(ASIODriverInfo *info) { #if MAC || SGI || SUN || BEOS || LINUX if(theAsioDriver) { delete theAsioDriver; theAsioDriver = 0; } info->driverVersion = 0; strcpy(info->name, "No ASIO Driver"); theAsioDriver = getDriver(); if(!theAsioDriver) { strcpy(info->errorMessage, "Not enough memory for the ASIO driver!"); return ASE_NotPresent; } if(!theAsioDriver->init(info->sysRef)) { theAsioDriver->getErrorMessage(info->errorMessage); delete theAsioDriver; theAsioDriver = 0; return ASE_NotPresent; } strcpy(info->errorMessage, "No ASIO Driver Error"); theAsioDriver->getDriverName(info->name); info->driverVersion = theAsioDriver->getDriverVersion(); return ASE_OK; #else info->driverVersion = 0; strcpy(info->name, "No ASIO Driver"); if(theAsioDriver) // must be loaded! { if(!theAsioDriver->init(info->sysRef)) { theAsioDriver->getErrorMessage(info->errorMessage); theAsioDriver = 0; return ASE_NotPresent; } strcpy(info->errorMessage, "No ASIO Driver Error"); theAsioDriver->getDriverName(info->name); info->driverVersion = theAsioDriver->getDriverVersion(); return ASE_OK; } return ASE_NotPresent; #endif // !MAC } ASIOError ASIOExit(void) { if(theAsioDriver) { #if WINDOWS asioDrivers->removeCurrentDriver(); #else delete theAsioDriver; #endif } theAsioDriver = 0; return ASE_OK; } ASIOError ASIOStart(void) { if(!theAsioDriver) return ASE_NotPresent; return theAsioDriver->start(); } ASIOError ASIOStop(void) { if(!theAsioDriver) return ASE_NotPresent; return theAsioDriver->stop(); } ASIOError ASIOGetChannels(long *numInputChannels, long *numOutputChannels) { if(!theAsioDriver) { *numInputChannels = *numOutputChannels = 0; return ASE_NotPresent; } return theAsioDriver->getChannels(numInputChannels, numOutputChannels); } ASIOError ASIOGetLatencies(long *inputLatency, long *outputLatency) { if(!theAsioDriver) { *inputLatency = *outputLatency = 0; return ASE_NotPresent; } return theAsioDriver->getLatencies(inputLatency, outputLatency); } ASIOError ASIOGetBufferSize(long *minSize, long *maxSize, long *preferredSize, long *granularity) { if(!theAsioDriver) { *minSize = *maxSize = *preferredSize = *granularity = 0; return ASE_NotPresent; } return theAsioDriver->getBufferSize(minSize, maxSize, preferredSize, granularity); } ASIOError ASIOCanSampleRate(ASIOSampleRate sampleRate) { if(!theAsioDriver) return ASE_NotPresent; return theAsioDriver->canSampleRate(sampleRate); } ASIOError ASIOGetSampleRate(ASIOSampleRate *currentRate) { if(!theAsioDriver) return ASE_NotPresent; return theAsioDriver->getSampleRate(currentRate); } ASIOError ASIOSetSampleRate(ASIOSampleRate sampleRate) { if(!theAsioDriver) return ASE_NotPresent; return theAsioDriver->setSampleRate(sampleRate); } ASIOError ASIOGetClockSources(ASIOClockSource *clocks, long *numSources) { if(!theAsioDriver) { *numSources = 0; return ASE_NotPresent; } return theAsioDriver->getClockSources(clocks, numSources); } ASIOError ASIOSetClockSource(long reference) { if(!theAsioDriver) return ASE_NotPresent; return theAsioDriver->setClockSource(reference); } ASIOError ASIOGetSamplePosition(ASIOSamples *sPos, ASIOTimeStamp *tStamp) { if(!theAsioDriver) return ASE_NotPresent; return theAsioDriver->getSamplePosition(sPos, tStamp); } ASIOError ASIOGetChannelInfo(ASIOChannelInfo *info) { if(!theAsioDriver) { info->channelGroup = -1; info->type = ASIOSTInt16MSB; strcpy(info->name, "None"); return ASE_NotPresent; } return theAsioDriver->getChannelInfo(info); } ASIOError ASIOCreateBuffers(ASIOBufferInfo *bufferInfos, long numChannels, long bufferSize, ASIOCallbacks *callbacks) { if(!theAsioDriver) { ASIOBufferInfo *info = bufferInfos; for(long i = 0; i < numChannels; i++, info++) info->buffers[0] = info->buffers[1] = 0; return ASE_NotPresent; } return theAsioDriver->createBuffers(bufferInfos, numChannels, bufferSize, callbacks); } ASIOError ASIODisposeBuffers(void) { if(!theAsioDriver) return ASE_NotPresent; return theAsioDriver->disposeBuffers(); } ASIOError ASIOControlPanel(void) { if(!theAsioDriver) return ASE_NotPresent; return theAsioDriver->controlPanel(); } ASIOError ASIOFuture(long selector, void *opt) { if(!theAsioDriver) return ASE_NotPresent; return theAsioDriver->future(selector, opt); } ASIOError ASIOOutputReady(void) { if(!theAsioDriver) return ASE_NotPresent; return theAsioDriver->outputReady(); } #if MAC } // extern "C" #pragma export off #endif --- NEW FILE: asiodrvr.cpp --- /* Steinberg Audio Stream I/O API (c) 1996, Steinberg Soft- und Hardware GmbH charlie (May 1996) asiodrvr.cpp c++ superclass to implement asio functionality. from this, you can derive whatever required */ #include <string.h> #include "asiosys.h" #include "asiodrvr.h" #if WINDOWS #error do not use this AsioDriver::AsioDriver (LPUNKNOWN pUnk, HRESULT *phr) : CUnknown("My AsioDriver", pUnk, phr) { } #else AsioDriver::AsioDriver() { } #endif AsioDriver::~AsioDriver() { } ASIOBool AsioDriver::init(void *sysRef) { return ASE_NotPresent; } void AsioDriver::getDriverName(char *name) { strcpy(name, "No Driver"); } long AsioDriver::getDriverVersion() { return 0; } void AsioDriver::getErrorMessage(char *string) { strcpy(string, "ASIO Driver Implementation Error!"); } ASIOError AsioDriver::start() { return ASE_NotPresent; } ASIOError AsioDriver::stop() { return ASE_NotPresent; } ASIOError AsioDriver::getChannels(long *numInputChannels, long *numOutputChannels) { return ASE_NotPresent; } ASIOError AsioDriver::getLatencies(long *inputLatency, long *outputLatency) { return ASE_NotPresent; } ASIOError AsioDriver::getBufferSize(long *minSize, long *maxSize, long *preferredSize, long *granularity) { return ASE_NotPresent; } ASIOError AsioDriver::canSampleRate(ASIOSampleRate sampleRate) { return ASE_NotPresent; } ASIOError AsioDriver::getSampleRate(ASIOSampleRate *sampleRate) { return ASE_NotPresent; } ASIOError AsioDriver::setSampleRate(ASIOSampleRate sampleRate) { return ASE_NotPresent; } ASIOError AsioDriver::getClockSources(ASIOClockSource *clocks, long *numSources) { *numSources = 0; return ASE_NotPresent; } ASIOError AsioDriver::setClockSource(long reference) { return ASE_NotPresent; } ASIOError AsioDriver::getSamplePosition(ASIOSamples *sPos, ASIOTimeStamp *tStamp) { return ASE_NotPresent; } ASIOError AsioDriver::getChannelInfo(ASIOChannelInfo *info) { return ASE_NotPresent; } ASIOError AsioDriver::createBuffers(ASIOBufferInfo *channelInfos, long numChannels, long bufferSize, ASIOCallbacks *callbacks) { return ASE_NotPresent; } ASIOError AsioDriver::disposeBuffers() { return ASE_NotPresent; } ASIOError AsioDriver::controlPanel() { return ASE_NotPresent; } ASIOError AsioDriver::future(long selector, void *opt) { return ASE_NotPresent; } ASIOError AsioDriver::outputReady() { return ASE_NotPresent; } Index: asio.h =================================================================== RCS file: /cvsroot/pure-data/pd/portaudio/pa_asio/Attic/asio.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** asio.h 7 Jun 2004 17:16:10 -0000 1.1.2.1 --- asio.h 24 Aug 2004 04:12:57 -0000 1.1.2.2 *************** *** 1,955 **** ! //--------------------------------------------------------------------------------------------------- ! //--------------------------------------------------------------------------------------------------- ! ! /* ! Steinberg Audio Stream I/O API ! (c) 1997 - 1999, Steinberg Soft- und Hardware GmbH ! ! ASIO Interface Specification v 2.0 ! ! basic concept is an i/o synchronous double-buffer scheme: [...1881 lines suppressed...] ! ASE_OK should always be returned if the mechanism makes sense. ! Notes: ! please remeber to adjust ASIOGetLatencies() according to ! whether ASIOOutputReady() was ever called or not, if your ! driver supports this scenario. ! also note that the engine may fail to call ASIO_OutputReady() ! in time in overload cases. as already mentioned, bufferSwitch ! should be called for every block regardless of whether a block ! could be processed in time. ! */ ! ! // restore old alignment ! #if defined(_MSC_VER) && !defined(__MWERKS__) ! #pragma pack(pop) ! #elif PRAGMA_ALIGN_SUPPORTED ! #pragma options align = reset ! #endif ! ! #endif ! --- NEW FILE: asiosmpl.cpp --- /* Steinberg Audio Stream I/O API (c) 1996, Steinberg Soft- und Hardware GmbH charlie (May 1996) asiosmpl.cpp sample implementation of asio. can be set to simulate input with some stupid oscillators. this driver doesn't output sound at all... timing is done via the extended time manager on the mac, and a simple thread on pc. you may test various configurations by changing the kNumInputs/Outputs, and kBlockFrames. note that when using wave generation, as i/o is not optimized at all, it moves quite a bit of memory, too many i/o channels may make it pretty slow. if you use this file as a template, make sure to resolve places where the search string !!! can be found... */ #include <stdio.h> #include <string.h> #include "asiosmpl.h" //#include "virtape.h" //------------------------------------------------------------------------------------------ // extern void getNanoSeconds(ASIOTimeStamp *time); // local double AsioSamples2double (ASIOSamples* samples); static const double twoRaisedTo32 = 4294967296.; static const double twoRaisedTo32Reciprocal = 1. / twoRaisedTo32; //------------------------------------------------------------------------------------------ // on windows, we do the COM stuff. #if WINDOWS #include "windows.h" #include "mmsystem.h" // class id. !!! NOTE: !!! you will obviously have to create your own class id! // {188135E1-D565-11d2-854F-00A0C99F5D19} CLSID IID_ASIO_DRIVER = { 0x188135e1, 0xd565, 0x11d2, { 0x85, 0x4f, 0x0, 0xa0, 0xc9, 0x9f, 0x5d, 0x19 } }; CFactoryTemplate g_Templates[1] = { {L"ASIOSAMPLE", &IID_ASIO_DRIVER, AsioSample::CreateInstance} }; int g_cTemplates = sizeof(g_Templates) / sizeof(g_Templates[0]); CUnknown* AsioSample::CreateInstance (LPUNKNOWN pUnk, HRESULT *phr) { return (CUnknown*)new AsioSample (pUnk,phr); }; STDMETHODIMP AsioSample::NonDelegatingQueryInterface (REFIID riid, void ** ppv) { if (riid == IID_ASIO_DRIVER) { return GetInterface (this, ppv); } return CUnknown::NonDelegatingQueryInterface (riid, ppv); } // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ // Register ASIO Driver // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ extern LONG RegisterAsioDriver (CLSID,char *,char *,char *,char *); extern LONG UnregisterAsioDriver (CLSID,char *,char *); // // Server registration, called on REGSVR32.EXE "the dllname.dll" // HRESULT _stdcall DllRegisterServer() { LONG rc; char errstr[128]; rc = RegisterAsioDriver (IID_ASIO_DRIVER,"ASIOSample.dll","ASIO Sample Driver","ASIO Sample","Apartment"); if (rc) { memset(errstr,0,128); sprintf(errstr,"Register Server failed ! (%d)",rc); MessageBox(0,(LPCTSTR)errstr,(LPCTSTR)"ASIO sample Driver",MB_OK); return -1; } return S_OK; } // // Server unregistration // HRESULT _stdcall DllUnregisterServer() { LONG rc; char errstr[128]; rc = UnregisterAsioDriver (IID_ASIO_DRIVER,"ASIOSample.dll","ASIO Sample Driver"); if (rc) { memset(errstr,0,128); sprintf(errstr,"Unregister Server failed ! (%d)",rc); MessageBox(0,(LPCTSTR)errstr,(LPCTSTR)"ASIO Korg1212 I/O Driver",MB_OK); return -1; } return S_OK; } //------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------ AsioSample::AsioSample (LPUNKNOWN pUnk, HRESULT *phr) : CUnknown("ASIOSAMPLE", pUnk, phr) //------------------------------------------------------------------------------------------ #else // when not on windows, we derive from AsioDriver AsioSample::AsioSample () : AsioDriver () #endif { long i; blockFrames = kBlockFrames; inputLatency = blockFrames; // typically outputLatency = blockFrames * 2; // typically blockFrames * 2; try to get 1 by offering direct buffer // access, and using asioPostOutput for lower latency samplePosition = 0; sampleRate = 44100.; milliSeconds = (long)((double)(kBlockFrames * 1000) / sampleRate); active = false; started = false; timeInfoMode = false; tcRead = false; for (i = 0; i < kNumInputs; i++) { inputBuffers[i] = 0; inMap[i] = 0; } #if TESTWAVES sawTooth = sineWave = 0; #endif for (i = 0; i < kNumOutputs; i++) { outputBuffers[i] = 0; outMap[i] = 0; } callbacks = 0; activeInputs = activeOutputs = 0; toggle = 0; } //------------------------------------------------------------------------------------------ AsioSample::~AsioSample () { stop (); outputClose (); inputClose (); disposeBuffers (); } //------------------------------------------------------------------------------------------ void AsioSample::getDriverName (char *name) { strcpy (name, "Sample ASIO"); } //------------------------------------------------------------------------------------------ long AsioSample::getDriverVersion () { return 0x00000001L; } //------------------------------------------------------------------------------------------ void AsioSample::getErrorMessage (char *string) { strcpy (string, errorMessage); } //------------------------------------------------------------------------------------------ ASIOBool AsioSample::init (void* sysRef) { sysRef = sysRef; if (active) return true; strcpy (errorMessage, "ASIO Driver open Failure!"); if (inputOpen ()) { if (outputOpen ()) { active = true; return true; } } timerOff (); // de-activate 'hardware' outputClose (); inputClose (); return false; } //------------------------------------------------------------------------------------------ ASIOError AsioSample::start () { if (callbacks) { started = false; samplePosition = 0; theSystemTime.lo = theSystemTime.hi = 0; toggle = 0; timerOn (); // activate 'hardware' started = true; return ASE_OK; } return ASE_NotPresent; } //------------------------------------------------------------------------------------------ ASIOError AsioSample::stop () { started = false; timerOff (); // de-activate 'hardware' return ASE_OK; } //------------------------------------------------------------------------------------------ ASIOError AsioSample::getChannels (long *numInputChannels, long *numOutputChannels) { *numInputChannels = kNumInputs; *numOutputChannels = kNumOutputs; return ASE_OK; } //------------------------------------------------------------------------------------------ ASIOError AsioSample::getLatencies (long *_inputLatency, long *_outputLatency) { *_inputLatency = inputLatency; *_outputLatency = outputLatency; return ASE_OK; } //------------------------------------------------------------------------------------------ ASIOError AsioSample::getBufferSize (long *minSize, long *maxSize, long *preferredSize, long *granularity) { *minSize = *maxSize = *preferredSize = blockFrames; // allow this size only *granularity = 0; return ASE_OK; } //------------------------------------------------------------------------------------------ ASIOError AsioSample::canSampleRate (ASIOSampleRate sampleRate) { if (sampleRate == 44100. || sampleRate == 48000.) // allow these rates only return ASE_OK; return ASE_NoClock; } //------------------------------------------------------------------------------------------ ASIOError AsioSample::getSampleRate (ASIOSampleRate *sampleRate) { *sampleRate = this->sampleRate; return ASE_OK; } //------------------------------------------------------------------------------------------ ASIOError AsioSample::setSampleRate (ASIOSampleRate sampleRate) { if (sampleRate != 44100. && sampleRate != 48000.) return ASE_NoClock; if (sampleRate != this->sampleRate) { this->sampleRate = sampleRate; asioTime.timeInfo.sampleRate = sampleRate; asioTime.timeInfo.flags |= kSampleRateChanged; milliSeconds = (long)((double)(kBlockFrames * 1000) / this->sampleRate); if (callbacks && callbacks->sampleRateDidChange) callbacks->sampleRateDidChange (this->sampleRate); } return ASE_OK; } //------------------------------------------------------------------------------------------ ASIOError AsioSample::getClockSources (ASIOClockSource *clocks, long *numSources) { // internal clocks->index = 0; clocks->associatedChannel = -1; clocks->associatedGroup = -1; clocks->isCurrentSource = ASIOTrue; strcpy(clocks->name, "Internal"); *numSources = 1; return ASE_OK; } //------------------------------------------------------------------------------------------ ASIOError AsioSample::setClockSource (long index) { if (!index) { asioTime.timeInfo.flags |= kClockSourceChanged; return ASE_OK; } return ASE_NotPresent; } //------------------------------------------------------------------------------------------ ASIOError AsioSample::getSamplePosition (ASIOSamples *sPos, ASIOTimeStamp *tStamp) { tStamp->lo = theSystemTime.lo; tStamp->hi = theSystemTime.hi; if (samplePosition >= twoRaisedTo32) { sPos->hi = (unsigned long)(samplePosition * twoRaisedTo32Reciprocal); sPos->lo = (unsigned long)(samplePosition - (sPos->hi * twoRaisedTo32)); } else { sPos->hi = 0; sPos->lo = (unsigned long)samplePosition; } return ASE_OK; } //------------------------------------------------------------------------------------------ ASIOError AsioSample::getChannelInfo (ASIOChannelInfo *info) { if (info->channel < 0 || (info->isInput ? info->channel >= kNumInputs : info->channel >= kNumOutputs)) return ASE_InvalidParameter; #if WINDOWS info->type = ASIOSTInt16LSB; #else info->type = ASIOSTInt16MSB; #endif info->channelGroup = 0; info->isActive = ASIOFalse; long i; if (info->isInput) { for (i = 0; i < activeInputs; i++) { if (inMap[i] == info->channel) { info->isActive = ASIOTrue; break; } } } else { for (i = 0; i < activeOutputs; i++) { if (outMap[i] == info->channel) { info->isActive = ASIOTrue; break; } } } strcpy(info->name, "Sample "); return ASE_OK; } //------------------------------------------------------------------------------------------ ASIOError AsioSample::createBuffers (ASIOBufferInfo *bufferInfos, long numChannels, long bufferSize, ASIOCallbacks *callbacks) { ASIOBufferInfo *info = bufferInfos; long i; bool notEnoughMem = false; activeInputs = 0; activeOutputs = 0; blockFrames = bufferSize; for (i = 0; i < numChannels; i++, info++) { if (info->isInput) { if (info->channelNum < 0 || info->channelNum >= kNumInputs) goto error; inMap[activeInputs] = info->channelNum; inputBuffers[activeInputs] = new short[blockFrames * 2]; // double buffer if (inputBuffers[activeInputs]) { info->buffers[0] = inputBuffers[activeInputs]; info->buffers[1] = inputBuffers[activeInputs] + blockFrames; } else { info->buffers[0] = info->buffers[1] = 0; notEnoughMem = true; } activeInputs++; if (activeInputs > kNumInputs) { error: disposeBuffers(); return ASE_InvalidParameter; } } else // output { if (info->channelNum < 0 || info->channelNum >= kNumOutputs) goto error; outMap[activeOutputs] = info->channelNum; outputBuffers[activeOutputs] = new short[blockFrames * 2]; // double buffer if (outputBuffers[activeOutputs]) { info->buffers[0] = outputBuffers[activeOutputs]; info->buffers[1] = outputBuffers[activeOutputs] + blockFrames; } else { info->buffers[0] = info->buffers[1] = 0; notEnoughMem = true; } activeOutputs++; if (activeOutputs > kNumOutputs) { activeOutputs--; disposeBuffers(); return ASE_InvalidParameter; } } } if (notEnoughMem) { disposeBuffers(); return ASE_NoMemory; } this->callbacks = callbacks; if (callbacks->asioMessage (kAsioSupportsTimeInfo, 0, 0, 0)) { timeInfoMode = true; asioTime.timeInfo.speed = 1.; asioTime.timeInfo.systemTime.hi = asioTime.timeInfo.systemTime.lo = 0; asioTime.timeInfo.samplePosition.hi = asioTime.timeInfo.samplePosition.lo = 0; asioTime.timeInfo.sampleRate = sampleRate; asioTime.timeInfo.flags = kSystemTimeValid | kSamplePositionValid | kSampleRateValid; asioTime.timeCode.speed = 1.; asioTime.timeCode.timeCodeSamples.lo = asioTime.timeCode.timeCodeSamples.hi = 0; asioTime.timeCode.flags = kTcValid | kTcRunning ; } else timeInfoMode = false; return ASE_OK; } //--------------------------------------------------------------------------------------------- ASIOError AsioSample::disposeBuffers() { long i; callbacks = 0; stop(); for (i = 0; i < activeInputs; i++) delete inputBuffers[i]; activeInputs = 0; for (i = 0; i < activeOutputs; i++) delete outputBuffers[i]; activeOutputs = 0; return ASE_OK; } //--------------------------------------------------------------------------------------------- ASIOError AsioSample::controlPanel() { return ASE_NotPresent; } //--------------------------------------------------------------------------------------------- ASIOError AsioSample::future (long selector, void* opt) // !!! check properties { ASIOTransportParameters* tp = (ASIOTransportParameters*)opt; switch (selector) { case kAsioEnableTimeCodeRead: tcRead = true; return ASE_SUCCESS; case kAsioDisableTimeCodeRead: tcRead = false; return ASE_SUCCESS; case kAsioSetInputMonitor: return ASE_SUCCESS; // for testing!!! case kAsioCanInputMonitor: return ASE_SUCCESS; // for testing!!! case kAsioCanTimeInfo: return ASE_SUCCESS; case kAsioCanTimeCode: return ASE_SUCCESS; } return ASE_NotPresent; } //-------------------------------------------------------------------------------------------------------- // private methods //-------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------- // input //-------------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------- bool AsioSample::inputOpen () { #if TESTWAVES sineWave = new short[blockFrames]; if (!sineWave) { strcpy (errorMessage, "ASIO Sample Driver: Out of Memory!"); return false; } makeSine (sineWave); sawTooth = new short[blockFrames]; if (!sawTooth) { strcpy(errorMessage, "ASIO Sample Driver: Out of Memory!"); return false; } makeSaw(sawTooth); #endif return true; } #if TESTWAVES #include <math.h> const double pi = 0.3141592654; //--------------------------------------------------------------------------------------------- void AsioSample::makeSine (short *wave) { double frames = (double)blockFrames; double i, f = (pi * 2.) / frames; for (i = 0; i < frames; i++) *wave++ = (short)((double)0x7fff * sin(f * i)); } //--------------------------------------------------------------------------------------------- void AsioSample::makeSaw(short *wave) { double frames = (double)blockFrames; double i, f = 2. / frames; for (i = 0; i < frames; i++) *wave++ = (short)((double)0x7fff * (-1. + f * i)); } #endif //--------------------------------------------------------------------------------------------- void AsioSample::inputClose () { #if TESTWAVES if (sineWave) delete sineWave; sineWave = 0; if (sawTooth) delete sawTooth; sawTooth = 0; #endif } //--------------------------------------------------------------------------------------------- void AsioSample::input() { #if TESTWAVES long i; short *in = 0; for (i = 0; i < activeInputs; i++) { in = inputBuffers[i]; if (in) { if (toggle) in += blockFrames; if ((i & 1) && sawTooth) memcpy(in, sawTooth, (unsigned long)(blockFrames * 2)); else if (sineWave) memcpy(in, sineWave, (unsigned long)(blockFrames * 2)); } } #endif } //------------------------------------------------------------------------------------------------------------------ // output //------------------------------------------------------------------------------------------------------------------ //--------------------------------------------------------------------------------------------- bool AsioSample::outputOpen() { return true; } //--------------------------------------------------------------------------------------------- void AsioSample::outputClose () { } //--------------------------------------------------------------------------------------------- void AsioSample::output () { } //--------------------------------------------------------------------------------------------- void AsioSample::bufferSwitch () { if (started && callbacks) { getNanoSeconds(&theSystemTime); // latch system time input(); output(); samplePosition += blockFrames; if (timeInfoMode) bufferSwitchX (); else callbacks->bufferSwitch (toggle, ASIOFalse); toggle = toggle ? 0 : 1; } } //--------------------------------------------------------------------------------------------- // asio2 buffer switch void AsioSample::bufferSwitchX () { getSamplePosition (&asioTime.timeInfo.samplePosition, &asioTime.timeInfo.systemTime); long offset = toggle ? blockFrames : 0; if (tcRead) { // Create a fake time code, which is 10 minutes ahead of the card's sample position // Please note that for simplicity here time code will wrap after 32 bit are reached asioTime.timeCode.timeCodeSamples.lo = asioTime.timeInfo.samplePosition.lo + 600.0 * sampleRate; asioTime.timeCode.timeCodeSamples.hi = 0; } callbacks->bufferSwitchTimeInfo (&asioTime, toggle, ASIOFalse); asioTime.timeInfo.flags &= ~(kSampleRateChanged | kClockSourceChanged); } //--------------------------------------------------------------------------------------------- ASIOError AsioSample::outputReady () { return ASE_NotPresent; } //--------------------------------------------------------------------------------------------- double AsioSamples2double (ASIOSamples* samples) { double a = (double)(samples->lo); if (samples->hi) a += (double)(samples->hi) * twoRaisedTo32; return a; } --- NEW FILE: asiodrvr.h --- /* Steinberg Audio Stream I/O API (c) 1996, Steinberg Soft- und Hardware GmbH charlie (May 1996) asiodrvr.h c++ superclass to implement asio functionality. from this, you can derive whatever required */ #ifndef _asiodrvr_ #define _asiodrvr_ // cpu and os system we are running on #include "asiosys.h" // basic "C" interface #include "asio.h" class AsioDriver; extern AsioDriver *getDriver(); // for generic constructor #if WINDOWS #include <windows.h> #include "combase.h" #include "iasiodrv.h" class AsioDriver : public IASIO ,public CUnknown { public: AsioDriver(LPUNKNOWN pUnk, HRESULT *phr); DECLARE_IUNKNOWN // Factory method static CUnknown *CreateInstance(LPUNKNOWN pUnk, HRESULT *phr); // IUnknown virtual HRESULT STDMETHODCALLTYPE NonDelegatingQueryInterface(REFIID riid,void **ppvObject); #else class AsioDriver { public: AsioDriver(); #endif virtual ~AsioDriver(); virtual ASIOBool init(void* sysRef); virtual void getDriverName(char *name); // max 32 bytes incl. terminating zero virtual long getDriverVersion(); virtual void getErrorMessage(char *string); // max 124 bytes incl. virtual ASIOError start(); virtual ASIOError stop(); virtual ASIOError getChannels(long *numInputChannels, long *numOutputChannels); virtual ASIOError getLatencies(long *inputLatency, long *outputLatency); virtual ASIOError getBufferSize(long *minSize, long *maxSize, long *preferredSize, long *granularity); virtual ASIOError canSampleRate(ASIOSampleRate sampleRate); virtual ASIOError getSampleRate(ASIOSampleRate *sampleRate); virtual ASIOError setSampleRate(ASIOSampleRate sampleRate); virtual ASIOError getClockSources(ASIOClockSource *clocks, long *numSources); virtual ASIOError setClockSource(long reference); virtual ASIOError getSamplePosition(ASIOSamples *sPos, ASIOTimeStamp *tStamp); virtual ASIOError getChannelInfo(ASIOChannelInfo *info); virtual ASIOError createBuffers(ASIOBufferInfo *bufferInfos, long numChannels, long bufferSize, ASIOCallbacks *callbacks); virtual ASIOError disposeBuffers(); virtual ASIOError controlPanel(); virtual ASIOError future(long selector, void *opt); virtual ASIOError outputReady(); }; #endif --- NEW FILE: iasiothiscallresolver.h --- // **************************************************************************** // File: IASIOThiscallResolver.h // Description: The IASIOThiscallResolver class implements the IASIO // interface and acts as a proxy to the real IASIO interface by // calling through its vptr table using the thiscall calling // convention. To put it another way, we interpose // IASIOThiscallResolver between ASIO SDK code and the driver. // This is necessary because most non-Microsoft compilers don't // implement the thiscall calling convention used by IASIO. // // iasiothiscallresolver.cpp contains the background of this // problem plus a technical description of the vptr // manipulations. // // In order to use this mechanism one simply has to add // iasiothiscallresolver.cpp to the list of files to compile // and #include <iasiothiscallresolver.h> // // Note that this #include must come after the other ASIO SDK // #includes, for example: // // #include <windows.h> // #include <asiosys.h> // #include <asio.h> // #include <asiodrivers.h> // #include <iasiothiscallresolver.h> // // Actually the important thing is to #include // <iasiothiscallresolver.h> after <asio.h>. We have // incorporated a test to enforce this ordering. // // The code transparently takes care of the interposition by // using macro substitution to intercept calls to ASIOInit() // and ASIOExit(). We save the original ASIO global // "theAsioDriver" in our "that" variable, and then set // "theAsioDriver" to equal our IASIOThiscallResolver instance. // // Whilst this method of resolving the thiscall problem requires // the addition of #include <iasiothiscallresolver.h> to client // code it has the advantage that it does not break the terms // of the ASIO licence by publishing it. We are NOT modifying // any Steinberg code here, we are merely implementing the IASIO // interface in the same way that we would need to do if we // wished to provide an open source ASIO driver. // // For compilation with MinGW -lole32 needs to be added to the // linker options. For BORLAND, linking with Import32.lib is // sufficient. // // The dependencies are with: CoInitialize, CoUninitialize, // CoCreateInstance, CLSIDFromString - used by asiolist.cpp // and are required on Windows whether ThiscallResolver is used // or not. // // Searching for the above strings in the root library path // of your compiler should enable the correct libraries to be // identified if they aren't immediately obvious. // // Note that the current implementation of IASIOThiscallResolver // is not COM compliant - it does not correctly implement the // IUnknown interface. Implementing it is not necessary because // it is not called by parts of the ASIO SDK which call through // theAsioDriver ptr. The IUnknown methods are implemented as // assert(false) to ensure that the code fails if they are // ever called. // Restrictions: None. Public Domain & Open Source distribute freely // You may use IASIOThiscallResolver commercially as well as // privately. // You the user assume the responsibility for the use of the // files, binary or text, and there is no guarantee or warranty, // expressed or implied, including but not limited to the // implied warranties of merchantability and fitness for a // particular purpose. You assume all responsibility and agree // to hold no entity, copyright holder or distributors liable // for any loss of data or inaccurate representations of data // as a result of using IASIOThiscallResolver. // Version: 1.4 Added separate macro CALL_THISCALL_1_DOUBLE from // Andrew Baldwin, and volatile for whole gcc asm blocks, // both for compatibility with newer gcc versions. Cleaned up // Borland asm to use one less register. // 1.3 Switched to including assert.h for better compatibility. // Wrapped entire .h and .cpp contents with a check for // _MSC_VER to provide better compatibility with MS compilers. // Changed Singleton implementation to use static instance // instead of freestore allocated instance. Removed ASIOExit // macro as it is no longer needed. // 1.2 Removed semicolons from ASIOInit and ASIOExit macros to // allow them to be embedded in expressions (if statements). // Cleaned up some comments. Removed combase.c dependency (it // doesn't compile with BCB anyway) by stubbing IUnknown. // 1.1 Incorporated comments from Ross Bencina including things // such as changing name from ThiscallResolver to // IASIOThiscallResolver, tidying up the constructor, fixing // a bug in IASIOThiscallResolver::ASIOExit() and improving // portability through the use of conditional compilation // 1.0 Initial working version. // Created: 6/09/2003 // Authors: Fraser Adams // Ross Bencina // Rene G. Ceballos // Martin Fay // Antti Silvast // Andrew Baldwin // // **************************************************************************** #ifndef included_iasiothiscallresolver_h #define included_iasiothiscallresolver_h // We only need IASIOThiscallResolver at all if we are on Win32. For other // platforms we simply bypass the IASIOThiscallResolver definition to allow us // to be safely #include'd whatever the platform to keep client code portable #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) // If microsoft compiler we can call IASIO directly so IASIOThiscallResolver // is not used. #if !defined(_MSC_VER) // The following is in order to ensure that this header is only included after // the other ASIO headers (except for the case of iasiothiscallresolver.cpp). // We need to do this because IASIOThiscallResolver works by eclipsing the // original definition of ASIOInit() with a macro (see below). #if !defined(iasiothiscallresolver_sourcefile) #if !defined(__ASIO_H) #error iasiothiscallresolver.h must be included AFTER asio.h #endif #endif #include <windows.h> #include <asiodrvr.h> /* From ASIO SDK */ class IASIOThiscallResolver : public IASIO { private: IASIO* that_; // Points to the real IASIO static IASIOThiscallResolver instance; // Singleton instance // Constructors - declared private so construction is limited to // our Singleton instance IASIOThiscallResolver(); IASIOThiscallResolver(IASIO* that); public: // Methods from the IUnknown interface. We don't fully implement IUnknown // because the ASIO SDK never calls these methods through theAsioDriver ptr. // These methods are implemented as assert(false). virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppv); virtual ULONG STDMETHODCALLTYPE AddRef(); virtual ULONG STDMETHODCALLTYPE Release(); // Methods from the IASIO interface, implemented as forwarning calls to that. virtual ASIOBool init(void *sysHandle); virtual void getDriverName(char *name); virtual long getDriverVersion(); virtual void getErrorMessage(char *string); virtual ASIOError start(); virtual ASIOError stop(); virtual ASIOError getChannels(long *numInputChannels, long *numOutputChannels); virtual ASIOError getLatencies(long *inputLatency, long *outputLatency); virtual ASIOError getBufferSize(long *minSize, long *maxSize, long *preferredSize, long *granularity); virtual ASIOError canSampleRate(ASIOSampleRate sampleRate); virtual ASIOError getSampleRate(ASIOSampleRate *sampleRate); virtual ASIOError setSampleRate(ASIOSampleRate sampleRate); virtual ASIOError getClockSources(ASIOClockSource *clocks, long *numSources); virtual ASIOError setClockSource(long reference); virtual ASIOError getSamplePosition(ASIOSamples *sPos, ASIOTimeStamp *tStamp); virtual ASIOError getChannelInfo(ASIOChannelInfo *info); virtual ASIOError createBuffers(ASIOBufferInfo *bufferInfos, long numChannels, long bufferSize, ASIOCallbacks *callbacks); virtual ASIOError disposeBuffers(); virtual ASIOError controlPanel(); virtual ASIOError future(long selector,void *opt); virtual ASIOError outputReady(); // Class method, see ASIOInit() macro below. static ASIOError ASIOInit(ASIODriverInfo *info); // Delegates to ::ASIOInit }; // Replace calls to ASIOInit with our interposing version. // This macro enables us to perform thiscall resolution simply by #including // <iasiothiscallresolver.h> after the asio #includes (this file _must_ be // included _after_ the asio #includes) #define ASIOInit(name) IASIOThiscallResolver::ASIOInit((name)) #endif /* !defined(_MSC_VER) */ #endif /* Win32 */ #endif /* included_iasiothiscallresolver_h */ --- NEW FILE: dllentry.cpp --- //==========================================================================; // // THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY // KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE // IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR // PURPOSE. // // Copyright (c) 1992 - 1996 Microsoft Corporation. All Rights Reserved. // //--------------------------------------------------------------------------; // // classes used to support dll entrypoints for COM objects. // // #include "switches.h" #include <windows.h> #include "wxdebug.h" #include "combase.h" #ifdef DEBUG #include <tchar.h> #endif #include <stdio.h> extern CFactoryTemplate g_Templates[]; extern int g_cTemplates; HINSTANCE hinstance = 0; DWORD g_amPlatform; // VER_PLATFORM_WIN32_WINDOWS etc... (from GetVersionEx) OSVERSIONINFO g_osInfo; // // an instance of this is created by the DLLGetClassObject entrypoint // it uses the CFactoryTemplate object it is given to support the // IClassFactory interface class CClassFactory : public IClassFactory { private: const CFactoryTemplate * m_pTemplate; ULONG m_cRef; static int m_cLocked; public: CClassFactory(const CFactoryTemplate *); // IUnknown STDMETHODIMP QueryInterface(REFIID riid, void ** ppv); STDMETHODIMP_(ULONG)AddRef(); STDMETHODIMP_(ULONG)Release(); // IClassFactory STDMETHODIMP CreateInstance(LPUNKNOWN pUnkOuter, REFIID riid, void **pv); STDMETHODIMP LockServer(BOOL fLock); // allow DLLGetClassObject to know about global server lock status static BOOL IsLocked() { return (m_cLocked > 0); }; }; // process-wide dll locked state int CClassFactory::m_cLocked = 0; CClassFactory::CClassFactory(const CFactoryTemplate *pTemplate) { m_cRef = 0; m_pTemplate = pTemplate; } STDMETHODIMP CClassFactory::QueryInterface(REFIID riid,void **ppv) { CheckPointer(ppv,E_POINTER) ValidateReadWritePtr(ppv,sizeof(PVOID)); *ppv = NULL; // any interface on this object is the object pointer. if ((riid == IID_IUnknown) || (riid == IID_IClassFactory)) { *ppv = (LPVOID) this; // AddRef returned interface pointer ((LPUNKNOWN) *ppv)->AddRef(); return NOERROR; } return ResultFromScode(E_NOINTERFACE); } STDMETHODIMP_(ULONG) CClassFactory::AddRef() { return ++m_cRef; } STDMETHODIMP_(ULONG) CClassFactory::Release() { LONG rc; if (--m_cRef == 0) { delete this; rc = 0; } else rc = m_cRef; return rc; } STDMETHODIMP CClassFactory::CreateInstance(LPUNKNOWN pUnkOuter,REFIID riid,void **pv) { CheckPointer(pv,E_POINTER) ValidateReadWritePtr(pv,sizeof(void *)); /* Enforce the normal OLE rules regarding interfaces and delegation */ if (pUnkOuter != NULL) { if (IsEqualIID(riid,IID_IUnknown) == FALSE) { return ResultFromScode(E_NOINTERFACE); } } /* Create the new object through the derived class's create function */ HRESULT hr = NOERROR; CUnknown *pObj = m_pTemplate->CreateInstance(pUnkOuter, &hr); if (pObj == NULL) { return E_OUTOFMEMORY; } /* Delete the object if we got a construction error */ if (FAILED(hr)) { delete pObj; return hr; } /* Get a reference counted interface on the object */ /* We wrap the non-delegating QI with NDAddRef & NDRelease. */ /* This protects any outer object from being prematurely */ /* released by an inner object that may have to be created */ /* in order to supply the requested interface. */ pObj->NonDelegatingAddRef(); hr = pObj->NonDelegatingQueryInterface(riid, pv); pObj->NonDelegatingRelease(); /* Note that if NonDelegatingQueryInterface fails, it will */ /* not increment the ref count, so the NonDelegatingRelease */ /* will drop the ref back to zero and the object will "self-*/ /* destruct". Hence we don't need additional tidy-up code */ /* to cope with NonDelegatingQueryInterface failing. */ if (SUCCEEDED(hr)) { ASSERT(*pv); } return hr; } STDMETHODIMP CClassFactory::LockServer(BOOL fLock) { if (fLock) { m_cLocked++; } else { m_cLocked--; } return NOERROR; } // --- COM entrypoints ----------------------------------------- // DllRegisterServer //called by COM to get the class factory object for a given class STDAPI DllGetClassObject(REFCLSID rClsID,REFIID riid,void **pv) { // DebugBreak(); if (!(riid == IID_IUnknown) && !(riid == IID_IClassFactory)) { return E_NOINTERFACE; } // traverse the array of templates looking for one with this // class id for (int i = 0; i < g_cTemplates; i++) { const CFactoryTemplate * pT = &g_Templates[i]; if (pT->IsClassID(rClsID)) { // found a template - make a class factory based on this // template *pv = (LPVOID) (LPUNKNOWN) new CClassFactory(pT); if (*pv == NULL) { return E_OUTOFMEMORY; } ((LPUNKNOWN)*pv)->AddRef(); return NOERROR; } } return CLASS_E_CLASSNOTAVAILABLE; } // // Call any initialization routines // void DllInitClasses(BOOL bLoading) { int i; // DebugBreak(); // traverse the array of templates calling the init routine // if they have one for (i = 0; i < g_cTemplates; i++) { const CFactoryTemplate * pT = &g_Templates[i]; if (pT->m_lpfnInit != NULL) { (*pT->m_lpfnInit)(bLoading, pT->m_ClsID); } } } // called by COM to determine if this dll can be unloaded // return ok unless there are outstanding objects or a lock requested // by IClassFactory::LockServer // // CClassFactory has a static function that can tell us about the locks, // and CCOMObject has a static function that can tell us about the active // object count STDAPI DllCanUnloadNow() { // DebugBreak(); DbgLog((LOG_MEMORY,2,TEXT("DLLCanUnloadNow called - IsLocked = %d, Active objects = %d"), CClassFactory::IsLocked(), CBaseObject::ObjectsActive())); if (CClassFactory::IsLocked() || CBaseObject::ObjectsActive()) { return S_FALSE; } else { return S_OK; } } // --- standard WIN32 entrypoints -------------------------------------- //extern "C" BOOL WINAPI DllEntryPoint(HINSTANCE, ULONG, LPVOID); //BOOL WINAPI DllEntryPoint(HINSTANCE hInstance,ULONG ulReason,LPVOID pv) //BOOL WINAPI DllMain (HINSTANCE hInstance,ULONG ulReason,LPVOID pv) BOOL WINAPI DllEntryPoint (HINSTANCE hInstance,ULONG ulReason,LPVOID pv) { // DebugBreak(); switch (ulReason) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstance); DbgInitialise(hInstance); { // The platform identifier is used to work out whether // full unicode support is available or not. Hence the // default will be the lowest common denominator - i.e. N/A g_amPlatform = VER_PLATFORM_WIN32_WINDOWS; // win95 assumed in case GetVersionEx fails g_osInfo.dwOSVersionInfoSize = sizeof(g_osInfo); if (GetVersionEx(&g_osInfo)) { g_amPlatform = g_osInfo.dwPlatformId; } else { DbgLog((LOG_ERROR, 1, "Failed to get the OS platform, assuming Win95")); } } hinstance = hInstance; DllInitClasses(TRUE); break; case DLL_PROCESS_DETACH: DllInitClasses(FALSE); #ifdef DEBUG if (CBaseObject::ObjectsActive()) { DbgSetModuleLevel(LOG_MEMORY, 2); TCHAR szInfo[512]; extern TCHAR m_ModuleName[]; // Cut down module name TCHAR FullName[_MAX_PATH]; // Load the full path and module name TCHAR *pName; // Searches from the end for a backslash GetModuleFileName(NULL,FullName,_MAX_PATH); pName = _tcsrchr(FullName,'\\'); if (pName == NULL) { pName = FullName; } else { pName++; } DWORD cch = wsprintf(szInfo, TEXT("Executable: %s Pid %x Tid %x. "), pName, GetCurrentProcessId(), GetCurrentThreadId()); wsprintf(szInfo+cch, TEXT("Module %s, %d objects left active!"), m_ModuleName, CBaseObject::ObjectsActive()); DbgAssert(szInfo, TEXT(__FILE__),__LINE__); // If running remotely wait for the Assert to be acknowledged // before dumping out the object register DbgDumpObjectRegister(); } DbgTerminate(); #endif break; } return TRUE; } Index: asiosys.h =================================================================== RCS file: /cvsroot/pure-data/pd/portaudio/pa_asio/Attic/asiosys.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** asiosys.h 7 Jun 2004 17:16:22 -0000 1.1.2.1 --- asiosys.h 24 Aug 2004 04:12:57 -0000 1.1.2.2 *************** *** 1,82 **** ! #ifndef __asiosys__ ! #define __asiosys__ ! ! #ifdef WIN32 ! #undef MAC ! #define PPC 0 ! #define WINDOWS 1 ! #define SGI 0 ! #define SUN 0 ! #define LINUX 0 ! #define BEOS 0 ! ! #define NATIVE_INT64 0 ! #define IEEE754_64FLOAT 1 ! ! #elif BEOS ! #define MAC 0 ! #define PPC 0 ! #define WINDOWS 0 ! #define PC 0 ! #define SGI 0 ! #define SUN 0 ! #define LINUX 0 ! ! #define NATIVE_INT64 0 ! #define IEEE754_64FLOAT 1 ! ! #ifndef DEBUG ! #define DEBUG 0 ! #if DEBUG ! void DEBUGGERMESSAGE(char *string); ! #else ! #define DEBUGGERMESSAGE(a) ! #endif ! #endif ! ! #elif SGI ! #define MAC 0 ! #define PPC 0 ! #define WINDOWS 0 ! #define PC 0 ! #define SUN 0 ! #define LINUX 0 ! #define BEOS 0 ! ! #define NATIVE_INT64 0 ! #define IEEE754_64FLOAT 1 ! ! #ifndef DEBUG ! #define DEBUG 0 ! #if DEBUG ! void DEBUGGERMESSAGE(char *string); ! #else ! #define DEBUGGERMESSAGE(a) ! #endif ! #endif ! ! #else // MAC ! ! #define MAC 1 ! #define PPC 1 ! #define WINDOWS 0 ! #define PC 0 ! #define SGI 0 ! #define SUN 0 ! #define LINUX 0 ! #define BEOS 0 ! ! #define NATIVE_INT64 0 ! #define IEEE754_64FLOAT 1 ! ! #ifndef DEBUG ! #define DEBUG 0 ! #if DEBUG ! void DEBUGGERMESSAGE(char *string); ! #else ! #define DEBUGGERMESSAGE(a) ! #endif ! #endif ! #endif ! ! #endif --- 1,82 ---- ! #ifndef __asiosys__ ! #define __asiosys__ ! ! #ifdef WIN32 ! #undef MAC ! #define PPC 0 ! #define WINDOWS 1 ! #define SGI 0 ! #define SUN 0 ! #define LINUX 0 ! #define BEOS 0 ! ! #define NATIVE_INT64 0 ! #define IEEE754_64FLOAT 1 ! ! #elif BEOS ! #define MAC 0 ! #define PPC 0 ! #define WINDOWS 0 ! #define PC 0 ! #define SGI 0 ! #define SUN 0 ! #define LINUX 0 ! ! #define NATIVE_INT64 0 ! #define IEEE754_64FLOAT 1 ! ! #ifndef DEBUG ! #define DEBUG 0 ! #if DEBUG ! void DEBUGGERMESSAGE(char *string); ! #else ! #define DEBUGGERMESSAGE(a) ! #endif ! #endif ! ! #elif SGI ! #define MAC 0 ! #define PPC 0 ! #define WINDOWS 0 ! #define PC 0 ! #define SUN 0 ! #define LINUX 0 ! #define BEOS 0 ! ! #define NATIVE_INT64 0 ! #define IEEE754_64FLOAT 1 ! ! #ifndef DEBUG ! #define DEBUG 0 ! #if DEBUG ! void DEBUGGERMESSAGE(char *string); ! #else ! #define DEBUGGERMESSAGE(a) ! #endif ! #endif ! ! #else // MAC ! ! #define MAC 1 ! #define PPC 1 ! #define WINDOWS 0 ! #define PC 0 ! #define SGI 0 ! #define SUN 0 ! #define LINUX 0 ! #define BEOS 0 ! ! #define NATIVE_INT64 0 ! #define IEEE754_64FLOAT 1 ! ! #ifndef DEBUG ! #define DEBUG 0 ! #if DEBUG ! void DEBUGGERMESSAGE(char *string); ! #else ! #define DEBUGGERMESSAGE(a) ! #endif ! #endif ! #endif ! ! #endif --- NEW FILE: asiosmpl.h --- /* Steinberg Audio Stream I/O API (c) 1999, Steinberg Soft- und Hardware GmbH asiosmpl.h test implementation of asio */ #ifndef _asiosmpl_ #define _asiosmpl_ #include "asiosys.h" #define TESTWAVES 1 // when true, will feed the left input (to host) with // a sine wave, and the right one with a sawtooth enum { kBlockFrames = 256, kNumInputs = 16, kNumOutputs = 16 }; #if WINDOWS #include "rpc.h" #include "rpcndr.h" #ifndef COM_NO_WINDOWS_H #include <windows.h> #include "ole2.h" #endif #include "combase.h" #include "iasiodrv.h" class AsioSample : public IASIO, public CUnknown { public: AsioSample(LPUNKNOWN pUnk, HRESULT *phr); ~AsioSample(); DECLARE_IUNKNOWN //STDMETHODIMP QueryInterface(REFIID riid, void **ppv) { \ // return GetOwner()->QueryInterface(riid,ppv); \ //}; \ //STDMETHODIMP_(ULONG) AddRef() { \ // return GetOwner()->AddRef(); \ //}; \ //STDMETHODIMP_(ULONG) Release() { \ // return GetOwner()->Release(); \ //}; // Factory method static CUnknown *CreateInstance(LPUNKNOWN pUnk, HRESULT *phr); // IUnknown virtual HRESULT STDMETHODCALLTYPE NonDelegatingQueryInterface(REFIID riid,void **ppvObject); #else #include "asiodrvr.h" //--------------------------------------------------------------------------------------------- class AsioSample : public AsioDriver { public: AsioSample (); ~AsioSample (); #endif ASIOBool init (void* sysRef); void getDriverName (char *name); // max 32 bytes incl. terminating zero long getDriverVersion (); void getErrorMessage (char *string); // max 128 bytes incl. ASIOError start (); ASIOError stop (); ASIOError getChannels (long *numInputChannels, long *numOutputChannels); ASIOError getLatencies (long *inputLatency, long *outputLatency); ASIOError getBufferSize (long *minSize, long *maxSize, long *preferredSize, long *granularity); ASIOError canSampleRate (ASIOSampleRate sampleRate); ASIOError getSampleRate (ASIOSampleRate *sampleRate); ASIOError setSampleRate (ASIOSampleRate sampleRate); ASIOError getClockSources (ASIOClockSource *clocks, long *numSources); ASIOError setClockSource (long index); ASIOError getSamplePosition (ASIOSamples *sPos, ASIOTimeStamp *tStamp); ASIOError getChannelInfo (ASIOChannelInfo *info); ASIOError createBuffers (ASIOBufferInfo *bufferInfos, long numChannels, long bufferSize, ASIOCallbacks *callbacks); ASIOError disposeBuffers (); ASIOError controlPanel (); ASIOError future (long selector, void *opt); ASIOError outputReady (); void bufferSwitch (); long getMilliSeconds () {return milliSeconds;} private: friend void myTimer(); bool inputOpen (); #if TESTWAVES void makeSine (short *wave); void makeSaw (short *wave); #endif void inputClose (); void input (); bool outputOpen (); void outputClose (); void output (); void timerOn (); void timerOff (); void bufferSwitchX (); double samplePosition; double sampleRate; ASIOCallbacks *callbacks; ASIOTime asioTime; ASIOTimeStamp theSystemTime; short *inputBuffers[kNumInputs * 2]; short *outputBuffers[kNumOutputs * 2]; #if TESTWAVES short *sineWave, *sawTooth; #endif long inMap[kNumInputs]; long outMap[kNumOutputs]; long blockFrames; long inputLatency; long outputLatency; long activeInputs; long activeOutputs; long toggle; long milliSeconds; bool active, started; bool timeInfoMode, tcRead; char errorMessage[128]; }; #endif --- Callback_adaptation_.pdf DELETED ---

1 0

pd/portaudio/docs index.html,1.1.1.1.2.1,1.1.1.1.2.1.2.1 pa_tut_mac_osx.html,1.1.1.1.2.1,1.1.1.1.2.1.2.1 portaudio_icmc2001.pdf,1.1.1.1.2.1,1.1.1.1.2.1.2.1
by carmen rocco 24 Aug '04

24 Aug '04

Update of /cvsroot/pure-data/pd/portaudio/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5913/docs Modified Files: Tag: impd_0_37 index.html pa_tut_mac_osx.html portaudio_icmc2001.pdf Log Message: new snapshot Index: portaudio_icmc2001.pdf =================================================================== RCS file: /cvsroot/pure-data/pd/portaudio/docs/Attic/portaudio_icmc2001.pdf,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.1.2.1 diff -C2 -d -r1.1.1.1.2.1 -r1.1.1.1.2.1.2.1 Binary files /tmp/cvsHYHqNp and /tmp/cvswB8htA differ Index: index.html =================================================================== RCS file: /cvsroot/pure-data/pd/portaudio/docs/Attic/index.html,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.1.2.1 diff -C2 -d -r1.1.1.1.2.1 -r1.1.1.1.2.1.2.1 *** index.html 12 Sep 2003 21:43:57 -0000 1.1.1.1.2.1 --- index.html 24 Aug 2004 04:12:54 -0000 1.1.1.1.2.1.2.1 *************** *** 62,67 **** <a href="v19-doxydocs/">API Reference for V19</a></h3> ! <blockquote>Reference documents for the Application Programmer Interface ! for V19 generated by doxygen.</blockquote> <hr WIDTH="100%"> --- 62,83 ---- <a href="v19-doxydocs/">API Reference for V19</a></h3> ! <blockquote> ! Reference documents for the Application Programmer Interface ! for V19 generated by doxygen. ! </blockquote> ! <h3> Paper presented at ACMC2003</h3> ! <blockquote> ! "PortAudio and Media Synchronisation" - Discusses how the V19 API relates to ! various synchronisation tasks including MIDI controlled playback, GUI/Audio ! sync and MIDI sync. <a href="http://www.portaudio.com/docs/portaudio_sync_acmc2003.pdf">http://www.portaudio.com/docs/portaudio_sync_acmc2003.pdf </a> (PDF) ! </blockquote> ! <h3>Programmer's Guides</h3> ! ! <ul> ! <li> ! <a href="http://www.numerix-dsp.com/files/portaudio.html" target="_blank"> ! Compilation Information For Borland C/C++ And wxWindows by John Edwards ! </li> ! </ul> <hr WIDTH="100%"> Index: pa_tut_mac_osx.html =================================================================== RCS file: /cvsroot/pure-data/pd/portaudio/docs/Attic/pa_tut_mac_osx.html,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.1.2.1 diff -C2 -d -r1.1.1.1.2.1 -r1.1.1.1.2.1.2.1 *** pa_tut_mac_osx.html 12 Sep 2003 21:43:57 -0000 1.1.1.1.2.1 --- pa_tut_mac_osx.html 24 Aug 2004 04:12:55 -0000 1.1.1.1.2.1.2.1 *************** *** 31,41 **** <blockquote>To compile a Macintosh OS X CoreAudio application with the PortAudio library you will use the following source files: ! <blockquote>pa_mac_core/pa_mac_core.c ! pa_common/pa_lib.c ! pa_common/portaudio.h ! pa_common/pa_host.h ! pa_common/pa_convert.c ! pablio/ringbuffer.c ! pablio/ringbuffer.h</blockquote> </blockquote> --- 31,43 ---- <blockquote>To compile a Macintosh OS X CoreAudio application with the PortAudio library you will use the following source files: ! <blockquote>pa_mac_core/pa_mac_core.c ! pa_common/pa_lib.c ! pa_common/portaudio.h ! pa_common/pa_host.h ! pa_common/pa_convert.c ! pa_common/pa_trace.c ! pa_common/pa_trace.h ! pablio/ringbuffer.c ! pablio/ringbuffer.h</blockquote> </blockquote> *************** *** 54,58 **** Or Using Metrowerks CodeWarrior 8</h3> ! <blockquote>by James Vanlommel</blockquote> <blockquote>Create a new CodeWarrior project using Mac OS C++ Stationery. --- 56,60 ---- Or Using Metrowerks CodeWarrior 8</h3> ! <blockquote>by James Van Lommel</blockquote> <blockquote>Create a new CodeWarrior project using Mac OS C++ Stationery. *************** *** 62,67 **** Add a test file of your choosing, like    patests    /patest_sine8.c !   ! Add the frameworks to the Frameworks tab using Project > Add Files...    CoreAudio    AudioToolbox --- 64,68 ---- Add a test file of your choosing, like    patests    /patest_sine8.c ! Add the frameworks to the Frameworks tab using Project > Add Files...    CoreAudio    AudioToolbox *************** *** 69,78 **** Open the current target's settings, and in Language Settings > C/C++ Language, uncheck (disable) the "ANSI Strict" setting. (Do this for both ! Debug and Release projects, if necessary.) Edit pa_mac_core.c:    On line 1546, cast the PaHost_AllocateFastMemory() result to a (char *) or you will get a compile error. !   ! Compile and run. (may need to run from a terminal window) I've successfully built patest_sine8.c this way using the CVS .tar version of portaudio (date: 2003-04-27). I get 17 warnings during compilation, --- 70,80 ---- Open the current target's settings, and in Language Settings > C/C++ Language, uncheck (disable) the "ANSI Strict" setting. (Do this for both ! Debug and Release projects, if necessary.) You may also choose to disable ! RTTI and exceptions; the most important settings are 'Force C++ compilation' ! (enabled) and 'ANSI Strict' (disabled)." Edit pa_mac_core.c:    On line 1546, cast the PaHost_AllocateFastMemory() result to a (char *) or you will get a compile error. ! Compile and run. (may need to run from a terminal window) I've successfully built patest_sine8.c this way using the CVS .tar version of portaudio (date: 2003-04-27). I get 17 warnings during compilation,

1 0

externals/grill/vst/src main.cpp,1.16,1.17
by Thomas Grill 24 Aug '04

24 Aug '04

Update of /cvsroot/pure-data/externals/grill/vst/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15407/src Modified Files: main.cpp Log Message: "" Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/vst/src/main.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** main.cpp 23 Aug 2004 02:42:16 -0000 1.16 --- main.cpp 24 Aug 2004 02:44:38 -0000 1.17 *************** *** 20,24 **** ! #define VST_VERSION "0.1.0pre13" --- 20,24 ---- ! #define VST_VERSION "0.1.0pre14" *************** *** 474,479 **** int i,mx = CntInSig(); if(mx > CntOutSig()) mx = CntOutSig(); ! for(i = 0; i < mx; ++i) ! CopySamples(outsigs[i],insigs[i],n); for(; i < CntOutSig(); ++i) ZeroSamples(outsigs[i],n); --- 474,498 ---- int i,mx = CntInSig(); if(mx > CntOutSig()) mx = CntOutSig(); ! if(mx == 1) { ! CopySamples(outsigs[0],insigs[0],n); ! i = 1; ! } ! else if(mx == 2) { ! R *o1 = outsigs[0],*o2 = outsigs[1]; ! const R *i1 = insigs[0],*i2 = insigs[1]; ! for(int s = 0; s < n; ++s) { ! const R f = *(i1++); ! *(o2++) = *(i2++); ! *(o1++) = f; ! } ! i = 2; ! } ! else ! for(i = 0; i < mx; ++i) { ! // must copy via temporary buffer as ordering of output signals can collide with input signals ! CopySamples(tmpin[i],insigs[i],n); ! CopySamples(outsigs[i],tmpin[i],n); ! } ! for(; i < CntOutSig(); ++i) ZeroSamples(outsigs[i],n);

1 0

externals/grill/vst/pd help-vst~.pd,1.2,1.3
by Thomas Grill 24 Aug '04

24 Aug '04

Update of /cvsroot/pure-data/externals/grill/vst/pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15407/pd Modified Files: help-vst~.pd Log Message: "" Index: help-vst~.pd =================================================================== RCS file: /cvsroot/pure-data/externals/grill/vst/pd/help-vst~.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** help-vst~.pd 23 Aug 2004 02:42:15 -0000 1.2 --- help-vst~.pd 24 Aug 2004 02:44:37 -0000 1.3 *************** *** 1,18 **** ! #N canvas 180 14 842 665 12; #X obj 26 190 dac~; #X obj 26 94 noise~; - #X obj 473 178 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -225271 - -1 -1 0 1; - #X msg 470 195 param 2 \$1; #X obj 140 192 print A; ! #X obj 27 451 tgl 15 0 empty empty empty 0 -6 0 8 -225271 -1 -1 0 1 ! ; ! #X msg 26 473 vis \$1; ! #X obj 27 367 tgl 15 0 empty empty empty 0 -6 0 8 -225271 -1 -1 0 1 ; ! #X msg 26 389 edit \$1; ! #X msg 94 389 getedit; ! #X msg 89 473 getvis; ! #N canvas 367 122 550 426 info 0; #X msg 94 130 getversion; #X msg 94 75 getname; --- 1,15 ---- ! #N canvas 130 41 801 527 12; #X obj 26 190 dac~; #X obj 26 94 noise~; #X obj 140 192 print A; ! #X obj 230 433 tgl 15 0 empty empty empty 0 -6 0 8 -225271 -1 -1 0 ! 1; ! #X msg 229 455 vis \$1; ! #X obj 25 430 tgl 15 0 empty empty empty 0 -6 0 8 -225271 -1 -1 0 1 ; ! #X msg 24 452 edit \$1; ! #X msg 92 452 getedit; ! #X msg 292 455 getvis; ! #N canvas 367 122 558 434 info 0; #X msg 94 130 getversion; #X msg 94 75 getname; *************** *** 54,81 **** #X connect 21 0 7 0; #X connect 23 0 7 0; ! #X restore 26 616 pd info; #X obj 96 96 r \$0-vst; ! #X obj 25 416 s \$0-vst; ! #X obj 25 499 s \$0-vst; ! #X text 52 366 display edit window; ! #X text 50 449 make edit window (in)visible; ! #X obj 432 360 s \$0-vst; ! #X obj 409 617 s \$0-vst; ! #X msg 532 478 getprogram; ! #X msg 433 96 getparams; ! #X text 511 96 get number of parameters; ! #X text 504 406 get number of programs; ! #X msg 409 409 getprograms; ! #X msg 572 196 getparam 2; #X msg 105 295 getplug; #X obj 26 323 s \$0-vst; #X text 65 249 set/get plugin; ! #X text 92 616 further information; #X obj 23 15 cnv 15 750 58 empty empty vst~ 10 32 0 24 -260818 -1 0 ; - #X text 134 53 http://www.parasitaere-kapazitaeten.net; #X text 137 173 attribute outlet; #X text 103 137 inlets outlets [plugname]; ! #N canvas 367 122 465 214 win 0; #X obj 34 160 s \$0-vst; #X msg 26 109 getx; --- 51,69 ---- #X connect 21 0 7 0; #X connect 23 0 7 0; ! #X restore 445 110 pd info; #X obj 96 96 r \$0-vst; ! #X obj 23 479 s \$0-vst; ! #X obj 228 481 s \$0-vst; ! #X text 50 429 display edit window; ! #X text 253 431 make edit window (in)visible; #X msg 105 295 getplug; #X obj 26 323 s \$0-vst; #X text 65 249 set/get plugin; ! #X text 511 110 further information; #X obj 23 15 cnv 15 750 58 empty empty vst~ 10 32 0 24 -260818 -1 0 ; #X text 137 173 attribute outlet; #X text 103 137 inlets outlets [plugname]; ! #N canvas 367 122 477 226 win 0; #X obj 34 160 s \$0-vst; #X msg 26 109 getx; *************** *** 96,111 **** #X connect 6 0 7 0; #X connect 7 0 0 0; ! #X restore 26 542 pd win; ! #X text 92 542 manipulating the edit window; ! #X msg 470 242 param gain 0; ! #X text 542 144 get parameter name; ! #X text 484 312 get value in textual representation; ! #X text 495 217 set/get parameter (0-based); ! #X text 463 497 set/get program (0-based); #X msg 28 296 plug \$1; #X obj 27 240 bng 25 250 50 0 empty empty empty 0 -6 0 8 -225271 -1 -1; #X obj 27 271 openpanel; ! #N canvas 461 281 490 335 midi 0; #X obj 20 279 s \$0-vst; #X msg 238 147 ctlchg 3 123; --- 84,94 ---- #X connect 6 0 7 0; #X connect 7 0 0 0; ! #X restore 446 244 pd win; ! #X text 512 244 manipulating the edit window; #X msg 28 296 plug \$1; #X obj 27 240 bng 25 250 50 0 empty empty empty 0 -6 0 8 -225271 -1 -1; #X obj 27 271 openpanel; ! #N canvas 461 281 498 343 midi 0; #X obj 20 279 s \$0-vst; #X msg 238 147 ctlchg 3 123; *************** *** 119,134 **** #X text 315 282 after touch; #X obj 238 213 nbx 5 14 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 ! 10 -262144 -1 -1 0 256; #X obj 238 264 nbx 5 14 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 ! 10 -262144 -1 -1 0 256; #X msg 237 233 pbend \$1; #X msg 236 283 atouch \$1; #X obj 35 71 nbx 5 14 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 10 ! -262144 -1 -1 0 256; #X msg 20 29 note 10 100; #X msg 36 94 note \$1 100; #X msg 193 94 noteoff \$1; #X obj 194 72 nbx 5 14 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 ! 10 -262144 -1 -1 0 256; #X connect 1 0 0 0; #X connect 7 0 0 0; --- 102,117 ---- #X text 315 282 after touch; #X obj 238 213 nbx 5 14 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 ! 10 -225271 -1 -1 0 256; #X obj 238 264 nbx 5 14 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 ! 10 -225271 -1 -1 0 256; #X msg 237 233 pbend \$1; #X msg 236 283 atouch \$1; #X obj 35 71 nbx 5 14 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 10 ! -225271 -1 -1 0 256; #X msg 20 29 note 10 100; #X msg 36 94 note \$1 100; #X msg 193 94 noteoff \$1; #X obj 194 72 nbx 5 14 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 ! 10 -225271 -1 -1 0 256; #X connect 1 0 0 0; #X connect 7 0 0 0; *************** *** 143,230 **** #X connect 17 0 0 0; #X connect 18 0 17 0; ! #X restore 25 581 pd midi; ! #X text 93 582 midi messages for vst synths; ! #X msg 409 434 getprogcats; ! #X text 504 431 get number of program categories; #X text 134 33 based on the work of Jarno Seppanen and Mark Williamson ; #X text 133 14 VST plugins for PD \, (C)2003-04 Thomas Grill; #X obj 26 140 vst~ 1 2 @pnames 100; ! #X obj 741 569 loadbang; ! #X msg 741 596 \; pd dsp 1; ! #X obj 228 339 tgl 15 0 empty empty empty 0 -6 0 8 -225271 -1 -1 0 1; ! #X obj 226 388 s \$0-vst; ! #X msg 227 361 bypass \$1; ! #X msg 309 361 getbypass; ! #X text 253 338 bypass plugin; ! #X obj 228 245 tgl 15 0 empty empty empty 0 -6 0 8 -225271 -1 -1 0 1; ! #X obj 226 294 s \$0-vst; ! #X text 253 244 mute output; ! #X msg 227 267 mute \$1; ! #X msg 309 267 getmute; ! #X msg 429 478 program \$1; ! #X obj 430 462 nbx 5 14 0 10000 0 0 empty empty empty 0 -6 0 10 -225271 -1 -1 0 256; ! #X msg 471 290 getptext \$1; ! #X obj 471 273 nbx 5 14 0 10000 0 0 empty empty empty 0 -6 0 10 -225271 -1 -1 0 256; ! #X obj 450 128 nbx 5 14 0 10000 0 0 empty empty empty 0 -6 0 10 -225271 -1 -1 0 256; ! #X msg 450 146 getpname \$1; ! #X msg 576 290 getptext gain; ! #X msg 580 242 getparam gain; ! #X obj 434 516 nbx 5 14 0 10000 0 0 empty empty empty 0 -6 0 10 -225271 -1 -1 0 256; ! #X msg 432 533 getprogname \$1; ! #X text 552 530 get program name; ! #X obj 433 567 nbx 5 14 0 10000 0 0 empty empty empty 0 -6 0 10 -225271 -1 -1 0 256; ! #X text 569 582 get program name; ! #X msg 431 584 getprogname 2 \$1; ! #X text 571 596 (with category); ! #X text 480 328 (may be ambigous!); ! #X text 568 544 (no category); ! #X connect 1 0 49 0; ! #X connect 2 0 3 0; ! #X connect 3 0 17 0; #X connect 5 0 6 0; ! #X connect 6 0 14 0; ! #X connect 7 0 8 0; ! #X connect 8 0 13 0; ! #X connect 9 0 13 0; ! #X connect 10 0 14 0; ! #X connect 12 0 49 0; ! #X connect 19 0 18 0; ! #X connect 20 0 17 0; ! #X connect 23 0 18 0; ! #X connect 24 0 17 0; #X connect 25 0 26 0; ! #X connect 35 0 17 0; ! #X connect 40 0 26 0; ! #X connect 41 0 42 0; ! #X connect 42 0 40 0; ! #X connect 45 0 18 0; ! #X connect 49 0 0 0; ! #X connect 49 1 0 1; ! #X connect 49 2 4 0; ! #X connect 50 0 51 0; ! #X connect 52 0 54 0; ! #X connect 54 0 53 0; ! #X connect 55 0 53 0; ! #X connect 57 0 60 0; ! #X connect 60 0 58 0; ! #X connect 61 0 58 0; ! #X connect 62 0 18 0; ! #X connect 63 0 62 0; ! #X connect 64 0 17 0; ! #X connect 65 0 64 0; ! #X connect 66 0 67 0; ! #X connect 67 0 17 0; ! #X connect 68 0 17 0; ! #X connect 69 0 17 0; ! #X connect 70 0 71 0; ! #X connect 71 0 18 0; ! #X connect 73 0 75 0; ! #X connect 75 0 18 0; --- 126,236 ---- #X connect 17 0 0 0; #X connect 18 0 17 0; ! #X restore 445 208 pd midi; #X text 134 33 based on the work of Jarno Seppanen and Mark Williamson ; #X text 133 14 VST plugins for PD \, (C)2003-04 Thomas Grill; #X obj 26 140 vst~ 1 2 @pnames 100; ! #X obj 666 433 loadbang; ! #X msg 666 460 \; pd dsp 1; ! #X obj 230 324 tgl 15 0 empty empty empty 0 -6 0 8 -225271 -1 -1 0 1; ! #X obj 228 373 s \$0-vst; ! #X msg 229 346 bypass \$1; ! #X msg 311 346 getbypass; ! #X text 255 323 bypass plugin; ! #X obj 231 240 tgl 15 0 empty empty empty 0 -6 0 8 -225271 -1 -1 0 1; ! #X obj 229 289 s \$0-vst; ! #X text 256 239 mute output; ! #X msg 230 262 mute \$1; ! #X msg 312 262 getmute; ! #N canvas 200 110 473 372 parameters 0; ! #X obj 84 118 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -225271 ! -1 -1 0 1; ! #X msg 81 135 param 2 \$1; ! #X obj 40 324 s \$0-vst; ! #X msg 44 36 getparams; ! #X text 122 36 get number of parameters; ! #X msg 183 136 getparam 2; ! #X msg 84 192 param gain 0; ! #X text 153 84 get parameter name; ! #X text 97 267 get value in textual representation; ! #X text 106 157 set/get parameter (0-based); ! #X msg 84 245 getptext \$1; ! #X obj 84 228 nbx 5 14 0 10000 0 0 empty empty empty 0 -6 0 10 -225271 -1 -1 0 256; ! #X obj 61 68 nbx 5 14 0 10000 0 0 empty empty empty 0 -6 0 10 -225271 -1 -1 0 256; ! #X msg 61 86 getpname \$1; ! #X msg 189 245 getptext gain; ! #X msg 191 192 getparam gain; ! #X text 93 283 (may be ambigous!); ! #X connect 0 0 1 0; ! #X connect 1 0 2 0; ! #X connect 3 0 2 0; ! #X connect 5 0 2 0; ! #X connect 6 0 2 0; ! #X connect 10 0 2 0; ! #X connect 11 0 10 0; ! #X connect 12 0 13 0; ! #X connect 13 0 2 0; ! #X connect 14 0 2 0; ! #X connect 15 0 2 0; ! #X restore 444 143 pd parameters; ! #N canvas 0 0 458 308 programs 0; ! #X obj 39 245 s \$0-vst; ! #X msg 162 106 getprogram; ! #X text 134 34 get number of programs; ! #X msg 39 37 getprograms; ! #X text 93 125 set/get program (0-based); ! #X msg 39 62 getprogcats; ! #X text 134 59 get number of program categories; ! #X msg 59 106 program \$1; ! #X obj 60 90 nbx 5 14 0 10000 0 0 empty empty empty 0 -6 0 10 -225271 -1 -1 0 256; ! #X obj 64 144 nbx 5 14 0 10000 0 0 empty empty empty 0 -6 0 10 -225271 -1 -1 0 256; ! #X msg 62 161 getprogname \$1; ! #X text 182 158 get program name; ! #X obj 63 195 nbx 5 14 0 10000 0 0 empty empty empty 0 -6 0 10 -225271 -1 -1 0 256; ! #X text 199 210 get program name; ! #X msg 61 212 getprogname 2 \$1; ! #X text 201 224 (with category); ! #X text 198 172 (no category); ! #X connect 1 0 0 0; ! #X connect 3 0 0 0; ! #X connect 5 0 0 0; ! #X connect 7 0 0 0; ! #X connect 8 0 7 0; ! #X connect 9 0 10 0; ! #X connect 10 0 0 0; ! #X connect 12 0 14 0; ! #X connect 14 0 0 0; ! #X restore 445 175 pd programs; ! #X text 561 144 VST parameters; ! #X text 562 175 VST programs; ! #X text 134 53 http://grrrr.org; ! #X text 513 209 midi messages for VST synths; ! #X connect 1 0 30 0; ! #X connect 3 0 4 0; ! #X connect 4 0 12 0; #X connect 5 0 6 0; ! #X connect 6 0 11 0; ! #X connect 7 0 11 0; ! #X connect 8 0 12 0; ! #X connect 10 0 30 0; ! #X connect 15 0 16 0; ! #X connect 24 0 16 0; #X connect 25 0 26 0; ! #X connect 26 0 24 0; ! #X connect 30 0 0 0; ! #X connect 30 1 0 1; ! #X connect 30 2 2 0; ! #X connect 31 0 32 0; ! #X connect 33 0 35 0; ! #X connect 35 0 34 0; ! #X connect 36 0 34 0; ! #X connect 38 0 41 0; ! #X connect 41 0 39 0; ! #X connect 42 0 39 0;

1 0

externals/grill/pool help-pool.pd,1.4,1.5
by Thomas Grill 24 Aug '04

24 Aug '04

Update of /cvsroot/pure-data/externals/grill/pool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13337 Modified Files: help-pool.pd Log Message: "" Index: help-pool.pd =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/help-pool.pd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** help-pool.pd 17 Aug 2004 04:11:28 -0000 1.4 --- help-pool.pd 24 Aug 2004 02:40:02 -0000 1.5 *************** *** 1,3 **** ! #N canvas 4 3 927 697 12; #X msg 296 105 set 1 2 3; #X obj 238 631 print K; --- 1,3 ---- ! #N canvas 4 3 931 701 12; #X msg 296 105 set 1 2 3; #X obj 238 631 print K; *************** *** 194,200 **** #X text 174 517 data is shared among pool objects with the same name ; ! #X obj 26 10 cnv 15 850 40 empty empty pool 10 22 0 24 -260818 -1 0 ; - #X text 272 33 http://www.parasitaere-kapazitaeten.net; #X obj 386 553 print A; #X text 458 552 attributes; --- 194,199 ---- #X text 174 517 data is shared among pool objects with the same name ; ! #X obj 26 10 cnv 15 850 45 empty empty pool 10 22 0 24 -260818 -1 0 ; #X obj 386 553 print A; #X text 458 552 attributes; *************** *** 230,266 **** #X text 272 13 a hierarchical storage object \, (C)2002-2004 Thomas Grill; ! #X connect 0 0 71 0; ! #X connect 2 0 71 0; ! #X connect 3 0 71 0; ! #X connect 6 0 71 0; ! #X connect 7 0 71 0; ! #X connect 8 0 71 0; ! #X connect 9 0 71 0; ! #X connect 10 0 71 0; ! #X connect 11 0 71 0; #X connect 12 0 11 0; #X connect 13 0 14 0; ! #X connect 14 0 71 0; ! #X connect 22 0 71 0; ! #X connect 23 0 71 0; ! #X connect 25 0 71 0; ! #X connect 27 0 71 0; ! #X connect 32 0 71 0; ! #X connect 33 0 71 0; ! #X connect 44 0 71 0; ! #X connect 47 0 71 0; ! #X connect 49 0 71 0; ! #X connect 60 0 71 0; ! #X connect 66 0 71 0; ! #X connect 67 0 71 0; ! #X connect 68 0 71 0; ! #X connect 69 0 71 0; ! #X connect 70 0 71 0; ! #X connect 71 0 4 0; ! #X connect 71 1 1 0; ! #X connect 71 2 5 0; ! #X connect 71 3 17 0; ! #X connect 71 4 64 0; ! #X connect 74 0 71 0; ! #X connect 75 0 71 0; ! #X connect 76 0 71 0; --- 229,266 ---- #X text 272 13 a hierarchical storage object \, (C)2002-2004 Thomas Grill; ! #X text 272 33 http://grrrr.org; ! #X connect 0 0 70 0; ! #X connect 2 0 70 0; ! #X connect 3 0 70 0; ! #X connect 6 0 70 0; ! #X connect 7 0 70 0; ! #X connect 8 0 70 0; ! #X connect 9 0 70 0; ! #X connect 10 0 70 0; ! #X connect 11 0 70 0; #X connect 12 0 11 0; #X connect 13 0 14 0; ! #X connect 14 0 70 0; ! #X connect 22 0 70 0; ! #X connect 23 0 70 0; ! #X connect 25 0 70 0; ! #X connect 27 0 70 0; ! #X connect 32 0 70 0; ! #X connect 33 0 70 0; ! #X connect 44 0 70 0; ! #X connect 47 0 70 0; ! #X connect 49 0 70 0; ! #X connect 60 0 70 0; ! #X connect 65 0 70 0; ! #X connect 66 0 70 0; ! #X connect 67 0 70 0; ! #X connect 68 0 70 0; ! #X connect 69 0 70 0; ! #X connect 70 0 4 0; ! #X connect 70 1 1 0; ! #X connect 70 2 5 0; ! #X connect 70 3 17 0; ! #X connect 70 4 63 0; ! #X connect 73 0 70 0; ! #X connect 74 0 70 0; ! #X connect 75 0 70 0;

1 0

externals/grill/flext/source flattr.cpp,1.23,1.24 flprefix.h,1.28,1.29 flstdc.h,1.25,1.26 flthr.cpp,1.24,1.25
by Thomas Grill 24 Aug '04

24 Aug '04

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11329/source Modified Files: flattr.cpp flprefix.h flstdc.h flthr.cpp Log Message: "" Index: flprefix.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flprefix.h,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** flprefix.h 21 Jun 2004 13:58:19 -0000 1.28 --- flprefix.h 24 Aug 2004 02:34:30 -0000 1.29 *************** *** 341,346 **** #ifdef FLEXT_THREADS #undef FLEXT_THREADS ! #if FLEXT_OS == FLEXT_OS_MAC && FLEXT_SYS == FLEXT_SYS_MAX ! // Max crashes with posix threads (because it's in the CFM model) #define FLEXT_THREADS FLEXT_THR_MP #elif FLEXT_SYS == FLEXT_SYS_MAX && FLEXT_OS == FLEXT_OS_WIN --- 341,346 ---- #ifdef FLEXT_THREADS #undef FLEXT_THREADS ! #if FLEXT_SYS == FLEXT_SYS_MAX && FLEXT_OS == FLEXT_OS_MAC && FLEXT_OSAPI != FLEXT_OSAPI_MAC_MACH ! // Max for CFM doesn't like posix threads #define FLEXT_THREADS FLEXT_THR_MP #elif FLEXT_SYS == FLEXT_SYS_MAX && FLEXT_OS == FLEXT_OS_WIN Index: flattr.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flattr.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** flattr.cpp 20 Apr 2004 02:33:04 -0000 1.23 --- flattr.cpp 24 Aug 2004 02:34:30 -0000 1.24 *************** *** 170,174 **** bool flext_base::ListAttrib() const { ! if(procattr) { AtomList la; ListAttrib(la); --- 170,174 ---- bool flext_base::ListAttrib() const { ! if(procattr) { AtomList la; ListAttrib(la); Index: flthr.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flthr.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** flthr.cpp 23 Aug 2004 02:33:18 -0000 1.24 --- flthr.cpp 24 Aug 2004 02:34:30 -0000 1.25 *************** *** 51,77 **** - #if defined(FLEXT_THREADS) && FLEXT_SYS == FLEXT_SYS_MAX && FLEXT_OS == FLEXT_OS_MAC && FLEXT_THREADS == FLEXT_THR_POSIX - // utility code taken from from Apple's CFM_MachO_CFM example: - // - // This function allocates a block of CFM glue code which contains the instructions to call CFM routines - // - (void (*)(void *))MachOFunctionPointerForCFMFunctionPointer( (void (*)(void *))cfmfp ) - { - // Apple utility code for CFM callback glue - static const UInt32 tmpl[6] = {0x3D800000, 0x618C0000, 0x800C0000, 0x804C0004, 0x7C0903A6, 0x4E800420}; - UInt32 *mfp = (UInt32*) NewPtr( sizeof(tmpl) ); // Must later dispose of allocated memory - // (this is freed with app heap in this object) - mfp[0] = tmpl[0] | ((UInt32)cfmfp >> 16); - mfp[1] = tmpl[1] | ((UInt32)cfmfp & 0xFFFF); - mfp[2] = tmpl[2]; - mfp[3] = tmpl[3]; - mfp[4] = tmpl[4]; - mfp[5] = tmpl[5]; - MakeDataExecutable( mfp, sizeof(tmpl) ); - return (void (*)(void *))mfp; - } - #endif - - flext::thrid_t flext::GetSysThreadId() { return thrid; } --- 51,54 ---- *************** *** 101,111 **** thrhelpexit = false; ! #if FLEXT_SYS == FLEXT_SYS_MAX && FLEXT_OS == FLEXT_OS_MAC ! void (*CFMThrHelper)(void *) = MachOFunctionPointerForCFMFunctionPointer(ThrHelper); ! int ret = pthread_create (&thrhelpid,&attr,(void *(*)(void *))CFMThrHelper,NULL); ! #else ! int ret = pthread_create (&thrhelpid,&attr,(void *(*)(void *))ThrHelper,NULL); ! #endif ! ok = !ret; #elif FLEXT_THREADS == FLEXT_THR_MP if(!MPLibraryIsLoaded()) --- 78,82 ---- thrhelpexit = false; ! ok = pthread_create (&thrhelpid,&attr,(void *(*)(void *))ThrHelper,NULL) == 0; #elif FLEXT_THREADS == FLEXT_THR_MP if(!MPLibraryIsLoaded()) Index: flstdc.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flstdc.h,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** flstdc.h 11 Aug 2004 04:04:25 -0000 1.25 --- flstdc.h 24 Aug 2004 02:34:30 -0000 1.26 *************** *** 97,106 **** #if FLEXT_OS == FLEXT_OS_MAC ! #ifndef __MRC__ ! #define powerc ! #endif ! #define __MOTO__ 0 ! #include <MacTypes.h> #elif FLEXT_OS == FLEXT_OS_WIN #define WIN_VERSION 1 --- 97,112 ---- #if FLEXT_OS == FLEXT_OS_MAC ! #if FLEXT_OSAPI == FLEXT_OSAPI_MAC_MACH ! // MachO version - must insert prefix header ! #include <ext_carbon_prefix.h> ! #else ! // CFM version ! #ifndef __MRC__ ! #define powerc ! #endif ! #define __MOTO__ 0 ! #include <MacTypes.h> ! #endif #elif FLEXT_OS == FLEXT_OS_WIN #define WIN_VERSION 1

1 0

externals/grill/flext build-max-darwin.sh,NONE,1.1 config-max-darwin.txt,NONE,1.1 makefile.max-darwin,NONE,1.1 changes.txt,1.51,1.52 readme.txt,1.46,1.47
by Thomas Grill 24 Aug '04

24 Aug '04

Update of /cvsroot/pure-data/externals/grill/flext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11329 Modified Files: changes.txt readme.txt Added Files: build-max-darwin.sh config-max-darwin.txt makefile.max-darwin Log Message: "" --- NEW FILE: build-max-darwin.sh --- #!/bin/sh . config-max-darwin.txt make -f makefile.max-darwin && { if [ $INSTDIR != "" ]; then echo Now install as root sudo make -f makefile.max-darwin install fi } Index: readme.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/readme.txt,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** readme.txt 11 Aug 2004 04:04:25 -0000 1.46 --- readme.txt 24 Aug 2004 02:34:30 -0000 1.47 *************** *** 122,125 **** --- 122,129 ---- + o GCC: edit "config-max-darwin.txt" & run "sh build-max-darwin.sh" + additional settings (e.g. target processor, compiler flags) can be made in makefile.max-darwin + + With your project using flext, be sure to define "FLEXT_SYS=1" - alternatively use the prefix file "flcwmax-x.h" or "flcwmax-x-thr.h" for threading support. --- NEW FILE: makefile.max-darwin --- # flext - C++ layer for Max/MSP and pd (pure data) externals # Copyright (c) 2001-2004 Thomas Grill (xovo(a)gmx.net) # # Makefile for gcc @ darwin # # usage: # to build run "make -f makefile.max-darwin" # to install (as root), do "make -f makefile.max-darwin install" # CONFIG=config-max-darwin.txt include ${CONFIG} # compiler+linker stuff # the MaxMSP SDK path is directly inserted with the FLAGS below because it normally contains spaces... INCLUDES= FLAGS=-I${MAXSDKPATH}/max-includes -I${MAXSDKPATH}/msp-includes -DFLEXT_SYS=1 ${UFLAGS} # compiler flags for optimized build CFLAGS=-O2 # compiler flags for debug build CFLAGS_D=-g # additional flags for threading CFLAGS_T=-DFLEXT_THREADS # additional flags for shared library CFLAGS_S=-DFLEXT_SHARED -DFLEXT_EXPORTS # flags for shared linking LSHFLAGS= -dylib -dynamic -flat_namespace -undefined suppress # frameworks FRAMEWORKS=MaxAPI MaxAudioAPI # ---------------------------------------------- # the rest can stay untouched # ---------------------------------------------- NAME=flext SRCDIR=./source # all the source files from the package include make-files.txt ifdef SNDOBJ INCLUDES+=$(SNDOBJ) SRCS+=$(SRCS_SNDOBJ) HDRS+=$(HDRS_SNDOBJ) endif ifdef STK INCLUDES+=$(STK) SRCS+=$(SRCS_STK) HDRS+=$(HDRS_STK) endif MAKEFILE=makefile.max-darwin TARGET=$(TARGDIR)/lib$(NAME).a TARGET_D=$(TARGDIR)/lib$(NAME)_d.a TARGET_T=$(TARGDIR)/lib$(NAME)_t.a TARGET_TD=$(TARGDIR)/lib$(NAME)_td.a TARGET_S=$(TARGDIR)/lib$(NAME).dylib TARGET_SD=$(TARGDIR)/lib$(NAME)_d.dylib all: $(TARGDIR) $(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD) # $(TARGET_S) $(TARGET_SD) $(TARGDIR): mkdir $(TARGDIR) $(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(patsubst %,$(SRCDIR)/%,$(IHDRS)) $(MAKEFILE) $(CONFIG) touch $@ $(TARGDIR)/%.o : $(SRCDIR)/%.cpp $(CXX) -c -dynamic $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $(patsubst %,-F%,$(FRAMEWORKS)) $< -o $@ $(TARGDIR)/%.do : $(SRCDIR)/%.cpp $(CXX) -c -dynamic $(CFLAGS_D) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $(patsubst %,-F%,$(FRAMEWORKS)) $< -o $@ $(TARGDIR)/%.to : $(SRCDIR)/%.cpp $(CXX) -c -dynamic $(CFLAGS) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $(patsubst %,-F%,$(FRAMEWORKS)) $< -o $@ $(TARGDIR)/%.tdo : $(SRCDIR)/%.cpp $(CXX) -c -dynamic $(CFLAGS_D) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $(patsubst %,-F%,$(FRAMEWORKS)) $< -o $@ $(TARGDIR)/%.so : $(SRCDIR)/%.cpp $(CXX) -c -dynamic $(CFLAGS) $(CFLAGS_T) $(CFLAGS_S) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $(patsubst %,-F%,$(FRAMEWORKS)) $< -o $@ $(TARGDIR)/%.sdo : $(SRCDIR)/%.cpp $(CXX) -c -dynamic $(CFLAGS_D) $(CFLAGS_T) $(CFLAGS_S) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $(patsubst %,-F%,$(FRAMEWORKS)) $< -o $@ $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) libtool -static -o $@ $^ $(TARGET_D) : $(patsubst %.cpp,$(TARGDIR)/%.do,$(SRCS)) libtool -static -o $@ $^ $(TARGET_T) : $(patsubst %.cpp,$(TARGDIR)/%.to,$(SRCS)) libtool -static -o $@ $^ $(TARGET_TD) : $(patsubst %.cpp,$(TARGDIR)/%.tdo,$(SRCS)) libtool -static -o $@ $^ $(TARGET_S) : $(patsubst %.cpp,$(TARGDIR)/%.so,$(SRCS)) ld $(LSHFLAGS) -o $@ $^ -ldylib1.o -lgcc -lstdc++ $(patsubst %,-framework %,$(FRAMEWORKS)) $(TARGET_SD) : $(patsubst %.cpp,$(TARGDIR)/%.sdo,$(SRCS)) ld $(LSHFLAGS) -o $@ $^ -ldylib1.o -lgcc -lstdc++ $(patsubst %,-framework %,$(FRAMEWORKS)) .PHONY: clean install clean: rm -f $(TARGDIR)/*.{o,do,to,tdo,so,sdo} $(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD) $(TARGET_S) $(TARGET_SD) ifdef INSTDIR $(INSTDIR): -mkdir $(INSTDIR) install:: $(INSTDIR) endif install:: $(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD) $(TARGET_S) $(TARGET_SD) $(patsubst %,$(SRCDIR)/%,$(HDRS)) cp $^ $(INSTDIR) mv $(INSTDIR)/lib*.dylib /usr/local/lib ranlib $(INSTDIR)/*.a # have to rerun ranlib at install dir ?! #make compatibility links for old-style naming for i in $(foreach f,$(notdir $(filter %.a,$^)),$(patsubst lib%.a,%,$(f))); do rm -f $(INSTDIR)/$$i.a && ln -sf lib$$i.a $(INSTDIR)/$$i.a; done # chmod 755 $(patsubst %,$(INSTDIR)/%,$(notdir $^)) # chgrp admin $(patsubst %,$(INSTDIR)/%,$(notdir $^)) --- NEW FILE: config-max-darwin.txt --- # flext - C++ layer for Max/MSP and pd (pure data) externals # Copyright (c) 2001-2004 Thomas Grill (xovo(a)gmx.net) # # your c++ compiler (define only if it's different than g++) # CXX=g++-3.3 # where is the Max SDK? (version 4.5 upwards!!) MAXSDKPATH="/Volumes/Daten/Prog/MaxMSP-SDK/4.5 headers/c74support" # where is the SndObj include directory? # (leave blank or comment out to disable SndObj support) # SNDOBJ=/usr/src/sndobj/include # where is the STK include directory? # (leave blank or comment out to disable STK support) # STK=/usr/src/stk/include # where should flext libraries be built? TARGDIR=./max-darwin # where should flext libraries be installed? # (leave blank to omit installation) INSTDIR="/Library/Application Support/Cycling '74/flext" # additional compiler flags # (check if they fit for your system!) UFLAGS=-DFLEXT_USE_SIMD -malign-power -maltivec -faltivec Index: changes.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/changes.txt,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** changes.txt 23 Aug 2004 02:33:16 -0000 1.51 --- changes.txt 24 Aug 2004 02:34:30 -0000 1.52 *************** *** 21,25 **** - small fixes for MSVC6 incompatibilites - fixes for Max 4.5 headers ! - removed Mach-O/CFM glue stuff again....Max has gone Mach-O in the meantime... - in flext::StopThread don't wait for thread to have stopped! --- 21,25 ---- - small fixes for MSVC6 incompatibilites - fixes for Max 4.5 headers ! - removed Mach-O/CFM glue stuff again and added makefiles for Max/MachO - in flext::StopThread don't wait for thread to have stopped! *************** *** 303,306 **** --- 303,307 ---- - SIMD for gcc - individual apply buttons for each attribute in the attribute editor + - Max/MSP MachO support bugs:

1 0

externals/ggee/signal rtin~.c,1.1.1.1,1.2
by carmen rocco 23 Aug '04

23 Aug '04

Update of /cvsroot/pure-data/externals/ggee/signal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18503/ggee/signal Modified Files: rtin~.c Log Message: hd-clear (NT) Index: rtin~.c =================================================================== RCS file: /cvsroot/pure-data/externals/ggee/signal/rtin~.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** rtin~.c 17 Jun 2002 10:13:56 -0000 1.1.1.1 --- rtin~.c 23 Aug 2004 03:48:56 -0000 1.2 *************** *** 1,14 **** /* (C) Guenter Geiger <geiger(a)epy.co.at> */ ! #include <sys/types.h> ! #include <sys/stat.h> ! #include <fcntl.h> ! #include <sys/time.h> ! #include <unistd.h> ! ! // int gettimeofday(struct timeval *tv, struct timezone *tz); ! ! #include "math.h" --- 1,19 ---- /* (C) Guenter Geiger <geiger(a)epy.co.at> */ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> + #include <sys/time.h> + #include <unistd.h> ! #ifdef NT ! #include <sys/timeb.h> ! void gettimeofday(struct timeval* t,void* timezone) ! { struct timeb timebuffer; ! ftime( &timebuffer ); ! t->tv_sec=timebuffer.time; ! t->tv_usec=1000*timebuffer.millitm; ! } ! #endif #include "math.h"

1 0

← Newer
1
2
3
4
5
6
7
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs August 2004