summaryrefslogtreecommitdiff
path: root/src/lib/ector/software/ector_software_buffer.c
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-05-11 12:57:06 +0100
committerTom Hacohen <tom@stosb.com>2016-05-11 12:57:55 +0100
commit28a2d34ae20885d229accd1c2e482e284be79afc (patch)
tree9a2a2b59eec6734ffd605d0ba495f867d56c05fc /src/lib/ector/software/ector_software_buffer.c
parent1c0ec6788f8f14cb1fea2dd0b85868462243e395 (diff)
Ector generic: Remove .Generic and .Base (hack no longer needed).
Diffstat (limited to 'src/lib/ector/software/ector_software_buffer.c')
-rw-r--r--src/lib/ector/software/ector_software_buffer.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/ector/software/ector_software_buffer.c b/src/lib/ector/software/ector_software_buffer.c
index ecbac54373..65c21c993c 100644
--- a/src/lib/ector/software/ector_software_buffer.c
+++ b/src/lib/ector/software/ector_software_buffer.c
@@ -69,7 +69,7 @@ _ector_software_buffer_base_pixels_clear(Eo *obj, Ector_Software_Buffer_Base_Dat
69 return; 69 return;
70 } 70 }
71 71
72 eo_event_callback_call(obj, ECTOR_GENERIC_BUFFER_EVENT_DETACHED, pd->pixels.u8); 72 eo_event_callback_call(obj, ECTOR_BUFFER_EVENT_DETACHED, pd->pixels.u8);
73 if (!pd->nofree) 73 if (!pd->nofree)
74 { 74 {
75 free(pd->pixels.u8); 75 free(pd->pixels.u8);
@@ -79,7 +79,7 @@ _ector_software_buffer_base_pixels_clear(Eo *obj, Ector_Software_Buffer_Base_Dat
79} 79}
80 80
81EOLIAN static Eina_Bool 81EOLIAN static Eina_Bool
82_ector_software_buffer_base_ector_generic_buffer_pixels_set(Eo *obj, Ector_Software_Buffer_Base_Data *pd, 82_ector_software_buffer_base_ector_buffer_pixels_set(Eo *obj, Ector_Software_Buffer_Base_Data *pd,
83 void *pixels, int width, int height, int stride, 83 void *pixels, int width, int height, int stride,
84 Efl_Gfx_Colorspace cspace, Eina_Bool writable, 84 Efl_Gfx_Colorspace cspace, Eina_Bool writable,
85 unsigned char l, unsigned char r, 85 unsigned char l, unsigned char r,
@@ -152,7 +152,7 @@ _ector_software_buffer_base_ector_generic_buffer_pixels_set(Eo *obj, Ector_Softw
152} 152}
153 153
154EOLIAN static void * 154EOLIAN static void *
155_ector_software_buffer_base_ector_generic_buffer_map(Eo *obj EINA_UNUSED, Ector_Software_Buffer_Base_Data *pd, 155_ector_software_buffer_base_ector_buffer_map(Eo *obj EINA_UNUSED, Ector_Software_Buffer_Base_Data *pd,
156 unsigned int *length, Ector_Buffer_Access_Flag mode, 156 unsigned int *length, Ector_Buffer_Access_Flag mode,
157 unsigned int x, unsigned int y, unsigned int w, unsigned int h, 157 unsigned int x, unsigned int y, unsigned int w, unsigned int h,
158 Efl_Gfx_Colorspace cspace EINA_UNUSED, unsigned int *stride) 158 Efl_Gfx_Colorspace cspace EINA_UNUSED, unsigned int *stride)
@@ -246,7 +246,7 @@ on_fail:
246} 246}
247 247
248EOLIAN static void 248EOLIAN static void
249_ector_software_buffer_base_ector_generic_buffer_unmap(Eo *obj EINA_UNUSED, Ector_Software_Buffer_Base_Data *pd, 249_ector_software_buffer_base_ector_buffer_unmap(Eo *obj EINA_UNUSED, Ector_Software_Buffer_Base_Data *pd,
250 void *data, unsigned int length) 250 void *data, unsigned int length)
251{ 251{
252 Ector_Software_Buffer_Map *map; 252 Ector_Software_Buffer_Map *map;
@@ -302,26 +302,26 @@ _ector_software_buffer_base_ector_generic_buffer_unmap(Eo *obj EINA_UNUSED, Ecto
302} 302}
303 303
304EOLIAN static uint8_t * 304EOLIAN static uint8_t *
305_ector_software_buffer_base_ector_generic_buffer_span_get(Eo *obj, Ector_Software_Buffer_Base_Data *pd, 305_ector_software_buffer_base_ector_buffer_span_get(Eo *obj, Ector_Software_Buffer_Base_Data *pd,
306 int x, int y, unsigned int w, Efl_Gfx_Colorspace cspace, 306 int x, int y, unsigned int w, Efl_Gfx_Colorspace cspace,
307 unsigned int *length) 307 unsigned int *length)
308{ 308{
309 // ector_buffer_map 309 // ector_buffer_map
310 return _ector_software_buffer_base_ector_generic_buffer_map 310 return _ector_software_buffer_base_ector_buffer_map
311 (obj, pd, length, ECTOR_BUFFER_ACCESS_FLAG_READ, x, y, w, 1, cspace, NULL); 311 (obj, pd, length, ECTOR_BUFFER_ACCESS_FLAG_READ, x, y, w, 1, cspace, NULL);
312} 312}
313 313
314EOLIAN static void 314EOLIAN static void
315_ector_software_buffer_base_ector_generic_buffer_span_free(Eo *obj, Ector_Software_Buffer_Base_Data *pd, 315_ector_software_buffer_base_ector_buffer_span_free(Eo *obj, Ector_Software_Buffer_Base_Data *pd,
316 uint8_t *data) 316 uint8_t *data)
317{ 317{
318 // ector_buffer_unmap 318 // ector_buffer_unmap
319 return _ector_software_buffer_base_ector_generic_buffer_unmap 319 return _ector_software_buffer_base_ector_buffer_unmap
320 (obj, pd, data, (unsigned int) -1); 320 (obj, pd, data, (unsigned int) -1);
321} 321}
322 322
323EOLIAN static Ector_Buffer_Flag 323EOLIAN static Ector_Buffer_Flag
324_ector_software_buffer_base_ector_generic_buffer_flags_get(Eo *obj EINA_UNUSED, Ector_Software_Buffer_Base_Data *pd) 324_ector_software_buffer_base_ector_buffer_flags_get(Eo *obj EINA_UNUSED, Ector_Software_Buffer_Base_Data *pd)
325{ 325{
326 return ECTOR_BUFFER_FLAG_CPU_READABLE | 326 return ECTOR_BUFFER_FLAG_CPU_READABLE |
327 ECTOR_BUFFER_FLAG_DRAWABLE | 327 ECTOR_BUFFER_FLAG_DRAWABLE |
@@ -338,7 +338,7 @@ _ector_software_buffer_eo_base_constructor(Eo *obj, void *data EINA_UNUSED)
338 Ector_Software_Buffer_Base_Data *pd; 338 Ector_Software_Buffer_Base_Data *pd;
339 obj = eo_constructor(eo_super(obj, MY_CLASS)); 339 obj = eo_constructor(eo_super(obj, MY_CLASS));
340 pd = eo_data_scope_get(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN); 340 pd = eo_data_scope_get(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
341 pd->generic = eo_data_ref(obj, ECTOR_GENERIC_BUFFER_MIXIN); 341 pd->generic = eo_data_ref(obj, ECTOR_BUFFER_MIXIN);
342 pd->generic->eo = obj; 342 pd->generic->eo = obj;
343 return obj; 343 return obj;
344} 344}