commit 3812c13cd760a0e78c209ad5a0751cc46603b288
parent ffdf963b83240e9bb66e79afd952c85f8a77161b
Author: paulnasca <paulnasca>
Date: Wed, 4 Aug 2004 10:49:26 +0000
*** empty log message ***
Diffstat:
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -675,5 +675,6 @@
--------------------------------------------------------------------------------------------------
01 Aug 2004 - Adaugat un nou tip de OvertonesPosition la PADsynth
02 Aug 2004 - Am pus din nou schimbarea schedule-ului la valoare corecta (l-am scos dintr-o greseala)
-
+04 Aug 2004 - Am corectat niste erori la VST
+ - Merge VST, dar nu intotdeauna stabil (merge stabil pe vsthost.exe)
diff --git a/src/Makefile b/src/Makefile
@@ -62,10 +62,11 @@ all:
ifneq ($(AUDIOOUT),VST)
$(CXX) -o zynaddsubfx */*.o *.o $(LIBS)
else
- gcc -mdll -o temp1.tmp -Wl,--base-file,temp2.tmp */*.o *.o $(LIBS)
- dlltool --dllname zynaddsubfx_vst.dll --def zynaddsubfx_gcc.def --base-file temp2.tmp --output-exp temp3.tmp
- gcc -mdll -o zynaddsubfx_vst.dll */*.o *.o $(LIBS) -Wl,temp3.tmp
- rm temp1.tmp temp2.tmp temp3.tmp
+ gcc -shared -o zynaddsubfx_vst.dll */*.o *.o $(LIBS) zynaddsubfx_gcc.def
+# gcc -mdll -o temp1.tmp -Wl,--base-file,temp2.tmp */*.o *.o $(LIBS)
+# dlltool --dllname zynaddsubfx_vst.dll --def zynaddsubfx_gcc.def --base-file temp2.tmp --output-exp temp3.tmp
+# gcc -mdll -o zynaddsubfx_vst.dll */*.o *.o $(LIBS) -Wl,temp3.tmp
+# rm temp1.tmp temp2.tmp temp3.tmp
endif
objs:$(objects)
diff --git a/src/Output/VSTaudiooutput.C b/src/Output/VSTaudiooutput.C
@@ -25,8 +25,8 @@
//the constructor and the destructor are defined in main.C
void VSTSynth::process (float **inputs, float **outputs, long sampleframes){
- float *outl=inputs[0];
- float *outr=inputs[1];
+ float *outl=outputs[0];
+ float *outr=outputs[1];
pthread_mutex_lock(&vmaster->mutex);
vmaster->GetAudioOutSamples(sampleframes,(int) getSampleRate(),outl,outr);
pthread_mutex_unlock(&vmaster->mutex);
diff --git a/src/Output/VSTaudiooutput.h b/src/Output/VSTaudiooutput.h
@@ -44,7 +44,6 @@ class VSTSynth:public AudioEffectX{
MasterUI *ui;
int Pexitprogram;
-
Master *vmaster;
pthread_t thr;
};