zynaddsubfx

commit f8fb9c7eb8b7c7bc2613c28f7aa4e44709889466
parent 2860524c3db9f6c8cc978903c5fe68825d50245d
Author: paulnasca <paulnasca>
Date:   Thu, 27 May 2004 19:30:45 +0000

*** empty log message ***

Diffstat:
M
ChangeLog
 | 
2
+-
M
src/Seq/MIDIFile.C
 | 
2
+-
M
src/Seq/Sequencer.C
 | 
1
+

3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -564,6 +564,6 @@
 25 Mar 2004 - Continuat partea de analiza midi
 28 Mar 2004 - Scris partea de incarcat fisier midi 	    
 	    - Merge partial playerul
-	    
+26 Mai 2004 - Playerul merge bine cu un canal midi (rezolvata problema cu timing-ul)
 
 
diff --git a/src/Seq/MIDIFile.C b/src/Seq/MIDIFile.C
@@ -311,7 +311,7 @@ unsigned int MIDIFile::convertdt(unsigned int dt){
     double result=dt;
     printf("DT=%d\n",dt);
 
-    return((int) (result*5.0));
+    return((int) (result*15.0));
 };
 
 
diff --git a/src/Seq/Sequencer.C b/src/Seq/Sequencer.C
@@ -109,6 +109,7 @@ int Sequencer::getevent(char ntrack,int *midich, int *type,int *par1, int *par2)
     if (nextevent[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);