From ffb7348b8eea3fa4d4800ec895df219e2dff0e97 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sat, 24 Jun 2023 00:49:26 -0400 Subject: [PATCH] genmidi: Strip instrument name trailing whitespace. Some of the DMXGUS instrument names seem to have long sections of whitespace like this, and we can clean it up while dumping. --- lumps/genmidi/genmidi.py | 2 +- lumps/genmidi/sbi_file.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lumps/genmidi/genmidi.py b/lumps/genmidi/genmidi.py index 92ccc851..19f579c7 100644 --- a/lumps/genmidi/genmidi.py +++ b/lumps/genmidi/genmidi.py @@ -123,7 +123,7 @@ def decode_voice(data, name): result["m_ksl_volume"] = result["m_ksl"] | result["m_volume"] result["c_ksl_volume"] = result["c_ksl"] | result["c_volume"] - result["name"] = name.decode("ascii").rstrip("\0") + result["name"] = name.decode("ascii").rstrip("\0").rstrip() return result diff --git a/lumps/genmidi/sbi_file.py b/lumps/genmidi/sbi_file.py index c507375b..e6904e6d 100644 --- a/lumps/genmidi/sbi_file.py +++ b/lumps/genmidi/sbi_file.py @@ -35,7 +35,7 @@ def read(filename): raise Exception("Invalid header for SBI file!") instr_data = data[36:] - result = {"name": name.decode("ascii").rstrip("\0")} + result = {"name": name.decode("ascii").rstrip("\0").rstrip()} for i in range(len(FIELDS)): result[FIELDS[i]], = struct.unpack("B", instr_data[i : i + 1])