progress printing and bugfixing and build system improvements

[ypp-sc-tools.main.git] / pctb / convert.h

diff --git a/pctb/convert.h b/pctb/convert.h
index 5bb4707b50d4fdfbf21e8b834572cf69f97e19df..cb2bf77e6d0a27a1306cb364bc7baee794a8ca96 100644 (file)
--- a/pctb/convert.h
+++ b/pctb/convert.h
@@ -14,14 +14,28 @@
 /*----- from structure.c -----*/
 
 void find_structure(CanonImage *im);
-CanonImage *file_read_image_ppm(FILE *f);
 void read_screenshots(void);
+void read_one_screenshot(void);
 void analyse(void);
 
 /*----- from convert.c -----*/
 
 extern FILE *screenshots_file;
 
+#define FMT(f,a) __attribute__((format(printf,f,a)))
+
+void vwarning(const char *fmt, va_list) FMT(1,0);
+void warning(const char *fmt, ...)      FMT(1,2);
+
+void vprogress(const char *fmt, va_list) FMT(1,0);
+void progress(const char *fmt, ...)      FMT(1,2);
+
+void vprogress_log(const char *fmt, va_list) FMT(1,0);
+void progress_log(const char *fmt, ...)      FMT(1,2);
+
+void vprogress_spinner(const char *fmt, va_list) FMT(1,0);
+void progress_spinner(const char *fmt, ...)      FMT(1,2);
+
 /*----- from pages.c -----*/
 
 void screenshot_startup(void);