Parse more fields.

diff --git a/ptb.c b/ptb.c
index 5c448661d929b69548879dd689a3b648daaab39b..5b52381291a8ee6c185a47d7a9ac47f3b48c004b 100644 (file)
--- a/ptb.c
+++ b/ptb.c
@@ -934,7 +934,7 @@ static int handle_CDynamic (struct ptbf *bf, const char *section, struct ptb_lis
 
        ptb_data_uint16(bf, &dynamic->section);
        ptb_data_uint8(bf, &dynamic->staff);
-       ptb_data_uint8(bf, &dynamic->offset);
+       ptb_data_uint8(bf, &dynamic->position);
        ptb_data_uint16(bf, &dynamic->volume);
 
        *dest = (struct ptb_list *)dynamic;
@@ -944,8 +944,9 @@ static int handle_CDynamic (struct ptbf *bf, const char *section, struct ptb_lis
 static int handle_CSectionSymbol (struct ptbf *bf, const char *section, struct ptb_list **dest) {
        struct ptb_sectionsymbol *sectionsymbol = GET_ITEM(bf, dest, struct ptb_sectionsymbol);
 
-       ptb_data_unknown(bf, 5, "FIXME"); /* FIXME */
-       ptb_data_uint16(bf, &sectionsymbol->repeat_ending);
+       ptb_data_uint16(bf, &sectionsymbol->section);
+       ptb_data_uint8(bf, &sectionsymbol->position);
+       ptb_data_uint32(bf, &sectionsymbol->data);
 
        *dest = (struct ptb_list *)sectionsymbol;
        return 1;

diff --git a/ptb.h b/ptb.h
index eeaeecce49d2b9e96213995cfca728a03d9f72db..a7064b047305f65ef54e0e2fa258d718a8cd4d77 100644 (file)
--- a/ptb.h
+++ b/ptb.h
@@ -147,7 +147,7 @@ struct ptb_dynamic {
 
        uint16_t section;
        uint8_t staff;
-       uint8_t offset;
+       uint8_t position;
        uint16_t volume;
 };
 
@@ -432,7 +432,9 @@ struct ptb_section {
 struct ptb_sectionsymbol {
        struct ptb_sectionsymbol *prev, *next;
 
-       uint16_t repeat_ending;
+       uint16_t section;
+       uint8_t position;
+       uint32_t data;
 };
 
 struct ptb_musicbar {

diff --git a/ptb2xml.c b/ptb2xml.c
index 377fbee52480aa8e6dd65dc0e1145e5020789e12..d90fbdba387efdb155e719473c62993904031540 100644 (file)
--- a/ptb2xml.c
+++ b/ptb2xml.c
@@ -369,7 +369,7 @@ xmlNodePtr xml_write_dynamics(struct ptb_dynamic *dynamics)
                xmlNodePtr xdynamic = xmlNewNode(NULL, "dynamic");
                xmlAddChild(xdynamics, xdynamic);
                
-               SMART_ADD_PROP_INT(xdynamic, "offset", dynamic->offset);
+               SMART_ADD_PROP_INT(xdynamic, "position", dynamic->position);
 
                dynamic = dynamic->next;
        }
@@ -413,7 +413,7 @@ xmlNodePtr xml_write_sectionsymbols(struct ptb_sectionsymbol *sectionsymbols)
                xmlNodePtr xsectionsymbol = xmlNewNode(NULL, "sectionsymbol");
                xmlAddChild(xsectionsymbols, xsectionsymbol);
                
-               SMART_ADD_CHILD_INT(xsectionsymbol, "repeat-ending", sectionsymbol->repeat_ending);
+               SMART_ADD_CHILD_INT(xsectionsymbol, "data", sectionsymbol->data);
 
                sectionsymbol = sectionsymbol->next;
        }

diff --git a/ptbinfo.c b/ptbinfo.c
index 7e7006d9ee0568ae0d72fa164bd4f9aabaa4c33b..fec7ce7e5ca044e055fa17505825baf611a55bcf 100644 (file)
--- a/ptbinfo.c
+++ b/ptbinfo.c
@@ -152,7 +152,7 @@ void write_section(struct ptb_section *section)
 
 void write_sectionsymbol(struct ptb_sectionsymbol *ssb)
 {
-       printf("\tRepeat Ending: %d\n", ssb->repeat_ending);
+       printf("\tData: %d\n", ssb->data);
        printf("\n");
 }
 
@@ -168,7 +168,8 @@ void write_tempomarker(struct ptb_tempomarker *tm)
 
 void write_dynamic(struct ptb_dynamic *dn)
 {
-       printf("\tOffset: %d\n", dn->offset);
+       printf("\tSection: %d\n", dn->section);
+       printf("\tPosition: %d\n", dn->position);
        printf("\tStaff: %d\n", dn->staff);
        printf("\tVolume: %d\n", dn->volume);
        printf("\n");