From aee3fde9772288456bb4c43bffa8be9f38be9221 Mon Sep 17 00:00:00 2001
From: Holger Wirtz <wirtz@dfn.de>
Date: Thu, 26 Aug 2021 14:13:03 +0200
Subject: [PATCH] New drumset.cfg.

---
 addon/tools/drumset.cfg | 51 +++++++++++++++++++++++++++++++++++++++--
 addon/tools/wav2c.sh    | 33 ++++++++++++++++++--------
 2 files changed, 72 insertions(+), 12 deletions(-)

diff --git a/addon/tools/drumset.cfg b/addon/tools/drumset.cfg
index 7b52e97..7cb27a1 100644
--- a/addon/tools/drumset.cfg
+++ b/addon/tools/drumset.cfg
@@ -1,3 +1,50 @@
 # class, midinote, name, shortname, pitch, pan, vol_max, vol_min, reverb_send, filename
-DRUM_BASS,MIDI_A2,Xrhitom,B,0.0,0.0,0.8,0.0,0.0,bd01.wav
-DRUM_BASS,MIDI_AIS2,Vl1lbeep,B,0.0,0.0,0.8,0.0,0.0,bd02.wav
+DRUM_BASS, MIDI_A2, Xrhitom, B, 0.0, 0.0, 0.8, 0.0, 0.0, bd01.wav
+DRUM_BASS, MIDI_AIS2, Vl1lbeep, B, 0.0, 0.0, 0.8, 0.0, 0.0, bd01.wav
+DRUM_BASS, MIDI_B2, Vl1hbeep, B, 0.0, 0.0, 0.8, 0.0, 0.0, bd01.wav
+DRUM_BASS, MIDI_C3, bd01, B, 0.0, 0.0, 0.8, 0.0, 0.0, bd01.wav
+DRUM_HANDCLAP, MIDI_CIS3, cp02l, C, 0.0, -1.0, 0.6, 0.0, 0.1, bd01.wav
+DRUM_HANDCLAP, MIDI_DIS3, cp02r, C, 0.0, 1.0, 0.6, 0.0, 0.2, bd01.wav
+DRUM_SNARE, MIDI_D3, sd15, S, 0.0, 0.2, 0.6, 0.2, 0.0, bd01.wav
+DRUM_HIHAT, MIDI_FIS3, hh01, h, 0.0, 0.8, 0.8, 0.3, 0.0, bd01.wav
+DRUM_HIHAT, MIDI_GIS3, hh02, h, 0.0, 0.8, 0.8, 0.3, 0.0, bd01.wav
+DRUM_HIHAT, MIDI_AIS3, oh02, H, 0.0, 0.8, 0.8, 0.3, 0.0, bd01.wav
+DRUM_LOWTOM, MIDI_G3, lt01, T, 0.0, -0.7, 0.8, 0.0, 0.0, bd01.wav
+DRUM_HIGHTOM, MIDI_A3, ht01, T, 0.0, -0.5, 0.8, 0.0, 0.0, bd01.wav
+DRUM_RIDE, MIDI_CIS4, rd01, R, 0.0, -0.6, 0.3, 0.0, 0.0, bd01.wav
+DRUM_RIDE, MIDI_DIS4, rd02, R, 0.0, -0.6, 0.3, 0.0, 0.0, bd01.wav
+DRUM_BASS, MIDI_B4, 808Kick, B, 0.0, 0.0, 0.8, 0.0, 0.0, bd01.wav
+DRUM_BASS, MIDI_C5, phkick1, B, 0.0, 0.0, 1.0, 0.0, 0.0, bd01.wav
+DRUM_SNARE, MIDI_CIS5, rims1, R, 0.0, -0.2, 0.7, 0.0, 0.0, bd01.wav
+DRUM_SNARE, MIDI_D5, Shaker, R, 0.0, -0.2, 0.5, 0.0, 0.0, bd01.wav
+DRUM_SNARE, MIDI_E5, LNsnare1, S, 0.0, 0.0, 0.9, 0.0, 0.0, bd01.wav
+DRUM_HANDCLAP, MIDI_DIS5, LNclap1, C, 0.0, 0.1, 0.9, 0.0, 0.1, bd01.wav
+DRUM_BASS, MIDI_F5, Bdtrancy, B, 0.0, 0.0, 0.9, 0.0, 0.0, bd01.wav
+DRUM_HIHAT, MIDI_FIS5, hhcl1, H, 0.0, 1.0, 0.6, 0.0, 0.0, bd01.wav
+DRUM_BASS, MIDI_G5, Belltree, B, 0.0, 0.0, 0.7, 0.0, 0.0, bd01.wav
+DRUM_BASS, MIDI_GIS5, Bongo16, B, 0.0, 0.0, 0.9, 0.0, 0.0, bd01.wav
+DRUM_BASS, MIDI_A5, Bongo27, B, 0.0, 0.0, 0.9, 0.0, 0.0, bd01.wav
+DRUM_BASS, MIDI_AIS5, Casta, B, 0.0, 0.0, 0.9, 0.0, 0.0, bd01.wav
+DRUM_BASS, MIDI_B5, Cr78kick, B, 0.0, 0.0, 1.0, 0.0, 0.0, bd01.wav
+DRUM_HIHAT, MIDI_C6, Cr78tmb1, B, 0.0, 0.0, 0.8, 0.0, 0.0, bd01.wav
+DRUM_HIHAT, MIDI_CIS6, Cr78tmb2, B, 0.0, 0.0, 0.8, 0.0, 0.0, bd01.wav
+DRUM_BASS, MIDI_D6, Crash1, B, 0.0, 0.0, 0.9, 0.0, 0.0, bd01.wav
+DRUM_BASS, MIDI_DIS6, Dmpop, B, 0.0, 0.0, 0.9, 0.0, 0.0, bd01.wav
+DRUM_BASS, MIDI_E6, Electr1, B, 0.0, 0.0, 0.9, 0.0, 0.0, bd01.wav
+DRUM_BASS, MIDI_F6, Excow, B, 0.0, 0.0, 0.9, 0.0, 0.0, bd01.wav
+DRUM_PERCUSSION, MIDI_FIS6, Tamb, T, 0.0, -0.2, 0.6, 0.0, 0.0, bd01.wav
+DRUM_PERCUSSION, MIDI_GIS6, Cowbell, S, 0.0, 0.2, 0.6, 0.0, 0.0, bd01.wav
+DRUM_HIHAT, MIDI_G6, 660HatC1, T, 0.0, 0.0, 0.6, 0.0, 0.0, bd01.wav
+DRUM_HIHAT, MIDI_A6, Hhopen1, S, 0.0, 0.0, 0.6, 0.0, 0.0, bd01.wav
+DRUM_PERCUSSION, MIDI_AIS6, Histicks, S, 0.0, 0.0, 0.6, 0.0, 0.0, bd01.wav
+DRUM_PERCUSSION, MIDI_B6, Hr16snr2, S, 0.0, 0.0, 0.6, 0.0, 0.0, bd01.wav
+DRUM_PERCUSSION, MIDI_CIS7, Tick1, S, 0.0, 0.0, 0.9, 0.0, 0.0, bd01.wav
+DRUM_PERCUSSION, MIDI_D7, M118w, S, 0.0, 0.0, 0.9, 0.0, 0.0, bd01.wav
+DRUM_PERCUSSION, MIDI_DIS7, Md16_clp, S, 0.0, 0.0, 0.9, 0.0, 0.0, bd01.wav
+DRUM_HIHAT, MIDI_E7, Ohhwav, S, 0.0, 0.0, 0.9, 0.0, 0.0, bd01.wav
+DRUM_PERCUSSION, MIDI_F7, Quijada, S, 0.0, 0.0, 0.9, 0.0, 0.0, bd01.wav
+DRUM_PERCUSSION, MIDI_FIS7, tabla1, S, 0.0, 0.0, 0.9, 0.0, 0.0, bd01.wav
+DRUM_PERCUSSION, MIDI_GIS7, Ridewav, S, 0.0, 0.0, 0.9, 0.0, 0.0, bd01.wav
+DRUM_PERCUSSION, MIDI_A7, Scratch1, S, 0.0, 0.0, 0.7, 0.0, 0.0, bd01.wav
+DRUM_PERCUSSION, MIDI_B7, Tomlow, S, 0.0, 0.0, 0.9, 0.0, 0.0, bd01.wav
+DRUM_PERCUSSION, MIDI_C8, Tomwav, S, 0.0, 0.0, 0.9, 0.0, 0.0, bd01.wav
diff --git a/addon/tools/wav2c.sh b/addon/tools/wav2c.sh
index 6c4fd59..bd03b22 100755
--- a/addon/tools/wav2c.sh
+++ b/addon/tools/wav2c.sh
@@ -148,16 +148,16 @@ do
 	fi
 	IFS=',' read -ra samplecfg <<< "${l}"
 
