瀏覽代碼

cmXScore.c : Added a color to _cmXScoreParseColor().

master
kevin.larke 4 年之前
父節點
當前提交
93382d3b97
共有 1 個檔案被更改,包括 7 行新增3 行删除
  1. 7
    3
      app/cmXScore.c

+ 7
- 3
app/cmXScore.c 查看文件

@@ -555,6 +555,9 @@ cmXsRC_t  _cmXScoreParseColor( cmXScore_t* p, const cmXmlNode_t* nnp, cmXsNote_t
555 555
     { kDynXsFl   | kTempoXsFl,                         "#FF7F00" },  // red   + green (brown)
556 556
     { kDynXsFl   | kTempoXsFl,                         "#FE7F00" },  // red   + green (brown)    (end)
557 557
     { kDynXsFl   | kTempoXsFl,                         "#FD7F00" },  // red   + green (brown)    (end)
558
+    { kDynXsFl   | kTempoXsFl | kTempoEndXsFl,         "#FF7E00" },  //
559
+    { kDynXsFl   | kDynEndXsFl | kEvenXsFl | kEvenEndXsFl, "#FE00FE" }, //
560
+    { kDynXsFl   | kDynEndXsFl | kEvenXsFl,            "#FE00FF" },
558 561
     { kTempoXsFl | kEvenXsFl | kDynXsFl,               "#996633" },  // (purple)
559 562
     { kTempoXsFl | kEvenXsFl | kDynXsFl | kDynEndXsFl, "#996632" },  // (purple)
560 563
     { kDynXsFl,                                        "#FF6A03" },  //   176 orange  (dynamics)
@@ -2083,13 +2086,14 @@ cmXsNote_t*  _cmXsReorderFindNote( cmXScore_t* p, unsigned measNumb, const cmXsR
2083 2086
         {
2084 2087
 
2085 2088
 
2086
-          if( 0 /*mp->number==43*/ )
2087
-            printf("voice: %i %i loc:%i %i  tick:%i %i pitch:%i %i idx:%i %i\n",
2089
+          if( 0 /*mp->number==19*/ )
2090
+            printf("voice: %i %i loc:%i %i  tick:%i %i pitch:%i %i rval:%f %f idx:%i %i \n",
2088 2091
               np->voice->id, r->voice, 
2089 2092
               np->locIdx ,  r->locIdx ,
2090 2093
               np->tick ,  r->tick ,
2091 2094
               np->pitch ,  r->midi ,
2092
-              index ,  r->idx );
2095
+              np->rvalue, r->rval,
2096
+              index ,  r->idx);
2093 2097
               
2094 2098
           
2095 2099
           if( np->voice->id == r->voice &&

Loading…
取消
儲存