ethumb_file_get and some cleanup

SVN revision: 40352
This commit is contained in:
Viktor Kojouharov 2009-04-24 18:53:11 +00:00
parent 93d9e9a8b6
commit 619def6ea5
2 changed files with 14 additions and 2 deletions

View File

@ -294,10 +294,11 @@ _ethumb_frame_free(Ethumb_Frame *frame)
EAPI void EAPI void
ethumb_free(Ethumb *ethumb) ethumb_free(Ethumb *ethumb)
{ {
if (!ethumb) EINA_SAFETY_ON_NULL_RETURN(ethumb);
return;
if (ethumb->frame) if (ethumb->frame)
_ethumb_frame_free(ethumb->frame); _ethumb_frame_free(ethumb->frame);
ethumb_file_free(ethumb);
ecore_evas_free(ethumb->ee); ecore_evas_free(ethumb->ee);
eina_stringshare_del(ethumb->thumb_dir); eina_stringshare_del(ethumb->thumb_dir);
eina_stringshare_del(ethumb->category); eina_stringshare_del(ethumb->category);
@ -529,6 +530,16 @@ ethumb_file_set(Ethumb *e, const char *path, const char *key)
return 1; return 1;
} }
EAPI void
ethumb_file_get(Ethumb *e, const char **path, const char **key)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(e, NULL);
if (path) *path = e->src_path;
if (key) *key = e->src_key;
}
static const char * static const char *
_ethumb_generate_hash(const char *file) _ethumb_generate_hash(const char *file)
{ {

View File

@ -100,6 +100,7 @@ EAPI void ethumb_video_time_set(Ethumb *e, float time) EINA_ARG_NONNULL(1);
EAPI void ethumb_document_page_set(Ethumb *e, int page) EINA_ARG_NONNULL(1); EAPI void ethumb_document_page_set(Ethumb *e, int page) EINA_ARG_NONNULL(1);
EAPI int ethumb_file_set(Ethumb *e, const char *path, const char *key) EINA_ARG_NONNULL(1, 2); 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_free(Ethumb *e) 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 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 const char * ethumb_thumb_path_get(Ethumb *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE;