api update

diff --git a/src/ir.c b/src/ir.c
index 3f90e18..ac47a85 100644 (file)
--- a/src/ir.c
+++ b/src/ir.c
@@ -52,8 +52,6 @@ struct ir_setdata_header_t
   uint8_t*            src_filename, * data_name;\r
   union ir_setdata_t* nextsib;\r
 };\r
-struct ir_frameinfo_t\r
-{ int facing, w, h; };\r
 struct ir_framedata_t\r
 { struct ir_setdata_header_t header;\r
   struct ir_frameinfo_t      frameinfo;\r

diff --git a/src/ir.h b/src/ir.h
index 219fb27..278c7b7 100644 (file)
--- a/src/ir.h
+++ b/src/ir.h
@@ -77,10 +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
-typedef ir_setdata ir_framebox;\r
-typedef ir_setdata ir_audio;\r
-typedef ir_setdata ir_link;\r
-typedef ir_setdata ir_framedata;\r
+typedef ir_setdata framebox;\r
+typedef ir_setdata audiodata;\r
+typedef ir_setdata linkdata;\r
+typedef ir_setdata 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
@@ -90,17 +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_framebox  ir_set_framebox(ir_set);\r
-ir_audio     ir_set_audio(ir_set);\r
-ir_link      ir_set_link(ir_set);\r
+framebox     ir_set_framebox(ir_set);\r
+audiodata    ir_set_audio(ir_set);\r
+linkdata     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_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
+framedata    ir_framebox_framesheet(framebox,apc_facing);\r
+framedata    ir_framebox_mapsheet(framebox,apc_facing);\r
+ir_frameinfo ir_framedata_frameinfo(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