From 8dd278b324bf67662b65024957187256224e615b Mon Sep 17 00:00:00 2001
From: TwinFan <twinfan@sonux.net>
Date: Sat, 21 Oct 2023 01:26:51 +0200
Subject: [PATCH] change: Reset 'Own FMOD inst' setting in v3.4.2

---
 Src/DataRefs.cpp | 15 +++++++++++----
 docs/readme.html | 38 +++++++++++++++++++++++++++++++++-----
 2 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/Src/DataRefs.cpp b/Src/DataRefs.cpp
index dafef58..6fde6e3 100644
--- a/Src/DataRefs.cpp
+++ b/Src/DataRefs.cpp
@@ -2010,7 +2010,7 @@ bool DataRefs::LoadConfigFile()
 
     // which conversion to do with the (older) version of the config file?
     unsigned long cfgFileVer = 0;
-    enum cfgFileConvE { CFG_NO_CONV=0, CFG_V3, CFG_V31, CFG_V331 } conv = CFG_NO_CONV;
+    enum cfgFileConvE { CFG_NO_CONV=0, CFG_V3, CFG_V31, CFG_V331, CFG_V342 } conv = CFG_NO_CONV;
     
     // open a config file
     std::string sFileName (LTCalcFullPath(PATH_CONFIG_FILE));
@@ -2072,8 +2072,10 @@ bool DataRefs::LoadConfigFile()
             // any conversions required?
             if (cfgFileVer < 30100)         // < 3.1.0
                 conv = CFG_V31;
-            else if (cfgFileVer < 30301)    // < 3.3.1
+            if (cfgFileVer < 30301)         // < 3.3.1
                 conv = CFG_V331;
+            if (cfgFileVer < 30402)         // < 3.4.2: Reset Force FMOD instance = 0
+                conv = CFG_V342;
         }
     }
     
@@ -2122,9 +2124,9 @@ bool DataRefs::LoadConfigFile()
                 switch (conv) {
                     case CFG_NO_CONV:
                         break;
-                    case CFG_V331:
-                    case CFG_V31:
                     case CFG_V3:
+                    case CFG_V31:
+                    case CFG_V331:
                         // We "forgot" to change the default to 49005 for fresh installations,
                         // so we need to convert the port all the way up to v3.3.1:
                         if (*i == DATA_REFS_LT[DR_CFG_RT_TRAFFIC_PORT]) {
@@ -2132,6 +2134,11 @@ bool DataRefs::LoadConfigFile()
                             if (sVal == "49003")
                                 sVal = "49005";
                         }
+                        [[fallthrough]];
+                    case CFG_V342:
+                        // Re-implemented XP Sound, so we reset the "Force own FMOD Instance flag" because we believe in the XP implementation now ;-)
+                        if (*i == DATA_REFS_LT[DR_CFG_SND_FORCE_FMOD_INSTANCE])
+                            sVal = "0";
                         break;
                 }
                 
diff --git a/docs/readme.html b/docs/readme.html
index de00aaa..01b7949 100755
--- a/docs/readme.html
+++ b/docs/readme.html
@@ -128,13 +128,41 @@ <h1 id="release-notes">Release Notes</h1>
 
     <h2>v3</h2>
 
+    <h3>v3.4.2</h3>
+
+    <P>
+        <b>Update:</b> In case of doubt you can always just copy all files from the archive
+        over the files of your existing installation.
+    </P>
+
+    <P>At least copy the following files, which have changed compared to v3.4.1:</P>
+    <ul>
+        <li><code>lin|mac|win_x64/LiveTraffic.xpl</code></li>
+    </ul>
+
+    <P>Change log:</P>
+
+    <ul>
+        <li>
+            Reimplemented usage of XP's sound system when running in X-Plane 12.04 and later.
+            As I believe in this implementation, the
+            <a href="https://twinfan.gitbook.io/livetraffic/setup/configuration/settings-advanced#miscellaneous">setting "Own FMOD Instance"</a>
+            is reset to inactive, but is still available and can be
+            activated again in case there are still issues.
+        </li>
+        <li>
+            Fixed <a href="https://github.com/TwinFan/LiveTraffic/issues/257">#257</a>
+            weather download to updated API endpoints so that proper atmospheric pressure
+            can again be applied to altitudes conversion.
+        </li>
+        <li>
+            Fixed <a href="https://github.com/TwinFan/LiveTraffic/issues/258">#258</a>
+            extensive logging of ignored OGN messages.
+        </li>
+    </ul>
+    
     <h3>v3.4.1</h3>
 
-    <P>
-        <b>Update:</b> In case of doubt you can always just copy all files from the archive
-        over the files of your existing installation.
-    </P>
-
     <P>At least copy the following files, which have changed compared to v3.4.0:</P>
     <ul>
         <li><code>lin|mac|win_x64/LiveTraffic.xpl</code></li>