Move more dive computer filled data to the divecomputer structure

This moves the fields 'duration', 'surfacetime', 'maxdepth',
'meandepth', 'airtemp', 'watertemp', 'salinity' and 'surface_pressure'
to the per-divecomputer data structure.  They are filled in by the dive
computer, and normally not edited.

NOTE! All actual *use* of this data was then changed from dive->field to
dive->dc.field programmatically with a shell-script and sed, and the
result then edited for details.  So while the XML save and restore code
has been updated, all the displaying etc will currently always just show
the first dive computer entry.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 8 insertions, 8 deletions

diff --git a/info.c b/info.c
index 9deaa3901..7b5298a32 100644
--- a/info.c
+++ b/info.c
@@ -460,8 +460,8 @@ static void save_dive_info_changes(struct dive *dive, struct dive *master, struc
 		default:
 			mkelvin = 0;
 		}
-		if (mkelvin != dive->airtemp.mkelvin) {
-			dive->airtemp.mkelvin = mkelvin;
+		if (mkelvin != dive->dc.airtemp.mkelvin) {
+			dive->dc.airtemp.mkelvin = mkelvin;
 			changed = 1;
 		}
 	}
@@ -532,9 +532,9 @@ static void dive_info_widget(GtkWidget *box, struct dive *dive, struct dive_info
 
 	info->viz = text_entry(hbox, _("Visibility"), star_list, star_strings[dive->visibility]);
 
-	value = get_temp_units(dive->airtemp.mkelvin, &unit);
+	value = get_temp_units(dive->dc.airtemp.mkelvin, &unit);
 	snprintf(buffer, sizeof(buffer), _("Air Temp in %s"), unit);
-	if (dive->airtemp.mkelvin)
+	if (dive->dc.airtemp.mkelvin)
 		snprintf(airtemp, sizeof(airtemp), "%.1f", value);
 	else
 		airtemp[0] = '\0';
@@ -873,7 +873,7 @@ static timestamp_t dive_time_widget(struct dive *dive)
 	 */
 	if (amount_selected == 1) {
 		timestamp_t when = current_dive->when;
-		when += current_dive->duration.seconds;
+		when += current_dive->dc.duration.seconds;
 		when += 60*60;
 		utc_mkdate(when, &tm);
 		time = &tm;
@@ -923,12 +923,12 @@ static timestamp_t dive_time_widget(struct dive *dive)
 
 	val = gtk_spin_button_get_value(GTK_SPIN_BUTTON(depth));
 	if (prefs.units.length == FEET) {
-		dive->maxdepth.mm = feet_to_mm(val);
+		dive->dc.maxdepth.mm = feet_to_mm(val);
 	} else {
-		dive->maxdepth.mm = val * 1000 + 0.5;
+		dive->dc.maxdepth.mm = val * 1000 + 0.5;
 	}
 
-	dive->duration.seconds = gtk_spin_button_get_value(GTK_SPIN_BUTTON(duration))*60;
+	dive->dc.duration.seconds = gtk_spin_button_get_value(GTK_SPIN_BUTTON(duration))*60;
 
 	gtk_widget_destroy(dialog);
 	dive->when = utc_mktime(&tm);