View | Details | Raw Unified
Collapse All | Expand All

(-) /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/Seq/MIDIFile.C (-4 / +4 lines)
 Lines 231-237    Link Here  
    ///test 
    ///test 
//    ntrack=0;
//    ntrack=0;
    
    
    me->writeevent(&me->miditrack[ntrack].record,&me->tmpevent);
 
    me->writeevent(&me->miditrack[(int)ntrack].record,&me->tmpevent);
 
    
    
};
};

  

    

    

       Lines 251-257
       
    
  Link Here 
    

  

        
    me->tmpevent.par1=note;
    me->tmpevent.par1=note;

        
    me->tmpevent.par2=vel;
    me->tmpevent.par2=vel;

        
    me->tmpevent.channel=chan;
    me->tmpevent.channel=chan;

            

              
    me->writeevent(&me->miditrack[ntrack].record,&me->tmpevent);

              
    me->writeevent(&me->miditrack[(int)ntrack].record,&me->tmpevent);

            

        

        
    
    

        
    
    

  

    

    

       Lines 271-277
       
    
  Link Here 
    

  

        
    me->tmpevent.par1=control;//???????????? ma uit la Sequencer::recordnote() din varianele vechi de zyn
    me->tmpevent.par1=control;//???????????? ma uit la Sequencer::recordnote() din varianele vechi de zyn

        
    me->tmpevent.par2=value;
    me->tmpevent.par2=value;

        
    me->tmpevent.channel=chan;
    me->tmpevent.channel=chan;

            

              
    me->writeevent(&me->miditrack[ntrack].record,&me->tmpevent);

              
    me->writeevent(&me->miditrack[(int)ntrack].record,&me->tmpevent);

            

        
    
    

        
};
};

        

  

    

    

       Lines 304-310
       
    
  Link Here 
    

  

        
    me->tmpevent.par1=0;
    me->tmpevent.par1=0;

        
    me->tmpevent.par2=0;
    me->tmpevent.par2=0;

        
    me->tmpevent.channel=0;
    me->tmpevent.channel=0;

            

              
    me->writeevent(&me->miditrack[ntrack].record,&me->tmpevent);

              
    me->writeevent(&me->miditrack[(int)ntrack].record,&me->tmpevent);

            

        
};
};

        

        



(-) /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/Seq/Sequencer.C
      (-13 / +13 lines)




  

    

    

       Lines 101-130
       
    
  Link Here 
    

  

        
    //test
    //test

        
//    if (ntrack!=0) return(-1);
//    if (ntrack!=0) return(-1);

        

            

              
    updatecounter(&playtime[ntrack]);

              
    updatecounter(&playtime[(int)ntrack]);

            

        

            

              
//    printf("%g %g\n",nextevent[ntrack].time,playtime[ntrack].abs);

              
//    printf("%g %g\n",nextevent[(int)ntrack].time,playtime[(int)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);
	else return(-1);

            

              
    if (nextevent[ntrack].ev.type==-1) return(-1);

              
    if (nextevent[(int)ntrack].ev.type==-1) return(-1);

            

        
//    printf("********************************\n");    
//    printf("********************************\n");    

        

        
    //sa pun aici o protectie. a.i. daca distanta dintre timpul curent si eveliment e prea mare (>1sec) sa elimin nota
    //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;

              
    *type=nextevent[(int)ntrack].ev.type;

            

            

              
    *par1=nextevent[ntrack].ev.par1;

              
    *par1=nextevent[(int)ntrack].ev.par1;

            

            

              
    *par2=nextevent[ntrack].ev.par2;

              
    *par2=nextevent[(int)ntrack].ev.par2;

            

            

              
    *midich=nextevent[ntrack].ev.channel;

              
    *midich=nextevent[(int)ntrack].ev.channel;

            

        

        
    
    

            

              
    double dt=nextevent[ntrack].ev.deltatime*0.0001*realplayspeed;

              
    double dt=nextevent[(int)ntrack].ev.deltatime*0.0001*realplayspeed;

            

            

              
    printf("zzzzzzzzzzzzzz[%d] %d\n",ntrack,nextevent[ntrack].ev.deltatime);

              
    printf("zzzzzzzzzzzzzz[%d] %d\n",ntrack,nextevent[(int)ntrack].ev.deltatime);

            

            

              
    nextevent[ntrack].time+=dt;

              
    nextevent[(int)ntrack].time+=dt;

            

        

            

              
//    printf("%f   -  %d %d \n",nextevent[ntrack].time,par1,par2);

              
//    printf("%f   -  %d %d \n",nextevent[(int)ntrack].time,par1,par2);

            

        
    return(0);//?? sau 1
    return(0);//?? sau 1

        
};
};