diff --git a/src/vstmain.cpp b/src/vstmain.cpp index 53f28624..329089ba 100755 --- a/src/vstmain.cpp +++ b/src/vstmain.cpp @@ -33,7 +33,8 @@ AudioEffect* createEffectInstance ( audioMasterCallback AudioMaster ) } CLlconVST::CLlconVST ( audioMasterCallback AudioMaster ) : - AudioEffectX ( AudioMaster, 1, 0 ) // 1 program with no parameters (=0) + AudioEffectX ( AudioMaster, 1, 0 ), // 1 program with no parameters (=0) + Client ( LLCON_DEFAULT_PORT_NUMBER ) { // stereo input/output setNumInputs ( 2 ); diff --git a/src/vstmain.h b/src/vstmain.h index ae82f90e..32828ac6 100755 --- a/src/vstmain.h +++ b/src/vstmain.h @@ -28,11 +28,16 @@ // copy the VST SDK in the llcon/windows directory: "llcon/windows/vstsdk2.4" to // get it work #include "audioeffectx.h" +#include +#include "global.h" +#include "client.h" /* Classes ********************************************************************/ -class CLlconVST : public AudioEffectX +class CLlconVST : public AudioEffectX, public QObject { + Q_OBJECT + public: CLlconVST ( audioMasterCallback AudioMaster ); @@ -50,6 +55,8 @@ public: protected: bool GetName ( char* cName ); char strProgName[kVstMaxProgNameLen + 1]; + + CClient Client; }; #endif /* !defined ( LLCONVST_HOIHGE76G34528_3_434DFGUHF1912__INCLUDED_ ) */ diff --git a/src/vstsound.h b/src/vstsound.h index e6b3fff6..945e25d0 100755 --- a/src/vstsound.h +++ b/src/vstsound.h @@ -31,7 +31,7 @@ /* Classes ********************************************************************/ -class CVSTSound : public CSoundBase +class CSound : public CSoundBase { public: CSound ( void (*fpNewCallback) ( CVector& psData, void* arg ), void* arg ); diff --git a/windows/MocQT.bat b/windows/MocQT.bat index c404a030..c92d66c0 100755 --- a/windows/MocQT.bat +++ b/windows/MocQT.bat @@ -43,6 +43,7 @@ rem .h -------------- %qtdir%\bin\moc.exe ..\src\soundbase.h -o moc\moc_soundbase.cpp %qtdir%\bin\moc.exe ..\src\testbench.h -o moc\moc_testbench.cpp %qtdir%\bin\moc.exe ..\src\serverlogging.h -o moc\moc_serverlogging.cpp +%qtdir%\bin\moc.exe ..\src\vstmain.h -o moc\moc_vstmain.cpp rem .ui ------------- diff --git a/windows/llcon.vcproj b/windows/llcon.vcproj index 2ec47e2a..06837d50 100755 --- a/windows/llcon.vcproj +++ b/windows/llcon.vcproj @@ -244,7 +244,7 @@ InlineFunctionExpansion="0" WholeProgramOptimization="true" AdditionalIncludeDirectories=""$(QTDIR)\include";"$(QTDIR)\include\Qt";../src;ASIOSDK2/common;ASIOSDK2/host;ASIOSDK2/host/pc;../libs/celt;vstsdk2.4\public.sdk\source\vst2.x;vstsdk2.4" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;QT_DLL;QT_THREAD_SUPPORT;USE_ALLOCA;_USRDLL;LLCON_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;QT_DLL;QT_THREAD_SUPPORT;USE_ALLOCA;LLCON_VST_PLUGIN;_USRDLL;LLCON_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1" StringPooling="false" RuntimeLibrary="0" EnableFunctionLevelLinking="false" @@ -1182,6 +1182,26 @@ /> + + + + + + + +