Parse some more.

diff --git a/ptb.c b/ptb.c
index 632f5beba22682571edf98ed0a8aff3998d81498..adfaa5586d21b3cfe02c38b166cb17068fa97b56 100644 (file)
--- a/ptb.c
+++ b/ptb.c
@@ -248,7 +248,7 @@ static ssize_t ptb_data_color(struct ptbf *f, struct ptb_color *dest)
        ret+=ptb_data_uint8(f, &dest->r);
        ret+=ptb_data_uint8(f, &dest->g);
        ret+=ptb_data_uint8(f, &dest->b);
-       ret+=ptb_data_unknown(f, 1, "FIXLA");
+       ret+=ptb_data_unknown(f, 1, "FIXME");
 
        return ret;
 }
@@ -723,7 +723,9 @@ static int ptb_data_chordname(struct ptbf *bf, struct ptb_chordname *dest)
 {
        int ret = 0;
        ret += ptb_data(bf, dest->name, 2);
-       ret += ptb_data_unknown(bf, 3, "FIXME");
+       ret += ptb_data_uint8(bf, &dest->formula);
+       ret += ptb_data_uint16(bf, &dest->formula_mods);
+       ptb_data_uint8(bf, &dest->type);
        return ret;
 }
 
@@ -731,7 +733,6 @@ static int handle_CChordDiagram (struct ptbf *bf, const char *section, struct pt
        struct ptb_chorddiagram *chorddiagram = GET_ITEM(bf, dest, struct ptb_chorddiagram);
 
        ptb_data_chordname(bf, &chorddiagram->name);
-       ptb_data_uint8(bf, &chorddiagram->type);
        ptb_data_uint8(bf, &chorddiagram->frets);
        ptb_data_uint8(bf, &chorddiagram->nr_strings);
        chorddiagram->tones = malloc_p(uint8_t, chorddiagram->nr_strings);

diff --git a/ptb.h b/ptb.h
index e8e79f1b4e46d1b448c3a9c1a92971b38eab148d..1eb07e1e2aa7f3a1e51764972d0fc681143581c1 100644 (file)
--- a/ptb.h
+++ b/ptb.h
@@ -218,6 +218,9 @@ struct ptb_tempomarker {
 
 struct ptb_chordname {
        ptb_chord name[2];
+       uint8_t formula;
+       uint16_t formula_mods;
+       uint8_t type;
 };
 
 struct ptb_chorddiagram {
@@ -227,7 +230,6 @@ struct ptb_chorddiagram {
 
        uint8_t frets;
        uint8_t nr_strings;
-       uint8_t type;
        ptb_tone *tones;
 };
 

diff --git a/ptb2xml.c b/ptb2xml.c
index e2c3769ef037687861fa6bd7f58e2ad0e1986330..377fbee52480aa8e6dd65dc0e1145e5020789e12 100644 (file)
--- a/ptb2xml.c
+++ b/ptb2xml.c
@@ -392,7 +392,7 @@ xmlNodePtr xml_write_chorddiagrams(struct ptb_chorddiagram *chorddiagrams)
                SMART_ADD_CHILD_STRING(xchorddiagram, "note1", ptb_get_tone(chorddiagram->name.name[0]));
                SMART_ADD_CHILD_STRING(xchorddiagram, "note2", ptb_get_tone(chorddiagram->name.name[1]));
                SMART_ADD_CHILD_INT(xchorddiagram, "frets", chorddiagram->frets);
-               SMART_ADD_CHILD_INT(xchorddiagram, "type", chorddiagram->type);
+               SMART_ADD_CHILD_INT(xchorddiagram, "type", chorddiagram->name.type);
 
                for(i = 0; i < chorddiagram->nr_strings; i++) {
                        SMART_ADD_CHILD_INT(strings, "string", chorddiagram->tones[i]);

diff --git a/ptbinfo.c b/ptbinfo.c
index 6fa901c47df2a884e3c41ae50cda3c1e5a122fb9..7e7006d9ee0568ae0d72fa164bd4f9aabaa4c33b 100644 (file)
--- a/ptbinfo.c
+++ b/ptbinfo.c
@@ -210,8 +210,8 @@ void write_chorddiagram(struct ptb_chorddiagram *chd)
 {
        int i;
        printf("\tName: %c%c\n", chd->name.name[0], chd->name.name[1]);
+       printf("\tType: %d\n", chd->name.type);
        printf("\tFret Offset: %d\n", chd->frets);
-       printf("\tType: %d\n", chd->type);
        printf("\tTones(%d): \n", chd->nr_strings);
        for (i = 0; i < chd->nr_strings; i++) 
                printf("\t\t%d\n", chd->tones[i]);