-	sample['class']="${samplecfg[0]}"
-	sample['midinote']="${samplecfg[1]}"
-	sample['name']="${samplecfg[2]}"
-	sample['shortname']="${samplecfg[3]}"
-	sample['pitch']="${samplecfg[4]}"
-	sample['pan']="${samplecfg[5]}"
-	sample['vol_max']="${samplecfg[6]}"
-	sample['vol_min']="${samplecfg[7]}"
-	sample['reverb_send']="${samplecfg[8]}"
-	sample['filename']="${samplecfg[9]}"
+	sample['class']=`echo "${samplecfg[0]}" | xargs`
+	sample['midinote']=`echo "${samplecfg[1]}" | xargs`
+	sample['name']=`echo "${samplecfg[2]}" | xargs`
+	sample['shortname']=`echo "${samplecfg[3]}" | xargs`
+	sample['pitch']=`echo "${samplecfg[4]}" | xargs`
+	sample['pan']=`echo "${samplecfg[5]}" | xargs`
+	sample['vol_max']=`echo "${samplecfg[6]}" | xargs`
+	sample['vol_min']=`echo "${samplecfg[7]}" | xargs`
+	sample['reverb_send']=`echo "${samplecfg[8]}" | xargs`
+	sample['filename']=`echo "${samplecfg[9]}" | xargs`
 
 	if [ -f "${WAV_DIR}/${sample['filename']}" ]
 	then
@@ -220,6 +220,19 @@ EOF
 done < "${CONFIG}"
 
 cat >> "${DRUMS_H}" << EOF
+  {
+    DRUM_NONE,
+    0,
+    "EMPTY",
+    NULL,
+    "-",
+    0,
+    0.0,
+    0.0,
+    0.0,
+    0.0,
+    0.0
+  }
 };
 
 #endif