diff options
Diffstat (limited to 'src/procedures.h')
| -rw-r--r-- | src/procedures.h | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/procedures.h b/src/procedures.h index 4f6f48a..40b032f 100644 --- a/src/procedures.h +++ b/src/procedures.h @@ -49,7 +49,7 @@ enum procedure_status { PROC_FINISHED, }; -enum procedure_key { /* XXX this will cause problems and has to change */ +enum procedure_key { /* XXX this will cause problems and has to change as we want to iterate over this list */ PROC_NONE = 0, PROC_BED_MOVE, PROC_BED_HEATUP, @@ -125,10 +125,10 @@ enum meta_type { PROC_META_SPINNER, }; -struct poll_data { +struct event_info { double in; Ecore_Timer *timer; - int event; + int type; }; struct meta_data { @@ -138,19 +138,21 @@ struct meta_data { struct procedure_data { const char *key; + enum procedure_key proc_key; enum procedure_status status; Eina_Bool wizard; - const char *sig; + const char *sig; /* XXX can go */ const char *para; /* TODO va_list to go with sig? */ - Eina_Bool available; - Eina_Bool executable; + Eina_Bool available; /* XXX can go */ + Eina_Bool executable; /* XXX can go */ void (*parser)(void *data, const void *key, Eldbus_Message_Iter *variant); - enum meta_type type; - void *meta; /* TODO every proc. has meta data, some needs to be periodically updated (print_data), others on signal changes. needs enum guard to identify which meta we have. */ - const struct procedure_msg *msgs; + enum meta_type type; /* TODO remove in favor of meta \/ */ + void *meta; /* TODO remove in favor of meta \/. */ +// struct meta_data meta; + const struct procedure_msg *msgs; /* XXX can go */ const struct procedure_step *_steps; /* TODO optional? maybe we don't even have to know the list */ const struct procedure_step *step_active; - struct poll_data poll; + struct event_info event; }; struct eulogium_data; /* XXX remove later when struct eulogium gets refactored. */ |