Convert audio .cfg files to JSON (#3722)

Massive cleanup of lexer/parser code for audio sound effect file loading. This is done by passing information straight to `audio_setTrackVals()` from a JSON file.
Warzone2100 · Apr 4, 2024 · 0594ed9 · 0594ed9
1 parent c3a0c72
commit 0594ed9
Show file tree

Hide file tree

Showing 16 changed files with 587 additions and 4,513 deletions.
diff --git a/data/base/audio/audio.cfg b/data/base/audio/audio.cfg
diff --git a/data/base/audio/audio.json b/data/base/audio/audio.json
diff --git a/data/base/audio/frontaud.cfg b/data/base/audio/frontaud.cfg
diff --git a/data/base/audio/frontaud.json b/data/base/audio/frontaud.json
@@ -0,0 +1,25 @@
+{
+    "_Format": {
+        "_comment": "fileName: [file.ogg], loop: [false/true], range: [world units, 128 = 1 tile], volume: [0-100]"
+    },
+    "Beeps": {
+        "_name": "Beep sounds",
+        "data": [
+            { "fileName": "beep1.ogg", "loop": false, "range": 1800, "volume": 30 },
+            { "fileName": "beep2.ogg", "loop": false, "range": 1800, "volume": 30 },
+            { "fileName": "beep3.ogg", "loop": false, "range": 1800, "volume": 30 },
+            { "fileName": "beep4.ogg", "loop": false, "range": 1800, "volume": 30 },
+            { "fileName": "beep5.ogg", "loop": false, "range": 1800, "volume": 30 },
+            { "fileName": "beep6.ogg", "loop": false, "range": 1800, "volume": 30 },
+            { "fileName": "beep7.ogg", "loop": false, "range": 1800, "volume": 30 },
+            { "fileName": "beep8.ogg", "loop": false, "range": 1800, "volume": 30 },
+            { "fileName": "beep9.ogg", "loop": false, "range": 1800, "volume": 30 }
+        ]
+    },
+    "Shutdown": {
+        "_name": "Shutdown sounds",
+        "data": [
+            { "fileName": "gmeshtdn.ogg", "loop": false, "range": 1800, "volume": 30 }
+        ]
+    }
+}
diff --git a/data/base/wrf/audio.wrf b/data/base/wrf/audio.wrf
@@ -1,5 +1,5 @@
 /***********************************************************/
-/*  You may have to modify this file for it to be correct! */ 
+/*  You may have to modify this file for it to be correct! */
 /*******************       WRF\audio.wrf      *******************/
 
 
@@ -391,4 +391,4 @@ file		WAV	"uplink.ogg"
 file		WAV	"lasstrk.ogg"
 file		WAV	"beacon.ogg"
 directory	"audio"
-file		AUDIOCFG	"audio.cfg"
+file		AUDIOCFG	"audio.json"
diff --git a/data/base/wrf/frontend.wrf b/data/base/wrf/frontend.wrf
@@ -1,5 +1,5 @@
 /***********************************************************/
-/*  You may have to modify this file for it to be correct! */ 
+/*  You may have to modify this file for it to be correct! */
 /*******************       WRF\frontend.wrf      *******************/
 
 
@@ -18,6 +18,6 @@ file		WAV	"beep8.ogg"
 file		WAV	"beep9.ogg"
 file		WAV	"gmeshtdn.ogg"
 directory	"audio"
-file		AUDIOCFG	"frontaud.cfg"
+file		AUDIOCFG	"frontaud.json"
 directory	"messages/strings"
 file		STR_RES	"names.txt"