enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

edje_cc -> nothreads means we should avoid evas preload too.. grrr. 

SVN revision: 73436
This commit is contained in:
Carsten Haitzler 2012-07-07 03:25:31 +00:00
parent 774dc99006
commit 84072d0f82
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
legacy/edje/src/bin/edje_cc_out.c
View File

@ -610,7 +610,7 @@ static void
data_thread_image(void *data, Ecore_Thread *thread __UNUSED__) data_thread_image(void *data, Ecore_Thread *thread __UNUSED__)
{ {
Image_Write *iw = data; Image_Write *iw = data;
char buf[PATH_MAX]; char buf[PATH_MAX], buf2[PATH_MAX];
unsigned int *start, *end; unsigned int *start, *end;
Eina_Bool opaque = EINA_TRUE; Eina_Bool opaque = EINA_TRUE;
int bytes = 0; int bytes = 0;
@ -683,21 +683,21 @@ data_thread_image(void *data, Ecore_Thread *thread __UNUSED__)
0, qual, 1); 0, qual, 1);
if (bytes <= 0) if (bytes <= 0)
{ {
snprintf(buf, sizeof(buf), snprintf(buf2, sizeof(buf2),
"Unable to write image part " "Unable to write image part "
"\"%s\" as \"%s\" part entry to " "\"%s\" as \"%s\" part entry to "
"%s\n", iw->img->entry, buf, file_out); "%s\n", iw->img->entry, buf, file_out);
iw->errstr = strdup(buf); iw->errstr = strdup(buf2);
return; return;
} }
} }
else else
{ {
snprintf(buf, sizeof(buf), snprintf(buf2, sizeof(buf2),
"Unable to load image part " "Unable to load image part "
"\"%s\" as \"%s\" part entry to " "\"%s\" as \"%s\" part entry to "
"%s\n", iw->img->entry, buf, file_out); "%s\n", iw->img->entry, buf, file_out);
iw->errstr = strdup(buf); iw->errstr = strdup(buf2);
return; return;
} }
@ -729,6 +729,7 @@ data_thread_image_end(void *data, Ecore_Thread *thread __UNUSED__)
if (iw->path) free(iw->path); if (iw->path) free(iw->path);
evas_object_del(iw->im); evas_object_del(iw->im);
free(iw); free(iw);
printf("@@@ IMAGE DONE: %i\n", pending_threads);
} }
static void static void
@ -785,10 +786,11 @@ data_write_images(Eet_File *ef, int *image_num)
iw->ef = ef; iw->ef = ef;
iw->img = img; iw->img = img;
iw->im = im = evas_object_image_add(evas); iw->im = im = evas_object_image_add(evas);
evas_object_event_callback_add(im, if (threads)
EVAS_CALLBACK_IMAGE_PRELOADED, evas_object_event_callback_add(im,
data_image_preload_done, EVAS_CALLBACK_IMAGE_PRELOADED,
iw); data_image_preload_done,
iw);
EINA_LIST_FOREACH(img_dirs, ll, s) EINA_LIST_FOREACH(img_dirs, ll, s)
{ {
char buf[PATH_MAX]; char buf[PATH_MAX];
@ -801,8 +803,11 @@ data_write_images(Eet_File *ef, int *image_num)
*image_num += 1; *image_num += 1;
iw->path = strdup(buf); iw->path = strdup(buf);
pending_threads++; pending_threads++;
evas_object_image_preload(im, 0); if (threads)
evas_object_image_preload(im, 0);
using_file(buf); using_file(buf);
if (!threads)
data_image_preload_done(iw, evas, im, NULL);
break; break;
} }
} }
@ -815,8 +820,11 @@ data_write_images(Eet_File *ef, int *image_num)
*image_num += 1; *image_num += 1;
iw->path = strdup(img->entry); iw->path = strdup(img->entry);
pending_threads++; pending_threads++;
evas_object_image_preload(im, 0); if (threads)
evas_object_image_preload(im, 0);
using_file(img->entry); using_file(img->entry);
if (!threads)
data_image_preload_done(iw, evas, im, NULL);
} }
else else
error_and_abort_image_load_error error_and_abort_image_load_error
@ -1241,6 +1249,7 @@ data_scripts_exe_del_cb(void *data __UNUSED__, int evtype __UNUSED__, void *evin
data_thread_script_end(sc, NULL); data_thread_script_end(sc, NULL);
} }
pending_threads--; pending_threads--;
printf("@@@ SCRIPT DONE: %i\n", pending_threads);
if (pending_threads <= 0) ecore_main_loop_quit(); if (pending_threads <= 0) ecore_main_loop_quit();
return ECORE_CALLBACK_CANCEL; return ECORE_CALLBACK_CANCEL;
} }
@ -1607,6 +1616,7 @@ data_write(void)
printf("sounds: %3.5f\n", ecore_time_get() - t); t = ecore_time_get(); printf("sounds: %3.5f\n", ecore_time_get() - t); t = ecore_time_get();
} }
pending_threads--; pending_threads--;
printf("@@@ PENDING: %i\n", pending_threads);
if (pending_threads > 0) ecore_main_loop_begin(); if (pending_threads > 0) ecore_main_loop_begin();
if (verbose) if (verbose)
{ {