From: ken Date: Wed, 15 Feb 2017 20:05:50 +0000 (-0800) Subject: api update X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fapc.git;a=commitdiff_plain;h=81be40c7e131efbb3300d948ee17d05a9910205e api update --- diff --git a/src/ir.c b/src/ir.c index 3f90e18..ac47a85 100644 --- a/src/ir.c +++ b/src/ir.c @@ -52,8 +52,6 @@ struct ir_setdata_header_t uint8_t* src_filename, * data_name; union ir_setdata_t* nextsib; }; -struct ir_frameinfo_t -{ int facing, w, h; }; struct ir_framedata_t { struct ir_setdata_header_t header; struct ir_frameinfo_t frameinfo; diff --git a/src/ir.h b/src/ir.h index 219fb27..278c7b7 100644 --- 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 will be entered null. */ -typedef ir_setdata ir_framebox; -typedef ir_setdata ir_audio; -typedef ir_setdata ir_link; -typedef ir_setdata ir_framedata; +typedef ir_setdata framebox; +typedef ir_setdata audiodata; +typedef ir_setdata linkdata; +typedef ir_setdata framedata; enum ltype { OLINK, MLINK, VLINK, ALINK }; void ir_set_assign_data(ir_set,ir_setdata); void ir_set_assign_ref(ir_set,uint32_t); @@ -90,17 +90,17 @@ ir_setdata ir_mapsheet(const uint8_t*, apc_facing, int,int); ir_setdata ir_audio(const uint8_t*); ir_setdata ir_link(enum ltype,ir_setld,const uint8_t*); /* Output */ -ir_framebox ir_set_framebox(ir_set); -ir_audio ir_set_audio(ir_set); -ir_link ir_set_link(ir_set); +framebox ir_set_framebox(ir_set); +audiodata ir_set_audio(ir_set); +linkdata ir_set_link(ir_set); ir_setdata ir_setdata_nextsib(ir_setdata); uint8_t* ir_setdata_name(ir_setdata); uint8_t* ir_setdata_filename(ir_setdata); long ir_setdata_fpos(void); void ir_setdata_assign_fpos(ir_setdata,long); -ir_framedata ir_framebox_framesheet(ir_framebox,apc_facing); -ir_framedata ir_framebox_mapsheet(ir_framebox,apc_facing); -ir_frameinfo ir_framedata_frameinfo(ir_framedata); +framedata ir_framebox_framesheet(framebox,apc_facing); +framedata ir_framebox_mapsheet(framebox,apc_facing); +ir_frameinfo ir_framedata_frameinfo(framedata); /* Reference Linking Data Create linking data to sets or classes that will be resolved at a later stage. Class references can be created from an ir_class object, if