timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

evas: change cache API to forward Eo object.

This commit is contained in:
Cedric Bail 2013-06-13 15:50:01 +09:00
parent ab9c734b7f
commit 1073084807
9 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/evas/cache/evas_cache.h vendored
View File

@ -165,9 +165,9 @@ EAPI Engine_Image_Entry* evas_cache_engine_image_size_set(Engine_Image_Entr
EAPI void evas_cache_engine_image_load_data(Engine_Image_Entry *eim);
EAPI void evas_cache_image_preload_data(Image_Entry *im, const void *target,
EAPI void evas_cache_image_preload_data(Image_Entry *im, const Eo *target,
Evas_Engine_Thread_Task_Cb func, const void *engine_data, const void *custom_data);
EAPI void evas_cache_image_preload_cancel(Image_Entry *im, const void *target);
EAPI void evas_cache_image_preload_cancel(Image_Entry *im, const Eo *target);
EAPI void evas_cache_image_wakeup(void);

14
src/lib/evas/cache/evas_cache_image.c vendored
View File

@ -33,7 +33,7 @@ static Eina_Condition cond_wakeup;
static const Image_Entry_Task dummy_task = { NULL, NULL, NULL };
static void _evas_cache_image_entry_preload_remove(Image_Entry *ie, const void *target);
static void _evas_cache_image_entry_preload_remove(Image_Entry *ie, const Eo *target);
#define FREESTRC(Var) \
if (Var) \
@ -435,7 +435,7 @@ _evas_cache_image_async_cancel(void *data)
// note - preload_add assumes a target is ONLY added ONCE to the image
// entry. make sure you only add once, or remove first, then add
static int
_evas_cache_image_entry_preload_add(Image_Entry *ie, const void *target,
_evas_cache_image_entry_preload_add(Image_Entry *ie, const Eo *target,
Evas_Engine_Thread_Task_Cb func, const void *engine_data, const void *custom_data)
{
Evas_Cache_Target *tg;
@ -483,7 +483,7 @@ _evas_cache_image_entry_preload_add(Image_Entry *ie, const void *target,
}
static void
_evas_cache_image_entry_preload_remove(Image_Entry *ie, const void *target)
_evas_cache_image_entry_preload_remove(Image_Entry *ie, const Eo *target)
{
Evas_Cache_Target *tg;
Eina_List *l;
@ -1244,23 +1244,23 @@ evas_cache_image_is_loaded(Image_Entry *im)
}
EAPI void
evas_cache_image_preload_data(Image_Entry *im, const void *target,
evas_cache_image_preload_data(Image_Entry *im, const Eo *target,
Evas_Engine_Thread_Task_Cb func, const void *engine_data, const void *custom_data)
{
RGBA_Image *img = (RGBA_Image *)im;
if ((im->flags.loaded) && (img->image.data))
{
evas_object_inform_call_image_preloaded((Evas_Object *)target);
evas_object_inform_call_image_preloaded((Evas_Object*)target);
return;
}
im->flags.loaded = 0;
if (!_evas_cache_image_entry_preload_add(im, target, func, engine_data, custom_data))
evas_object_inform_call_image_preloaded((Evas_Object *)target);
evas_object_inform_call_image_preloaded((Evas_Object*) target);
}
EAPI void
evas_cache_image_preload_cancel(Image_Entry *im, const void *target)
evas_cache_image_preload_cancel(Image_Entry *im, const Eo *target)
{
if (!target) return;
_evas_cache_image_entry_preload_remove(im, target);

2
src/lib/evas/include/evas_common.h
View File

@ -532,7 +532,7 @@ struct _Image_Entry_Frame
struct _Evas_Cache_Target
{
EINA_INLIST;
const void *target;
const Eo *target;
void *data;
};

4
src/lib/evas/include/evas_private.h
View File

@ -806,8 +806,8 @@ struct _Evas_Func
void *(*image_dirty_region) (void *data, void *image, int x, int y, int w, int h);
void *(*image_data_get) (void *data, void *image, int to_write, DATA32 **image_data, int *err);
void *(*image_data_put) (void *data, void *image, DATA32 *image_data);
void (*image_data_preload_request) (void *data, void *image, const void *target);
void (*image_data_preload_cancel) (void *data, void *image, const void *target);
void (*image_data_preload_request) (void *data, void *image, const Eo *target);
void (*image_data_preload_cancel) (void *data, void *image, const Eo *target);
void *(*image_alpha_set) (void *data, void *image, int has_alpha);
int (*image_alpha_get) (void *data, void *image);
void *(*image_border_set) (void *data, void *image, int l, int r, int t, int b);

4
src/modules/evas/engines/gl_cocoa/evas_engine.c
View File

@ -855,7 +855,7 @@ eng_image_data_put(void *data, void *image, DATA32 *image_data)
}
static void
eng_image_data_preload_request(void *data EINA_UNUSED, void *image, const void *target)
eng_image_data_preload_request(void *data EINA_UNUSED, void *image, const Eo *target)
{
Evas_GL_Image *gim = image;
RGBA_Image *im;
@ -868,7 +868,7 @@ eng_image_data_preload_request(void *data EINA_UNUSED, void *image, const void *
}
static void
eng_image_data_preload_cancel(void *data EINA_UNUSED, void *image, const void *target)
eng_image_data_preload_cancel(void *data EINA_UNUSED, void *image, const Eo *target)
{
Evas_GL_Image *gim = image;
RGBA_Image *im;

4
src/modules/evas/engines/gl_sdl/evas_engine.c
View File

@ -711,7 +711,7 @@ eng_image_data_put(void *data EINA_UNUSED, void *image, DATA32 *image_data)
}
static void
eng_image_data_preload_request(void *data EINA_UNUSED, void *image, const void *target)
eng_image_data_preload_request(void *data EINA_UNUSED, void *image, const Eo *target)
{
Evas_GL_Image *gim = image;
RGBA_Image *im;
@ -724,7 +724,7 @@ eng_image_data_preload_request(void *data EINA_UNUSED, void *image, const void *
}
static void
eng_image_data_preload_cancel(void *data EINA_UNUSED, void *image, const void *target)
eng_image_data_preload_cancel(void *data EINA_UNUSED, void *image, const Eo *target)
{
Evas_GL_Image *gim = image;
RGBA_Image *im;

4
src/modules/evas/engines/gl_x11/evas_engine.c
View File

@ -2765,7 +2765,7 @@ eng_image_data_put(void *data, void *image, DATA32 *image_data)
}
static void
eng_image_data_preload_request(void *data EINA_UNUSED, void *image, const void *target)
eng_image_data_preload_request(void *data EINA_UNUSED, void *image, const Eo *target)
{
Evas_GL_Image *gim = image;
RGBA_Image *im;
@ -2778,7 +2778,7 @@ eng_image_data_preload_request(void *data EINA_UNUSED, void *image, const void *
}
static void
eng_image_data_preload_cancel(void *data EINA_UNUSED, void *image, const void *target)
eng_image_data_preload_cancel(void *data EINA_UNUSED, void *image, const Eo *target)
{
Evas_GL_Image *gim = image;
RGBA_Image *im;

4
src/modules/evas/engines/software_generic/evas_engine.c
View File

@ -1155,7 +1155,7 @@ eng_image_data_put(void *data, void *image, DATA32 *image_data)
}
static void
eng_image_data_preload_request(void *data EINA_UNUSED, void *image, const void *target)
eng_image_data_preload_request(void *data EINA_UNUSED, void *image, const Eo *target)
{
RGBA_Image *im = image;
if (!im) return ;
@ -1171,7 +1171,7 @@ eng_image_data_preload_request(void *data EINA_UNUSED, void *image, const void *
}
static void
eng_image_data_preload_cancel(void *data EINA_UNUSED, void *image, const void *target)
eng_image_data_preload_cancel(void *data EINA_UNUSED, void *image, const Eo *target)
{
RGBA_Image *im = image;
#ifdef EVAS_CSERVE2

4
src/modules/evas/engines/wayland_egl/evas_engine.c
View File

@ -1797,7 +1797,7 @@ eng_image_data_put(void *data, void *image, DATA32 *image_data)
}
static void
eng_image_data_preload_request(void *data EINA_UNUSED, void *image, const void *target)
eng_image_data_preload_request(void *data EINA_UNUSED, void *image, const Eo *target)
{
Evas_GL_Image *gim;
RGBA_Image *im;
@ -1810,7 +1810,7 @@ eng_image_data_preload_request(void *data EINA_UNUSED, void *image, const void *
}
static void
eng_image_data_preload_cancel(void *data EINA_UNUSED, void *image, const void *target)
eng_image_data_preload_cancel(void *data EINA_UNUSED, void *image, const Eo *target)
{
Evas_GL_Image *gim;
RGBA_Image *im;