api updated

diff --git a/src/ir.h b/src/ir.h
index 096c760..1fb5b70 100644 (file)
--- a/src/ir.h
+++ b/src/ir.h
@@ -22,11 +22,14 @@
 #include <unitypes.h>\r
 #include "apc.h"\r
 \r
 #include <unitypes.h>\r
 #include "apc.h"\r
 \r

-typedef union ir_setdata_t*  ir_setdata;\r
-typedef struct ir_set_t*     ir_set;\r
-typedef struct ir_class_t*   ir_class;\r
-typedef struct ir_setld_t*   ir_setld;\r
-typedef struct ir_classld_t* ir_classld;\r
+struct ir_frameinfo_t\r
+{ int facing, w, h; };\r
+typedef struct ir_frameinfo_t* ir_frameinfo;\r
+typedef union ir_setdata_t*    ir_setdata;\r
+typedef struct ir_set_t*       ir_set;\r
+typedef struct ir_class_t*     ir_class;\r
+typedef struct ir_setld_t*     ir_setld;\r
+typedef struct ir_classld_t*   ir_classld;\r

 /* Classes and Sets\r
    Classes are rooted at a special root class, representing the current working\r
    directory at scan-time, named ".".  The root class can always be identified\r
 /* Classes and Sets\r
    Classes are rooted at a special root class, representing the current working\r
    directory at scan-time, named ".".  The root class can always be identified\r


@@ -49,6 +52,16 @@ ir_class   ir_class_addchild(ir_class,const uint8_t*);
 uint8_t*   ir_class_name(ir_class);\r
 ir_set     ir_class_addset(ir_class,const uint8_t*);\r
 ir_set     ir_set_addchild(ir_set,const uint8_t*);\r
 uint8_t*   ir_class_name(ir_class);\r
 ir_set     ir_class_addset(ir_class,const uint8_t*);\r
 ir_set     ir_set_addchild(ir_set,const uint8_t*);\r

+/* Output */\r
+ir_class   ir_class_nextsib(ir_class);\r
+ir_class   ir_class_nextchild(ir_class);\r
+long       ir_class_fpos(ir_class);\r
+void       ir_class_assign_fpos(ir_class,long);\r
+ir_set     ir_set_from_ref(uint32_t);\r
+ir_set     ir_set_nextsib(ir_set);\r
+ir_set     ir_set_nextchild(ir_set);\r
+long       ir_set_fpos(ir_set);\r
+void       ir_set_assign_fpos(ir_set,long);\r

 /* Set Data\r
    Each set can contain up to FACING_MAX each of framesheets and mapsheets, one\r
    sheet for each facing, per label.  Each set can contain any number of audio\r
 /* Set Data\r
    Each set can contain up to FACING_MAX each of framesheets and mapsheets, one\r
    sheet for each facing, per label.  Each set can contain any number of audio\r


@@ -71,6 +84,13 @@ ir_setdata ir_framesheet(const uint8_t*, apc_facing, int,int);
 ir_setdata ir_mapsheet(const uint8_t*, apc_facing, int,int);\r
 ir_setdata ir_audio(const uint8_t*);\r
 ir_setdata ir_link(enum ltype,ir_setld,const uint8_t*);\r
 ir_setdata ir_mapsheet(const uint8_t*, apc_facing, int,int);\r
 ir_setdata ir_audio(const uint8_t*);\r
 ir_setdata ir_link(enum ltype,ir_setld,const uint8_t*);\r

+/* Output */\r
+ir_setdata   ir_setdata_nextsib(ir_setdata);\r
+uint8_t*     ir_setdata_name(ir_setdata);\r
+uint8_t*     ir_setdata_filename(ir_setdata);\r
+long         ir_setdata_fpos(void);\r
+void         ir_setdata_assign_fpos(ir_setdata,long);\r
+ir_frameinfo ir_setdata_frameinfo(ir_setdata);\r

 /* Reference Linking Data \r
    Create linking data to sets or classes that will be resolved at a later\r
    stage.  Class references can be created from an ir_class object, if\r
 /* Reference Linking Data \r
    Create linking data to sets or classes that will be resolved at a later\r
    stage.  Class references can be created from an ir_class object, if\r


@@ -85,31 +105,7 @@ ir_classld ir_classld_addchild(ir_classld,const uint8_t*);
 ir_setld   ir_setld_from_ref(uint32_t);\r
 ir_setld   ir_setld_from_classld(ir_classld,const uint8_t*);\r
 ir_setld   ir_setld_addchild(ir_setld,const uint8_t*);\r
 ir_setld   ir_setld_from_ref(uint32_t);\r
 ir_setld   ir_setld_from_classld(ir_classld,const uint8_t*);\r
 ir_setld   ir_setld_addchild(ir_setld,const uint8_t*);\r

+/* Output */\r
+enum ltype ir_setld_type(ir_setld);\r
+uint32_t   ir_setld_ref(ir_setld);\r

 #endif //_IR_H_\r
 #endif //_IR_H_\r

-\r
-int get_class_sibcount(ir_class);\r
-int get_set_sibcount(ir_set);\r
-int get_set_variants(ir_set);\r
-ir_set get_class_root_set(ir_class);\r
-ir_set get_set_nextsib(ir_set);\r
-ir_set get_set_nextchild(ir_set);\r
-ir_setdata get_set_frameboxes(ir_set);\r
-ir_setdata get_set_links(ir_set);\r
-uint8_t* get_set_name(ir_set);\r
-long get_set_filepos(ir_set);\r
-void set_set_filepos(ir_set, long);\r
-ir_set get_set_from_ref(uint32_t);\r
-ir_class get_class_nextchild(ir_class);\r
-ir_class get_class_nextsib(ir_class);\r
-uint8_t* get_class_name(ir_class);\r
-uint8_t* get_link_name(ir_setdata);\r
-ir_setdata get_link_nextsib(ir_setdata);\r
-uint32_t get_link_ref(ir_setdata);\r
-enum ltype get_link_type(ir_setdata);\r
-ir_setdata get_framebox_nextsib(ir_setdata);\r
-uint8_t* get_framebox_name(ir_setdata);\r
-ir_setdata get_framebox_facing_framedata(ir_setdata, apc_facing);\r
-ir_setdata get_framebox_facing_mapdata(ir_setdata, apc_facing);\r
-int get_framedata_height(ir_setdata);\r
-int get_framedata_width(ir_setdata);\r
-uint8_t* get_framedata_name(ir_setdata);\r