Changeset 38c49736fe32fa0a12be8e01c1e65f9f2ec6984e

Timestamp:

02/22/10 12:20:03 (5 months ago)

Author:

Tobias Bieniek <Tobias.Bieniek@…>

Parents:

971f1b6bc6e01e2707b533b7f7661c544e94bebb

Children:

8fbaec7ac54405201416b0af9a2a3f55d8384067

git-committer:

Tobias Bieniek <Tobias.Bieniek@gmx.de> / 2010-02-22T10:20:03Z+0100

Message:

Audio/VegaVoice: Replaced *MODIFY by ToSysUnit?()/ToUserUnit()

Files:

• src/Audio/VegaVoice.cpp (modified) (3 diffs)

src/Audio/VegaVoice.cpp

@@ -350 +350 @@
       // Later: "AVERAGE THREE POINT FOUR"
       _stprintf(text, _T(",%d"), VWI_CIRCLING);
-      TextToDigitsSmall(text, Calculated->Average30s*LIFTMODIFY);
+      TextToDigitsSmall(text, Units::ToUserUnit(Calculated->Average30s,
+                                                Units::VerticalSpeedUnit));
       DoSend(Time, text);
       return true;
@@ -376 +377 @@
       // "WAYPOINT BELOW TWO HUNDRED"
 
-      if (Calculated->WaypointDistance*DISTANCEMODIFY<20.0) {
+      if (Units::ToUserUnit(Calculated->WaypointDistance,
+                            Units::DistanceUnit) < 20.0) {
 
               if (!settings.EnableVoiceWaypointDistance) return false;
 
               _stprintf(text, _T(",%d"), VWI_PLUS);
-              TextToDigitsLarge(text, Calculated->WaypointDistance*DISTANCEMODIFY);
+              TextToDigitsLarge(text, Units::ToUserUnit(Calculated->WaypointDistance,
+                                                  Units::DistanceUnit));
               DoSend(Time, text);
               return true;
@@ -391 +394 @@
 
                 // TODO feature: BELOW FOUR HUNDRED
-                double tad = Calculated->TaskAltitudeDifference*ALTITUDEMODIFY;
+                double tad = Units::ToUserUnit(Calculated->TaskAltitudeDifference,
+                                         Units::AltitudeUnit);
                 if (fabs(tad)>100) {
                   if (tad>0) {