X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Fao-view%2Faoview_file.c;h=ade52263b4654393065eac129329b0e7c7decd5e;hb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;hp=5288c2f7530cde26903a2f76f88167d20806614d;hpb=0c771d999914f9d17c723900f2987acc45fd0fbb;p=fw%2Faltos

diff --git a/ao-tools/ao-view/aoview_file.c b/ao-tools/ao-view/aoview_file.c
index 5288c2f7..ade52263 100644
--- a/ao-tools/ao-view/aoview_file.c
+++ b/ao-tools/ao-view/aoview_file.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -28,6 +29,7 @@ struct aoview_file {
 	char	*name;
 	int	failed;
 	int	serial;
+	int	flight;
 	int	sequence;
 };
 
@@ -94,6 +96,7 @@ gboolean
 aoview_file_start(struct aoview_file *file)
 {
 	char		base[50];
+	char		seq[20];
 	struct tm	tm;
 	time_t		now;
 	char		*full;
@@ -105,34 +108,17 @@ aoview_file_start(struct aoview_file *file)
 	if (file->failed)
 		return FALSE;
 
-	now = time(NULL);
-	(void) localtime_r(&now, &tm);
-	aoview_mkdir(aoview_file_dir);
-	for (;;) {
-		snprintf(base, sizeof (base), "%04d-%02d-%02d-serial-%03d-flight-%03d.%s",
-			tm.tm_year + 1900,
-			tm.tm_mon + 1,
-			tm.tm_mday,
-			file->serial,
-			file->sequence,
-			file->ext);
-		full = aoview_fullname(aoview_file_dir, base);
-		r = access(full, F_OK);
-		if (r < 0) {
-			file->file = fopen(full, "w");
-			if (!file->file) {
-				aoview_file_open_failed(full);
-				free(full);
-				file->failed = 1;
-				return FALSE;
-			} else {
-				setlinebuf(file->file);
-				file->name = full;
-				return TRUE;
-			}
-		}
+	full = cc_make_filename(file->serial, file->flight, file->ext);
+	file->file = fopen(full, "w");
+	if (!file->file) {
+		aoview_file_open_failed(full);
 		free(full);
-		file->sequence++;
+		file->failed = 1;
+		return FALSE;
+	} else {
+		setlinebuf(file->file);
+		file->name = full;
+		return TRUE;
 	}
 }
 
@@ -195,6 +181,20 @@ aoview_file_get_serial(struct aoview_file *file)
 	return file->serial;
 }
 
+void
+aoview_file_set_flight(struct aoview_file *file, int flight)
+{
+	if (flight != file->flight)
+		aoview_file_finish(file);
+	file->flight = flight;
+}
+
+int
+aoview_file_get_flight(struct aoview_file *file)
+{
+	return file->flight;
+}
+
 void
 aoview_file_init(GladeXML *xml)
 {