Browse Source

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

master
kevin 8 years ago
parent
commit
b17635cc78
1 changed files with 3 additions and 3 deletions
  1. 3
    3
      app/cmXScore.c

+ 3
- 3
app/cmXScore.c View File

796
     // for each note starting at nnp
796
     // for each note starting at nnp
797
     for(; nnp!=NULL; nnp=nnp->slink)
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
         nnp->flags |= kTieProcXsFl;
801
         nnp->flags |= kTieProcXsFl;
802
         nnp->flags  = cmClrFlag(nnp->flags,kOnsetXsFl);
802
         nnp->flags  = cmClrFlag(nnp->flags,kOnsetXsFl);
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
   return false;
825
   return false;
826
 }
826
 }
827
 
827
 
1659
   if((rc = cmXScoreInitialize( ctx, &h, xmlFn, midiFn)) != kOkXsRC )
1659
   if((rc = cmXScoreInitialize( ctx, &h, xmlFn, midiFn)) != kOkXsRC )
1660
     return cmErrMsg(&ctx->err,rc,"XScore alloc failed.");
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
   cmXScoreReport(h,&ctx->rpt,false);
1663
   cmXScoreReport(h,&ctx->rpt,false);
1664
   
1664
   
1665
   return cmXScoreFinalize(&h);
1665
   return cmXScoreFinalize(&h);

Loading…
Cancel
Save