Bladeren bron

cmXScore.c : Tied notes now must be assigned to the same voice.

master
kevin 8 jaren geleden
bovenliggende
commit
b17635cc78
1 gewijzigde bestanden met toevoegingen van 3 en 3 verwijderingen
  1. 3
    3
      app/cmXScore.c

+ 3
- 3
app/cmXScore.c Bestand weergeven

@@ -796,7 +796,7 @@ bool  _cmXScoreFindTiedNote( cmXScore_t* p, cmXsMeas_t* mp, cmXsNote_t* np, bool
796 796
     // for each note starting at nnp
797 797
     for(; nnp!=NULL; nnp=nnp->slink)
798 798
     {
799
-      if( /*nnp->voice->id == np->voice->id &&*/ nnp->step == np->step && nnp->octave == np->octave )
799
+      if( nnp->voice->id == np->voice->id && nnp->step == np->step && nnp->octave == np->octave )
800 800
       {
801 801
         nnp->flags |= kTieProcXsFl;
802 802
         nnp->flags  = cmClrFlag(nnp->flags,kOnsetXsFl);
@@ -821,7 +821,7 @@ bool  _cmXScoreFindTiedNote( cmXScore_t* p, cmXsMeas_t* mp, cmXsNote_t* np, bool
821 821
     
822 822
   }
823 823
 
824
-  cmErrWarnMsg(&p->err,kUnterminatedTieXsRC,"The tied %c%c%i in measure %i was not terminated.",np->step,acc,np->octave,measNumb);
824
+  cmErrWarnMsg(&p->err,kUnterminatedTieXsRC,"The tied %c%c%i in measure %i was not terminated.",np->step,acc,np->octave,measNumb0);
825 825
   return false;
826 826
 }
827 827
 
@@ -1659,7 +1659,7 @@ cmXsRC_t cmXScoreTest( cmCtx_t* ctx, const cmChar_t* xmlFn, const cmChar_t* midi
1659 1659
   if((rc = cmXScoreInitialize( ctx, &h, xmlFn, midiFn)) != kOkXsRC )
1660 1660
     return cmErrMsg(&ctx->err,rc,"XScore alloc failed.");
1661 1661
 
1662
-  cmXScoreWriteCsv(h,"/home/kevin/temp/a0.csv");
1662
+  cmXScoreWriteCsv(h,"/Users/kevin/temp/a0.csv");
1663 1663
   cmXScoreReport(h,&ctx->rpt,false);
1664 1664
   
1665 1665
   return cmXScoreFinalize(&h);

Laden…
Annuleren
Opslaan