[abcp commit] r85 - in trunk: examples/abcdump src

[codesite...@google.com]

Author: rdentato
Date: Sun Mar 8 08:41:42 2009
New Revision: 85

Modified:
trunk/examples/abcdump/abcdump.c
trunk/src/abcpfield.pmx

Log:

Modified: trunk/examples/abcdump/abcdump.c
==============================================================================
--- trunk/examples/abcdump/abcdump.c (original)
+++ trunk/examples/abcdump/abcdump.c Sun Mar 8 08:41:42 2009
@@ -285,12 +285,13 @@

case 'M' :
printf("METER: %d/%d ", abcMeterBeats(scn),
abcMeterUnits(scn));
- printf("(%d",abcMeterBeatsNth(scn,1));
- k=2;
-
- while ((j = abcMeterBeatsNth(scn,k++)) != 0)
+ k=0;
+ printf("(%d",abcMeterBeatsNth(scn,k++));
+ j = abcMeterBeatsNth(scn,k++);
+ while (j != 0) {
printf("+%d",j);
-
+ j = abcMeterBeatsNth(scn,k++);
+ }
printf(")\n");
break;

Modified: trunk/src/abcpfield.pmx
==============================================================================
--- trunk/src/abcpfield.pmx (original)
+++ trunk/src/abcpfield.pmx Sun Mar 8 08:41:42 2009
@@ -56,9 +56,11 @@
<?=(>(<+= 0-9+>)<?=)>&K<?=/>&K(<*d>)

*/
-#define MAXBEATS 32
-static char beats[MAXBEATS];
-static char units;
+#define MAXBEATS 30
+#define beatsum beats[MAXBEATS+1]
+#define units beats[MAXBEATS+2]
+
+static char beats[MAXBEATS+3];

static void abc_meter(abcScanner *scn)
{
@@ -69,9 +71,10 @@
for (i=0; i < MAXBEATS; i++)
beats[i] = 0;

+ beatsum = 0;
units = 0;

- i = 1;
+ i = 0;
p = abcFieldStart(scn);
k = abcFieldLen(scn);
while (k>0) {
@@ -81,26 +84,26 @@
break;

case "C|" :
- beats[0] = 2; beats[1] = 2; beats[3] = 0;
+ beatsum = 2; beats[0] = 2; beats[1] = 0;
units = 2;
k = 0;
break;

case "C" :
- beats[0] = 4; beats[1] = 4; beats[3] = 0;
+ beatsum = 4; beats[0] = 4; beats[1] = 0;
units = 2;
k = 0;
break;

case "none&|free" :
- beats[0] = 1; beats[1] = 1; beats[3] = 0;
+ beatsum = 1; beats[0] = 1; beats[1] = 0;
units = 1;
k = 0;
break;

case "&d&K" :
beats[i] = atoi(pmx(Start,0));
- beats[0] += beats[i];
+ beatsum += beats[i];
if (i<MAXBEATS) i++;
beats[i] = 0;
k -= pmx(Len,0);