cml/libcm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
kevin.larke 2020-03-09 14:44:25 -04:00
parent 0aee816083
commit 93382d3b97
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/cmXScore.c
View File

@ -555,6 +555,9 @@ cmXsRC_t _cmXScoreParseColor( cmXScore_t* p, const cmXmlNode_t* nnp, cmXsNote_t
{ kDynXsFl | kTempoXsFl, "#FF7F00" }, // red + green (brown) { kDynXsFl | kTempoXsFl, "#FF7F00" }, // red + green (brown)
{ kDynXsFl | kTempoXsFl, "#FE7F00" }, // red + green (brown) (end) { kDynXsFl | kTempoXsFl, "#FE7F00" }, // red + green (brown) (end)
{ kDynXsFl | kTempoXsFl, "#FD7F00" }, // red + green (brown) (end) { kDynXsFl | kTempoXsFl, "#FD7F00" }, // red + green (brown) (end)
{ kDynXsFl | kTempoXsFl | kTempoEndXsFl, "#FF7E00" }, //
{ kDynXsFl | kDynEndXsFl | kEvenXsFl | kEvenEndXsFl, "#FE00FE" }, //
{ kDynXsFl | kDynEndXsFl | kEvenXsFl, "#FE00FF" },
{ kTempoXsFl | kEvenXsFl | kDynXsFl, "#996633" }, // (purple) { kTempoXsFl | kEvenXsFl | kDynXsFl, "#996633" }, // (purple)
{ kTempoXsFl | kEvenXsFl | kDynXsFl | kDynEndXsFl, "#996632" }, // (purple) { kTempoXsFl | kEvenXsFl | kDynXsFl | kDynEndXsFl, "#996632" }, // (purple)
{ kDynXsFl, "#FF6A03" }, // 176 orange (dynamics) { kDynXsFl, "#FF6A03" }, // 176 orange (dynamics)
@ -2083,13 +2086,14 @@ cmXsNote_t* _cmXsReorderFindNote( cmXScore_t* p, unsigned measNumb, const cmXsR
{ {
if( 0 /*mp->number==43*/ ) if( 0 /*mp->number==19*/ )
printf("voice: %i %i loc:%i %i tick:%i %i pitch:%i %i idx:%i %i\n", printf("voice: %i %i loc:%i %i tick:%i %i pitch:%i %i rval:%f %f idx:%i %i \n",
np->voice->id, r->voice, np->voice->id, r->voice,
np->locIdx , r->locIdx , np->locIdx , r->locIdx ,
np->tick , r->tick , np->tick , r->tick ,
np->pitch , r->midi , np->pitch , r->midi ,
index , r->idx ); np->rvalue, r->rval,
index , r->idx);
if( np->voice->id == r->voice && if( np->voice->id == r->voice &&