Rename static variable
This commit is contained in:
Daniel Zaoui
parent
33730b5dcd
commit
8e0a638b19
|
|
@ -8,7 +8,7 @@
|
|||
#include <Evas.h>
|
||||
#include "tsuite_file_data.h"
|
||||
|
||||
static data_desc *desc = NULL; /* this struct holds descs (alloc on init) */
|
||||
static data_desc *_desc = NULL; /* this struct holds descs (alloc on init) */
|
||||
|
||||
static eet_event_type_mapping eet_mapping[] = {
|
||||
{ TSUITE_EVENT_MOUSE_IN, TSUITE_EVENT_MOUSE_IN_STR },
|
||||
|
|
@ -199,7 +199,7 @@ write_events(const char *filename, Lists_st *vr_list)
|
|||
#ifdef DEBUG_TSUITE
|
||||
print_events(vr_list);
|
||||
#endif
|
||||
eet_data_write(fp, desc->_lists_descriptor, CACHE_FILE_ENTRY, vr_list,
|
||||
eet_data_write(fp, _desc->_lists_descriptor, CACHE_FILE_ENTRY, vr_list,
|
||||
EINA_TRUE);
|
||||
|
||||
eet_close(fp);
|
||||
|
|
@ -225,7 +225,7 @@ read_events(const char *filename, Timer_Data *td)
|
|||
|
||||
/* Read events list */
|
||||
_data_descriptors_init();
|
||||
vr_list = eet_data_read(fp, desc->_lists_descriptor, CACHE_FILE_ENTRY);
|
||||
vr_list = eet_data_read(fp, _desc->_lists_descriptor, CACHE_FILE_ENTRY);
|
||||
eet_close(fp);
|
||||
_data_descriptors_shutdown();
|
||||
if (!vr_list->variant_list)
|
||||
|
|
@ -731,108 +731,108 @@ multi_move_desc_make(void)
|
|||
/* declaring types */
|
||||
data_desc *_data_descriptors_init(void)
|
||||
{
|
||||
if (desc) /* Was allocated */
|
||||
return desc;
|
||||
if (_desc) /* Was allocated */
|
||||
return _desc;
|
||||
|
||||
desc = calloc(1, sizeof(data_desc));
|
||||
_desc = calloc(1, sizeof(data_desc));
|
||||
|
||||
Eet_Data_Descriptor_Class eddc;
|
||||
|
||||
EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Lists_st);
|
||||
desc->_lists_descriptor = eet_data_descriptor_file_new(&eddc);
|
||||
_desc->_lists_descriptor = eet_data_descriptor_file_new(&eddc);
|
||||
|
||||
desc->take_screenshot = take_screenshot_desc_make();
|
||||
desc->mouse_in_mouse_out = mouse_in_mouse_out_desc_make();
|
||||
desc->mouse_down_mouse_up = mouse_down_mouse_up_desc_make();
|
||||
desc->mouse_move = mouse_move_desc_make();
|
||||
desc->mouse_wheel = mouse_wheel_desc_make();
|
||||
desc->multi_event = multi_event_desc_make();
|
||||
desc->multi_move = multi_move_desc_make();
|
||||
desc->key_down_key_up = key_down_key_up_desc_make();
|
||||
desc->key_down_key_up_with_keycode = key_down_key_up_with_keycode_desc_make();
|
||||
_desc->take_screenshot = take_screenshot_desc_make();
|
||||
_desc->mouse_in_mouse_out = mouse_in_mouse_out_desc_make();
|
||||
_desc->mouse_down_mouse_up = mouse_down_mouse_up_desc_make();
|
||||
_desc->mouse_move = mouse_move_desc_make();
|
||||
_desc->mouse_wheel = mouse_wheel_desc_make();
|
||||
_desc->multi_event = multi_event_desc_make();
|
||||
_desc->multi_move = multi_move_desc_make();
|
||||
_desc->key_down_key_up = key_down_key_up_desc_make();
|
||||
_desc->key_down_key_up_with_keycode = key_down_key_up_with_keycode_desc_make();
|
||||
|
||||
/* for variant */
|
||||
EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Variant_st);
|
||||
desc->_variant_descriptor = eet_data_descriptor_file_new(&eddc);
|
||||
_desc->_variant_descriptor = eet_data_descriptor_file_new(&eddc);
|
||||
|
||||
eddc.version = EET_DATA_DESCRIPTOR_CLASS_VERSION;
|
||||
eddc.func.type_get = _variant_type_get;
|
||||
eddc.func.type_set = _variant_type_set;
|
||||
desc->_variant_unified_descriptor = eet_data_descriptor_stream_new(&eddc);
|
||||
_desc->_variant_unified_descriptor = eet_data_descriptor_stream_new(&eddc);
|
||||
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_MOUSE_IN_STR, desc->mouse_in_mouse_out);
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(_desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_MOUSE_IN_STR, _desc->mouse_in_mouse_out);
|
||||
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_MOUSE_OUT_STR, desc->mouse_in_mouse_out);
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(_desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_MOUSE_OUT_STR, _desc->mouse_in_mouse_out);
|
||||
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_MOUSE_DOWN_STR, desc->mouse_down_mouse_up);
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(_desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_MOUSE_DOWN_STR, _desc->mouse_down_mouse_up);
|
||||
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_MOUSE_UP_STR, desc->mouse_down_mouse_up);
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(_desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_MOUSE_UP_STR, _desc->mouse_down_mouse_up);
|
||||
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_MOUSE_MOVE_STR, desc->mouse_move);
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(_desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_MOUSE_MOVE_STR, _desc->mouse_move);
|
||||
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_MOUSE_WHEEL_STR, desc->mouse_wheel);
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(_desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_MOUSE_WHEEL_STR, _desc->mouse_wheel);
|
||||
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_MULTI_DOWN_STR, desc->multi_event);
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(_desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_MULTI_DOWN_STR, _desc->multi_event);
|
||||
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_MULTI_UP_STR, desc->multi_event);
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(_desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_MULTI_UP_STR, _desc->multi_event);
|
||||
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_MULTI_MOVE_STR, desc->multi_move);
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(_desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_MULTI_MOVE_STR, _desc->multi_move);
|
||||
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_KEY_DOWN_STR, desc->key_down_key_up);
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(_desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_KEY_DOWN_STR, _desc->key_down_key_up);
|
||||
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_KEY_UP_STR, desc->key_down_key_up);
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(_desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_KEY_UP_STR, _desc->key_down_key_up);
|
||||
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_KEY_DOWN_WITH_KEYCODE_STR, desc->key_down_key_up_with_keycode);
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(_desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_KEY_DOWN_WITH_KEYCODE_STR, _desc->key_down_key_up_with_keycode);
|
||||
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_KEY_UP_WITH_KEYCODE_STR, desc->key_down_key_up_with_keycode);
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(_desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_KEY_UP_WITH_KEYCODE_STR, _desc->key_down_key_up_with_keycode);
|
||||
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_TAKE_SHOT_STR, desc->take_screenshot);
|
||||
EET_DATA_DESCRIPTOR_ADD_MAPPING(_desc->_variant_unified_descriptor,
|
||||
TSUITE_EVENT_TAKE_SHOT_STR, _desc->take_screenshot);
|
||||
|
||||
|
||||
EET_DATA_DESCRIPTOR_ADD_VARIANT(desc->_variant_descriptor,
|
||||
Variant_st, "data", data, t, desc->_variant_unified_descriptor);
|
||||
EET_DATA_DESCRIPTOR_ADD_VARIANT(_desc->_variant_descriptor,
|
||||
Variant_st, "data", data, t, _desc->_variant_unified_descriptor);
|
||||
|
||||
EET_DATA_DESCRIPTOR_ADD_BASIC(desc->_lists_descriptor,
|
||||
EET_DATA_DESCRIPTOR_ADD_BASIC(_desc->_lists_descriptor,
|
||||
Lists_st, "first_timestamp", first_timestamp, EET_T_UINT);
|
||||
EET_DATA_DESCRIPTOR_ADD_LIST(desc->_lists_descriptor,
|
||||
Lists_st, "variant_list", variant_list, desc->_variant_descriptor);
|
||||
EET_DATA_DESCRIPTOR_ADD_LIST(_desc->_lists_descriptor,
|
||||
Lists_st, "variant_list", variant_list, _desc->_variant_descriptor);
|
||||
|
||||
return desc;
|
||||
return _desc;
|
||||
}
|
||||
|
||||
void _data_descriptors_shutdown(void)
|
||||
{
|
||||
if (desc)
|
||||
if (_desc)
|
||||
{
|
||||
eet_data_descriptor_free(desc->mouse_in_mouse_out);
|
||||
eet_data_descriptor_free(desc->mouse_down_mouse_up);
|
||||
eet_data_descriptor_free(desc->mouse_move);
|
||||
eet_data_descriptor_free(desc->mouse_wheel);
|
||||
eet_data_descriptor_free(desc->multi_event);
|
||||
eet_data_descriptor_free(desc->multi_move);
|
||||
eet_data_descriptor_free(desc->key_down_key_up);
|
||||
eet_data_descriptor_free(desc->key_down_key_up_with_keycode);
|
||||
eet_data_descriptor_free(desc->take_screenshot);
|
||||
eet_data_descriptor_free(desc->_lists_descriptor);
|
||||
eet_data_descriptor_free(desc->_variant_descriptor);
|
||||
eet_data_descriptor_free(desc->_variant_unified_descriptor);
|
||||
eet_data_descriptor_free(_desc->mouse_in_mouse_out);
|
||||
eet_data_descriptor_free(_desc->mouse_down_mouse_up);
|
||||
eet_data_descriptor_free(_desc->mouse_move);
|
||||
eet_data_descriptor_free(_desc->mouse_wheel);
|
||||
eet_data_descriptor_free(_desc->multi_event);
|
||||
eet_data_descriptor_free(_desc->multi_move);
|
||||
eet_data_descriptor_free(_desc->key_down_key_up);
|
||||
eet_data_descriptor_free(_desc->key_down_key_up_with_keycode);
|
||||
eet_data_descriptor_free(_desc->take_screenshot);
|
||||
eet_data_descriptor_free(_desc->_lists_descriptor);
|
||||
eet_data_descriptor_free(_desc->_variant_descriptor);
|
||||
eet_data_descriptor_free(_desc->_variant_unified_descriptor);
|
||||
|
||||
free(desc);
|
||||
desc = NULL;
|
||||
free(_desc);
|
||||
_desc = NULL;
|
||||
/* FIXME: Should probably only init and shutdown once */
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue