E SVN: antognolli trunk/PROTO/ethumb/src/lib

[Enlightenment S. <no-...@en...>]

Log:
  Fixed some API errors:
  
   - added 'const' to many functions;
   - changed ethumb_thumb_path_get() so that now it returns the key;
  
  
Author:       antognolli
Date:         2009-05-19 04:54:35 -0700 (Tue, 19 May 2009)
New Revision: 40737

Modified:
  trunk/PROTO/ethumb/src/lib/Ethumb.c trunk/PROTO/ethumb/src/lib/Ethumb.h trunk/PROTO/ethumb/src/lib/Ethumb_Plugin.h 

Modified: trunk/PROTO/ethumb/src/lib/Ethumb.c
===================================================================
--- trunk/PROTO/ethumb/src/lib/Ethumb.c	2009-05-19 11:46:34 UTC (rev 40736)
+++ trunk/PROTO/ethumb/src/lib/Ethumb.c	2009-05-19 11:54:35 UTC (rev 40737)
@@ -367,7 +367,7 @@
 }
 
 EAPI void
-ethumb_thumb_crop_align_get(Ethumb *e, float *x, float *y)
+ethumb_thumb_crop_align_get(const Ethumb *e, float *x, float *y)
 {
    EINA_SAFETY_ON_NULL_RETURN(e);
 
@@ -469,7 +469,7 @@
 }
 
 EAPI const char *
-ethumb_thumb_dir_path_get(Ethumb *e)
+ethumb_thumb_dir_path_get(const Ethumb *e)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(e, NULL);
 
@@ -485,7 +485,7 @@
 }
 
 EAPI const char *
-ethumb_thumb_category_get(Ethumb *e)
+ethumb_thumb_category_get(const Ethumb *e)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(e, NULL);
 
@@ -544,7 +544,7 @@
 }
 
 EAPI void
-ethumb_file_get(Ethumb *e, const char **path, const char **key)
+ethumb_file_get(const Ethumb *e, const char **path, const char **key)
 {
    EINA_SAFETY_ON_NULL_RETURN(e);
 
@@ -736,14 +736,15 @@
      }
 }
 
-EAPI const char *
-ethumb_thumb_path_get(Ethumb *e)
+EAPI void
+ethumb_thumb_path_get(Ethumb *e, const char **path, const char **key)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(e, NULL);
    if (!e->thumb_path)
      _ethumb_file_generate_path(e);
 
-   return e->thumb_path;
+   if (*path) *path = e->thumb_path;
+   if (*key) *key = e->thumb_key;
 }
 
 void
@@ -1033,7 +1034,7 @@
 }
 
 Evas *
-ethumb_evas_get(Ethumb *e)
+ethumb_evas_get(const Ethumb *e)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(e, NULL);
 

Modified: trunk/PROTO/ethumb/src/lib/Ethumb.h
===================================================================
--- trunk/PROTO/ethumb/src/lib/Ethumb.h	2009-05-19 11:46:34 UTC (rev 40736)
+++ trunk/PROTO/ethumb/src/lib/Ethumb.h	2009-05-19 11:54:35 UTC (rev 40737)
@@ -86,16 +86,16 @@
 EAPI Ethumb_Thumb_Aspect ethumb_thumb_aspect_get(const Ethumb *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE;
 
 EAPI void ethumb_thumb_crop_align_set(Ethumb *e, float x, float y) EINA_ARG_NONNULL(1);
-EAPI void ethumb_thumb_crop_align_get(Ethumb *e, float *x, float *y) EINA_ARG_NONNULL(1);
+EAPI void ethumb_thumb_crop_align_get(const Ethumb *e, float *x, float *y) EINA_ARG_NONNULL(1);
 
 EAPI int ethumb_frame_set(Ethumb *e, const char *theme_file, const char *group, const char *swallow) EINA_ARG_NONNULL(1);
 EAPI void ethumb_frame_get(const Ethumb *e, const char **theme_file, const char **group, const char **swallow) EINA_ARG_NONNULL(1);
 
 EAPI void ethumb_thumb_dir_path_set(Ethumb *e, const char *path) EINA_ARG_NONNULL(1);
-EAPI const char * ethumb_thumb_dir_path_get(Ethumb *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE;
+EAPI const char * ethumb_thumb_dir_path_get(const Ethumb *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE;
 
 EAPI void ethumb_thumb_category_set(Ethumb *e, const char *category) EINA_ARG_NONNULL(1);
-EAPI const char * ethumb_thumb_category_get(Ethumb *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE;
+EAPI const char * ethumb_thumb_category_get(const Ethumb *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE;
 
 EAPI void ethumb_video_time_set(Ethumb *e, float time) EINA_ARG_NONNULL(1);
 EAPI float ethumb_video_time_get(const Ethumb *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE;
@@ -104,10 +104,10 @@
 EAPI int ethumb_document_page_get(const Ethumb *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE;
 
 EAPI int ethumb_file_set(Ethumb *e, const char *path, const char *key) EINA_ARG_NONNULL(1, 2);
-EAPI void ethumb_file_get(Ethumb *e, const char **path, const char **key) EINA_ARG_NONNULL(1);
+EAPI void ethumb_file_get(const Ethumb *e, const char **path, const char **key) EINA_ARG_NONNULL(1);
 EAPI void ethumb_file_free(Ethumb *e) EINA_ARG_NONNULL(1);
 EAPI void ethumb_thumb_path_set(Ethumb *e, const char *path, const char *key) EINA_ARG_NONNULL(1);
-EAPI const char * ethumb_thumb_path_get(Ethumb *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE;
+EAPI void ethumb_thumb_path_get(Ethumb *e, const char **path, const char **key) EINA_ARG_NONNULL(1);
 EAPI int ethumb_generate(Ethumb *e, ethumb_generate_callback_t finished_cb, void *data) EINA_ARG_NONNULL(1, 2);
 EAPI int ethumb_exists(Ethumb *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE;
 

Modified: trunk/PROTO/ethumb/src/lib/Ethumb_Plugin.h
===================================================================
--- trunk/PROTO/ethumb/src/lib/Ethumb_Plugin.h	2009-05-19 11:46:34 UTC (rev 40736)
+++ trunk/PROTO/ethumb/src/lib/Ethumb_Plugin.h	2009-05-19 11:54:35 UTC (rev 40737)
@@ -18,6 +18,6 @@
 int ethumb_plugin_image_resize(Ethumb *e, int w, int h);
 int ethumb_image_save(Ethumb *e);
 void ethumb_finished_callback_call(Ethumb *e);
-Evas * ethumb_evas_get(Ethumb *e);
+Evas * ethumb_evas_get(const Ethumb *e);
 
 #endif /* _ETHUMB_PLUGIN_H_ */