Remove commented out code.

[geeqie.git] / src / cache.h

diff --git a/src/cache.h b/src/cache.h
index fa5f3f3..2a9267a 100644 (file)
--- a/src/cache.h
+++ b/src/cache.h
@@ -1,7 +1,7 @@
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Author: John Ellis
  *
@@ -18,8 +18,8 @@
 #include "similar.h"
 
 
-#define GQ_CACHE_RC_THUMB       GQ_RC_DIR G_DIR_SEPARATOR_S "thumbnails"
-#define GQ_CACHE_RC_METADATA    GQ_RC_DIR G_DIR_SEPARATOR_S "metadata"
+#define GQ_CACHE_THUMB         "thumbnails"
+#define GQ_CACHE_METADATA      "metadata"
 
 #define GQ_CACHE_LOCAL_THUMB    ".thumbnails"
 #define GQ_CACHE_LOCAL_METADATA ".metadata"
@@ -27,12 +27,14 @@
 #define GQ_CACHE_EXT_THUMB      ".png"
 #define GQ_CACHE_EXT_SIM        ".sim"
 #define GQ_CACHE_EXT_METADATA   ".meta"
+#define GQ_CACHE_EXT_XMP_METADATA   ".gq.xmp"
 
 
 typedef enum {
        CACHE_TYPE_THUMB,
        CACHE_TYPE_SIM,
-       CACHE_TYPE_METADATA
+       CACHE_TYPE_METADATA,
+       CACHE_TYPE_XMP_METADATA
 } CacheType;
 
 typedef struct _CacheData CacheData;
@@ -46,20 +48,20 @@ struct _CacheData
        guchar md5sum[16];
        ImageSimilarityData *sim;
 
-       gint dimensions;
-       gint have_date;
-       gint have_checksum;
-       gint have_md5sum;
-       gint similarity;
+       gboolean dimensions;
+       gboolean have_date;
+       gboolean have_checksum;
+       gboolean have_md5sum;
+       gboolean similarity;
 };
 
-gint cache_time_valid(const gchar *cache, const gchar *path);
+gboolean cache_time_valid(const gchar *cache, const gchar *path);
 
 
 CacheData *cache_sim_data_new(void);
 void cache_sim_data_free(CacheData *cd);
 
-gint cache_sim_data_save(CacheData *cd);
+gboolean cache_sim_data_save(CacheData *cd);
 CacheData *cache_sim_data_load(const gchar *path);
 
 void cache_sim_data_set_dimensions(CacheData *cd, gint w, gint h);
@@ -69,11 +71,11 @@ void cache_sim_data_set_md5sum(CacheData *cd, guchar digest[16]);
 void cache_sim_data_set_similarity(CacheData *cd, ImageSimilarityData *sd);
 gint cache_sim_data_filled(ImageSimilarityData *sd);
 
-
-gint cache_ensure_dir_exists(gchar *path, mode_t mode);
 gchar *cache_get_location(CacheType type, const gchar *source, gint include_name, mode_t *mode);
 gchar *cache_find_location(CacheType type, const gchar *source);
 
+const gchar *get_thumbnails_cache_dir(void);
+const gchar *get_metadata_cache_dir(void);
 
 #endif
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */