api update

diff --git a/src/ir.h b/src/ir.h
index 1fb5b70..219fb27 100644 (file)
--- a/src/ir.h
+++ b/src/ir.h
@@ -24,8 +24,8 @@
 \r
 struct ir_frameinfo_t\r
 { int facing, w, h; };\r
 \r
 struct ir_frameinfo_t\r
 { int facing, w, h; };\r

+typedef union  ir_setdata_t*   ir_setdata;\r

 typedef struct ir_frameinfo_t* ir_frameinfo;\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_set_t*       ir_set;\r
 typedef struct ir_class_t*     ir_class;\r
 typedef struct ir_setld_t*     ir_setld;\r


@@ -52,6 +52,7 @@ 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

+uint8_t*   ir_set_name(ir_set);\r

 /* Output */\r
 ir_class   ir_class_nextsib(ir_class);\r
 ir_class   ir_class_nextchild(ir_class);\r
 /* Output */\r
 ir_class   ir_class_nextsib(ir_class);\r
 ir_class   ir_class_nextchild(ir_class);\r


@@ -76,6 +77,10 @@ void       ir_set_assign_fpos(ir_set,long);
    data of an associated file at that path and no path is provided, the data\r
    will be entered null.\r
 */\r
    data of an associated file at that path and no path is provided, the data\r
    will be entered null.\r
 */\r

+typedef ir_setdata ir_framebox;\r
+typedef ir_setdata ir_audio;\r
+typedef ir_setdata ir_link;\r
+typedef ir_setdata ir_framedata;\r

 enum ltype { OLINK, MLINK, VLINK, ALINK };\r
 void       ir_set_assign_data(ir_set,ir_setdata);\r
 void       ir_set_assign_ref(ir_set,uint32_t);\r
 enum ltype { OLINK, MLINK, VLINK, ALINK };\r
 void       ir_set_assign_data(ir_set,ir_setdata);\r
 void       ir_set_assign_ref(ir_set,uint32_t);\r


@@ -85,12 +90,17 @@ ir_setdata ir_mapsheet(const uint8_t*, apc_facing, int,int);
 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_audio(const uint8_t*);\r
 ir_setdata ir_link(enum ltype,ir_setld,const uint8_t*);\r
 /* Output */\r

+ir_framebox  ir_set_framebox(ir_set);\r
+ir_audio     ir_set_audio(ir_set);\r
+ir_link      ir_set_link(ir_set);\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_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
+ir_framedata ir_framebox_framesheet(ir_framebox,apc_facing);\r
+ir_framedata ir_framebox_mapsheet(ir_framebox,apc_facing);\r
+ir_frameinfo ir_framedata_frameinfo(ir_framedata);\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