evas: final cleanup of the API, should be ready to make it public by now.

2 files changed, 16 insertions, 11 deletions

diff --git a/src/lib/evas/include/evas_common.h b/src/lib/evas/include/evas_common.h
index 1991b6b413..a1b94fcc20 100644
--- a/src/lib/evas/include/evas_common.h
+++ b/src/lib/evas/include/evas_common.h
@@ -633,6 +633,13 @@ struct _Image_Entry
    LK(lock);
    LK(lock_cancel);
 
+   /* for animation feature */
+   Image_Entry_Animated   animated;
+
+   /* Reference to the file */
+   Eina_File             *f;
+   void                  *loader_data;
+  
    Image_Entry_Flags      flags;
    Evas_Image_Scale_Hint  scale_hint;
    void                  *data1, *data2;
@@ -643,9 +650,6 @@ struct _Image_Entry
    int                    connect_num;
    int                    channel;
    int                    load_error;
-
-   /* for animation feature */
-   Image_Entry_Animated   animated;
 };
 
 struct _Engine_Image_Entry
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 1adb15b016..bc3805e7cf 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -903,20 +903,21 @@ struct _Evas_Func
 struct _Evas_Image_Load_Func
 {
   Eina_Bool threadable;
-  Eina_Bool (*file_head) (Eina_File *f, const char *key,
-                          Evas_Image_Property *prop,
+  void     *(*file_open) (Eina_File *f, const char *key,
                           Evas_Image_Load_Opts *opts,
                           Evas_Image_Animated *animated,
                           int *error);
-  Eina_Bool (*file_data) (Eina_File *f, const char *key,
+  void     (*file_close) (void *loader_data);
+
+  Eina_Bool (*file_head) (void *loader_data,
                           Evas_Image_Property *prop,
-                          Evas_Image_Load_Opts *opts,
-                          Evas_Image_Animated *animated,
-                          void *pixels,
                           int *error);
-  double    (*frame_duration) (Eina_File *f,
-                               Evas_Image_Animated *animated,
+  Eina_Bool (*file_data) (void *loader_data,
+                          Evas_Image_Property *prop,
+                          void *pixels, int *error);
+  double    (*frame_duration) (void *loader_data,
                                int start, int frame_num);
+
   Eina_Bool do_region;
 };