zynaddsubfx

commit 4bea107ae7a33e76e9f08d782679ffee364f61c9
parent 7dbe0468c285731e145d1f23ff48ea53d1791fc5
Author: paulnasca <paulnasca>
Date:   Sun,  6 Mar 2005 18:51:33 +0000

*** empty log message ***

Diffstat:
M
ChangeLog
 | 
2
+-
M
ExternalPrograms/Controller/compile.sh
 | 
8
++++----
M
ExternalPrograms/Spliter/compile.sh
 | 
8
++++----
M
src/Makefile
 | 
2
+-
M
src/Seq/MIDIFile.C
 | 
8
++++----
M
src/Seq/Sequencer.C
 | 
22
+++++++++++-----------

6 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -770,7 +770,7 @@
 28 Feb 2005 - Corectata o mica eroare care facea ca sa nu se afiseze intotdeauna corect detune-ul la ADvoice
 	    - Afisajul VU-meter la Master nu mai prezinta variatii mari in timp scurt
 	    - Adaugata afisajul RMS la VU-meter
-	    
+06 Mar 2005 - Facute cateva mici modificari referitoare in special la warning-uri    
 
 
 
diff --git a/ExternalPrograms/Controller/compile.sh b/ExternalPrograms/Controller/compile.sh
@@ -1,8 +1,8 @@
-clean.sh
+./clean.sh
 fluid -c ControllerUI.fl
-gcc -c ControllerUI.cxx -o ControllerUI.o
-gcc -c Controller.C -o Controller.o
-gcc -c main.C -o main.o
+gcc `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
+gcc `fltk-config --cflags` -c Controller.C -o Controller.o
+gcc `fltk-config --cflags` -c main.C -o main.o
 
 
 
diff --git a/ExternalPrograms/Spliter/compile.sh b/ExternalPrograms/Spliter/compile.sh
@@ -1,8 +1,8 @@
-clean.sh
+./clean.sh
 fluid -c SpliterUI.fl
-gcc -c SpliterUI.cxx -o SpliterUI.o
-gcc -c Spliter.C -o Spliter.o
-gcc -c main.C -o main.o
+gcc `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
+gcc `fltk-config --cflags` -c Spliter.C -o Spliter.o
+gcc `fltk-config --cflags` -c main.C -o main.o
 
 gcc -o spliter *.o `fltk-config --ldflags` -lasound
 
diff --git a/src/Makefile b/src/Makefile
@@ -63,7 +63,7 @@ SUBDIRS=DSP Effects Input Misc Output Params Synth Seq
 .PHONY: subdirs $(SUBDIRS)
 
 all:
-	yes " " | head
+#	yes " " | head
 	$(MAKE) -C UI $@
 #	@sh -c "cd UI ; $(CXX) -MM -MG -w *.cc >> ../Make.deps ; cd .."
 	@for name in $(SUBDIRS); do sh -c "cd $$name ; $(CXX) -MM -MG -w *.C >> ../Make.deps ; cd .."; done
diff --git a/src/Seq/MIDIFile.C b/src/Seq/MIDIFile.C
@@ -231,7 +231,7 @@ void MIDIFile::parsenoteoff(char ntrack,char chan,unsigned int dt){
     ///test 
 //    ntrack=0;
     
-    me->writeevent(&me->miditrack[ntrack].record,&me->tmpevent);
+    me->writeevent(&me->miditrack[(int)ntrack].record,&me->tmpevent);
     
 };
 
@@ -251,7 +251,7 @@ void MIDIFile::parsenoteon(char ntrack,char chan,unsigned int dt){
     me->tmpevent.par1=note;
     me->tmpevent.par2=vel;
     me->tmpevent.channel=chan;
-    me->writeevent(&me->miditrack[ntrack].record,&me->tmpevent);
+    me->writeevent(&me->miditrack[(int)ntrack].record,&me->tmpevent);
 
     
     
@@ -271,7 +271,7 @@ void MIDIFile::parsecontrolchange(char ntrack,char chan,unsigned int dt){
     me->tmpevent.par1=control;//???????????? ma uit la Sequencer::recordnote() din varianele vechi de zyn
     me->tmpevent.par2=value;
     me->tmpevent.channel=chan;
-    me->writeevent(&me->miditrack[ntrack].record,&me->tmpevent);
+    me->writeevent(&me->miditrack[(int)ntrack].record,&me->tmpevent);
     
 };
 
@@ -304,7 +304,7 @@ void MIDIFile::add_dt(char ntrack, unsigned int dt){
     me->tmpevent.par1=0;
     me->tmpevent.par2=0;
     me->tmpevent.channel=0;
-    me->writeevent(&me->miditrack[ntrack].record,&me->tmpevent);
+    me->writeevent(&me->miditrack[(int)ntrack].record,&me->tmpevent);
 };
 
 
diff --git a/src/Seq/Sequencer.C b/src/Seq/Sequencer.C
@@ -101,28 +101,28 @@ int Sequencer::getevent(char ntrack,int *midich, int *type,int *par1, int *par2)
     //test
 //    if (ntrack!=0) return(-1);
 
-    updatecounter(&playtime[ntrack]);
+    updatecounter(&playtime[(int)ntrack]);
 
 //    printf("%g %g\n",nextevent[ntrack].time,playtime[ntrack].abs);
 
-    if (nextevent[ntrack].time<playtime[ntrack].abs) readevent(&miditrack[ntrack].track,&nextevent[ntrack].ev);
+    if (nextevent[(int)ntrack].time<playtime[(int)ntrack].abs) readevent(&miditrack[(int)ntrack].track,&nextevent[(int)ntrack].ev);
 	else return(-1);
-    if (nextevent[ntrack].ev.type==-1) return(-1);
+    if (nextevent[(int)ntrack].ev.type==-1) return(-1);
 //    printf("********************************\n");    
 
     //sa pun aici o protectie. a.i. daca distanta dintre timpul curent si eveliment e prea mare (>1sec) sa elimin nota
 
-    if (ntrack==1) printf("_ %f %.2f  (%d)\n",nextevent[ntrack].time,playtime[ntrack].abs,nextevent[ntrack].ev.par2);
+    if (ntrack==1) printf("_ %f %.2f  (%d)\n",nextevent[(int)ntrack].time,playtime[(int)ntrack].abs,nextevent[(int)ntrack].ev.par2);
 
-    *type=nextevent[ntrack].ev.type;
-    *par1=nextevent[ntrack].ev.par1;
-    *par2=nextevent[ntrack].ev.par2;
-    *midich=nextevent[ntrack].ev.channel;
+    *type=nextevent[(int)ntrack].ev.type;
+    *par1=nextevent[(int)ntrack].ev.par1;
+    *par2=nextevent[(int)ntrack].ev.par2;
+    *midich=nextevent[(int)ntrack].ev.channel;
 
     
-    double dt=nextevent[ntrack].ev.deltatime*0.0001*realplayspeed;
-    printf("zzzzzzzzzzzzzz[%d] %d\n",ntrack,nextevent[ntrack].ev.deltatime);
-    nextevent[ntrack].time+=dt;
+    double dt=nextevent[(int)ntrack].ev.deltatime*0.0001*realplayspeed;
+    printf("zzzzzzzzzzzzzz[%d] %d\n",ntrack,nextevent[(int)ntrack].ev.deltatime);
+    nextevent[(int)ntrack].time+=dt;
 
 //    printf("%f   -  %d %d \n",nextevent[ntrack].time,par1,par2);
     return(0);//?? sau 1