Dateien hochladen nach „“

3 years ago · 5364a84f9e
parent 55419d4fe9
commit 5364a84f9e
3 changed files with 40387 additions and 8981 deletions
--- a/config.h
+++ b/config.h
@ -112,7 +112,7 @@
 // NUMBER OF PARALLEL SAMPLEDRUMS
 #define NUM_DRUMS 8
 // NUMBER OF SAMPLES IN DRUMSET
-#define NUM_DRUMSET_CONFIG 20
+#define NUM_DRUMSET_CONFIG 50

 // CHORUS parameters
 #define MOD_DELAY_SAMPLE_BUFFER int32_t(TIME_MS2SAMPLES(20.0)) // 20.0 ms delay buffer. 
--- a/drums.h
+++ b/drums.h
@ -51,6 +51,39 @@ uint8_t drum_midi_channel=10;

 drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
 {
+   {
+    DRUM_BASS,
+    MIDI_A2,
+    "Xrhitom",
+    AudioSampleXrhitom,
+    "B",
+    0.0,
+    0.8,
+    0.0,
+    0.0,
+  },
+  {
+    DRUM_BASS,
+    MIDI_AIS2,
+    "Vl1lbeep",
+    AudioSampleVl1lbeepw,
+    "B",
+    0.0,
+    0.8,
+    0.0,
+    0.0,
+  },
+   {
+    DRUM_BASS,
+    MIDI_B2,
+    "Vl1hbeep",
+    AudioSampleVl1hbeepw,
+    "B",
+    0.0,
+    0.8,
+    0.0,
+    0.0
+  },
  {
    DRUM_BASS,
    MIDI_C3,
@ -172,7 +205,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
    0.0,
    0.0
  },
-   {
+  {
    DRUM_BASS,
    MIDI_B4,
    "808Kick",
@ -183,6 +216,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
    0.0,
    0.0
  },
+  
  {
    DRUM_BASS,
    MIDI_C5,
@ -194,6 +228,28 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
    0.0,
    0.0
  },
+   {
+    DRUM_SNARE,
+    MIDI_CIS5,
+    "rims1",
+    AudioSampleRims1wav,
+    "R",
+    -0.2,
+    0.5,
+    0.0,
+    0.0
+  },
+   {
+    DRUM_SNARE,
+    MIDI_D5,
+    "Shaker",
+    Shaker,
+    "R",
+    -0.2,
+    0.5,
+    0.0,
+    0.0
+  },
 {
    DRUM_SNARE,
    MIDI_E5,
@ -217,13 +273,13 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
    0.1
  },
   {
-    DRUM_SNARE,
-    MIDI_CIS5,
-    "rims1",
-    AudioSampleRims1wav,
-    "R",
-    -0.2,
-    0.5,
+    DRUM_BASS,
+    MIDI_F5,
+    "Bdtrancy",
+    AudioSampleBdtrancy,
+    "B",
+    0.0,
+    0.9,
    0.0,
    0.0
  },
@ -238,6 +294,129 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
    0.0,
    0.0
  },
+  
+  {
+    DRUM_BASS,
+    MIDI_G5,
+    "Belltree",
+    AudioSampleBelltree,
+    "B",
+    0.0,
+    0.9,
+    0.0,
+    0.0
+  },
+  {
+    DRUM_BASS,
+    MIDI_GIS5,
+    "Bongo16",
+    AudioSampleBongo16,
+    "B",
+    0.0,
+    0.9,
+    0.0,
+    0.0
+  },
+  {
+    DRUM_BASS,
+    MIDI_A5,
+    "Bongo27",
+    AudioSampleBongo27,
+    "B",
+    0.0,
+    0.9,
+    0.0,
+    0.0
+  },
+  {
+    DRUM_BASS,
+    MIDI_AIS5,
+    "Casta",
+    AudioSampleCasta,
+    "B",
+    0.0,
+    0.9,
+    0.0,
+    0.0
+  },
+  {
+    DRUM_BASS,
+    MIDI_B5,
+    "Cr78kick",
+    AudioSampleCr78kick,
+    "B",
+    0.0,
+    0.9,
+    0.0,
+    0.0
+  },
+  
+  {
+    DRUM_BASS,
+    MIDI_C6,
+    "Cr78tmb1",
+    AudioSampleCr78tmb1,
+    "B",
+    0.0,
+    0.9,
+    0.0,
+    0.0
+  },
+  {
+    DRUM_BASS,
+    MIDI_CIS6,
+    "Cr78tmb2",
+    AudioSampleCr78tmb2,
+    "B",
+    0.0,
+    0.9,
+    0.0,
+    0.0
+  },
+  {
+    DRUM_BASS,
+    MIDI_D6,
+    "Crash1",
+    AudioSampleCrash1,
+    "B",
+    0.0,
+    0.9,
+    0.0,
+    0.0
+  },
+  {
+    DRUM_BASS,
+    MIDI_DIS6,
+    "Dmpop",
+    AudioSampleDmpop,
+    "B",
+    0.0,
+    0.9,
+    0.0,
+    0.0
+  },  
+  {
+    DRUM_BASS,
+    MIDI_E6,
+    "Electr1",
+    AudioSampleElectr1,
+    "B",
+    0.0,
+    0.9,
+    0.0,
+    0.0
+  },
+   {
+    DRUM_BASS,
+    MIDI_F6,
+    "Excow",
+    AudioSampleExcow,
+    "B",
+    0.0,
+    0.9,
+    0.0,
+    0.0
+  },
   {
    DRUM_PERCUSSION,
    MIDI_FIS6,
@ -259,7 +438,162 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
    0.6,
    0.0,
    0.0
+  },  
+  {
+    DRUM_PERCUSSION,
+    MIDI_G6,
+    "660HatC1",
+    AudioSampleHatc1,
+    "T",
+    0.0,
+    0.6,
+    0.0,
+    0.0
+  },
+  {
+    DRUM_PERCUSSION,
+    MIDI_A6,
+    "Hhopen1",
+    AudioSampleHhopen1,
+    "S",
+    0.0,
+    0.6,
+    0.0,
+    0.0
+  },
+  {
+    DRUM_PERCUSSION,
+    MIDI_AIS6,
+    "Histicks",
+    AudioSampleHisticks,
+    "S",
+    0.0,
+    0.6,
+    0.0,
+    0.0
+  },
+  {
+    DRUM_PERCUSSION,
+    MIDI_B6,
+    "Hr16snr2",
+    AudioSampleHr16snr2,
+    "S",
+    0.0,
+    0.6,
+    0.0,
+    0.0
+  },
+ 
+   {
+    DRUM_PERCUSSION,
+    MIDI_CIS7,
+    "Tick1",
+    AudioSampleTick1,
+    "S",
+    0.0,
+    0.9,
+    0.0,
+    0.0
+  },
+   {
+    DRUM_PERCUSSION,
+    MIDI_D7,
+    "M118w",
+    AudioSampleM118w,
+    "S",
+    0.0,
+    0.9,
+    0.0,
+    0.0
  },
+  {
+    DRUM_PERCUSSION,
+    MIDI_DIS7,
+    "Md16_clp",
+    AudioSampleMd16_clp,
+    "S",
+    0.0,
+    0.9,
+    0.0,
+    0.0
+  },
+   {
+    DRUM_PERCUSSION,
+    MIDI_E7,
+    "Ohhwav",
+    AudioSampleOhhwav,
+    "S",
+    0.0,
+    0.9,
+    0.0,
+    0.0
+  },
+  {
+    DRUM_PERCUSSION,
+    MIDI_F7,
+    "Quijada",
+    AudioSampleQuijada,
+    "S",
+    0.0,
+    0.9,
+    0.0,
+    0.0
+  },
+  {
+    DRUM_PERCUSSION,
+    MIDI_FIS7,
+   "tabla1",
+    AudioSampleR8tabla1,
+    "S",
+    0.0,
+    0.9,
+    0.0,
+    0.0
+  },
+   {
+    DRUM_PERCUSSION,
+    MIDI_GIS7,
+    "Ridewav",
+    AudioSampleRidewav,
+    "S",
+    0.0,
+    0.9,
+    0.0,
+    0.0
+  },
+  {
+    DRUM_PERCUSSION,
+    MIDI_A7,
+    "Scratch1",
+    AudioSampleScratch1,
+    "S",
+    0.0,
+    0.9,
+    0.0,
+    0.0
+  },
+   {
+    DRUM_PERCUSSION,
+    MIDI_B7,
+    "Tomlow",
+    AudioSampleTomlow,
+    "S",
+    0.0,
+    0.9,
+    0.0,
+    0.0
+  },
+  {
+    DRUM_PERCUSSION,
+    MIDI_C8,
+    "Tomwav",
+    AudioSampleTomwav,
+    "S",
+    0.0,
+    0.9,
+    0.0,
+    0.0
+  },  
  {
    DRUM_NONE,
    0,
--- a/drumset.h
+++ b/drumset.h