X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=befa0cdcf3b50e13c95a6fe017979fad23442f91;hb=9933ccd7cf3a84ca60330a810e7763668ad882fb;hp=ccb007dcbd5be6453fa94b1886d37f03f8d560c5;hpb=1efcf4538b8a034e8b288d5b9c375ba99b1d845f;p=ext%2Fsubsurface.git

diff --git a/dive.h b/dive.h
index ccb007d..befa0cd 100644
--- a/dive.h
+++ b/dive.h
@@ -87,6 +87,8 @@ typedef struct {
 	pressure_t start, end, sample_start, sample_end;
 } cylinder_t;
 
+extern int cylinder_none(cylinder_t *cyl);
+
 extern int get_pressure_units(unsigned int mb, const char **units);
 extern double get_depth_units(unsigned int mm, int *frac, const char **units);
 extern double get_volume_units(unsigned int mm, int *frac, const char **units);
@@ -199,6 +201,7 @@ struct dive {
 	char *location;
 	char *notes;
 	char *divemaster, *buddy;
+	int rating;
 	double latitude, longitude;
 	depth_t maxdepth, meandepth;
 	duration_t duration, surfacetime;
@@ -251,9 +254,11 @@ static inline struct dive *get_dive(unsigned int nr)
 }
 
 extern void parse_xml_init(void);
-extern void parse_xml_file(const char *filename, GError **error);
+extern void parse_xml_buffer(const char *url, const char *buf, int size, GError **error);
 extern void set_filename(const char *filename);
 
+extern void parse_file(const char *filename, GError **error);
+
 #ifdef XSLT
 extern xmlDoc *test_xslt_transforms(xmlDoc *doc);
 #endif
@@ -278,7 +283,7 @@ extern struct dive *alloc_dive(void);
 extern void record_dive(struct dive *dive);
 
 extern struct sample *prepare_sample(struct dive **divep);
-extern void finish_sample(struct dive *dive, struct sample *sample);
+extern void finish_sample(struct dive *dive);
 
 extern void report_dives(gboolean imported);
 extern struct dive *fixup_dive(struct dive *dive);
@@ -313,5 +318,16 @@ const char *monthname(int mon);
 
 #define UTF8_DEGREE "\xc2\xb0"
 #define UTF8_SUBSCRIPT_2 "\xe2\x82\x82"
+#define UTF8_WHITESTAR "\xe2\x98\x86"
+#define UTF8_BLACKSTAR "\xe2\x98\x85"
+#define ZERO_STARS	UTF8_WHITESTAR UTF8_WHITESTAR UTF8_WHITESTAR UTF8_WHITESTAR UTF8_WHITESTAR
+#define ONE_STARS	UTF8_BLACKSTAR UTF8_WHITESTAR UTF8_WHITESTAR UTF8_WHITESTAR UTF8_WHITESTAR
+#define TWO_STARS	UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_WHITESTAR UTF8_WHITESTAR UTF8_WHITESTAR
+#define THREE_STARS	UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_WHITESTAR UTF8_WHITESTAR
+#define FOUR_STARS	UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_WHITESTAR
+#define FIVE_STARS	UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR
+extern const char *star_strings[];
+
+#define AIR_PERMILLE 209
 
 #endif /* DIVE_H */