Dateien hochladen nach „“

pull/98/head
positionhigh 3 years ago
parent c619cab005
commit ec25987758
  1. 56
      UI_FX_T4.h
  2. 337237
      drumset.h
  3. 217
      sampler.h
  4. 9495
      sampleset.h
  5. 14
      sequencer.cpp

@ -121,30 +121,34 @@ LCDML_add(87, LCDML_0, 4, "Drums", NULL);
LCDML_add(88, LCDML_0_4, 1, "Drums Main Vol", UI_func_drums_main_volume); LCDML_add(88, LCDML_0_4, 1, "Drums Main Vol", UI_func_drums_main_volume);
LCDML_add(89, LCDML_0_4, 2, "Drum Volumes", UI_func_drum_volume); LCDML_add(89, LCDML_0_4, 2, "Drum Volumes", UI_func_drum_volume);
LCDML_add(90, LCDML_0_4, 3, "Drum Pan", UI_func_drum_pan); LCDML_add(90, LCDML_0_4, 3, "Drum Pan", UI_func_drum_pan);
LCDML_add(91, LCDML_0_4, 4, "Drum Rev.Send", UI_func_drum_reverb_send); LCDML_add(91, LCDML_0_4, 4, "Drum Pitch", UI_func_drum_pitch);
LCDML_add(92, LCDML_0_4, 5, "MIDI Channel", UI_func_drum_midi_channel); LCDML_add(92, LCDML_0_4, 5, "Drum Rev.Send", UI_func_drum_reverb_send);
LCDML_add(93, LCDML_0, 5, "Sequencer", NULL); LCDML_add(93, LCDML_0_4, 6, "MIDI Channel", UI_func_drum_midi_channel);
LCDML_add(94, LCDML_0_5, 1, "Pattern Editor", UI_func_seq_pattern_editor); LCDML_add(94, LCDML_0_4, 7, "Smart Filter", UI_func_smart_filter);
LCDML_add(95, LCDML_0_5, 2, "Vel./Chrd Edit", UI_func_seq_vel_editor); LCDML_add(95, LCDML_0, 5, "Sequencer", NULL);
LCDML_add(96, LCDML_0_5, 3, "Pattern Chain", UI_func_seq_pat_chain); LCDML_add(96, LCDML_0_5, 1, "Pattern Editor", UI_func_seq_pattern_editor);
LCDML_add(97, LCDML_0_5, 4, "Arpeggio", UI_func_arpeggio); LCDML_add(97, LCDML_0_5, 2, "Vel./Chrd Edit", UI_func_seq_vel_editor);
LCDML_add(98, LCDML_0_5, 5, "Seq. Settings", NULL); LCDML_add(98, LCDML_0_5, 3, "Pattern Chain", UI_func_seq_pat_chain);
LCDML_add(99, LCDML_0_5_5, 1, "Tempo", UI_func_seq_tempo); LCDML_add(99, LCDML_0_5, 4, "Arpeggio", UI_func_arpeggio);
LCDML_add(100, LCDML_0_5_5, 2, "Seq. Length", UI_func_seq_lenght); LCDML_add(100, LCDML_0_5, 5, "Seq. Settings", NULL);
LCDML_add(101, LCDML_0_5_5, 3, "Track Setup", UI_func_seq_track_setup); LCDML_add(101, LCDML_0_5_5, 1, "Tempo", UI_func_seq_tempo);
LCDML_add(102, LCDML_0_5_5, 4, "Seq.Disp.Style", UI_func_seq_display_style); LCDML_add(102, LCDML_0_5_5, 2, "Seq. Length", UI_func_seq_lenght);
LCDML_add(103, LCDML_0_5_5, 5, "dexed assign", UI_func_dexed_assign); LCDML_add(103, LCDML_0_5_5, 3, "Track Setup", UI_func_seq_track_setup);
LCDML_add(104, LCDML_0_5_5, 6, "shift&transp.", UI_func_arp_shift); LCDML_add(104, LCDML_0_5_5, 4, "Seq.Disp.Style", UI_func_seq_display_style);
LCDML_add(105, LCDML_0_5_5, 7, "L.Transp.Key", UI_func_seq_live_transpose_oct); LCDML_add(105, LCDML_0_5_5, 5, "dexed assign", UI_func_dexed_assign);
LCDML_add(106, LCDML_0_5_5, 8, "ChordTrack Keys", UI_func_seq_chord_keys_ammount); LCDML_add(106, LCDML_0_5_5, 6, "shift&transp.", UI_func_arp_shift);
LCDML_add(107, LCDML_0_5, 6, "LOAD Seq.Data", UI_func_seq_state_load); LCDML_add(107, LCDML_0_5_5, 7, "L.Transp.Key", UI_func_seq_live_transpose_oct);
LCDML_add(108, LCDML_0_5, 7, "SAVE Seq.Data", UI_func_seq_state_save); LCDML_add(108, LCDML_0_5_5, 8, "ChordTrack Keys", UI_func_seq_chord_keys_ammount);
LCDML_add(109, LCDML_0, 6, "System", NULL); LCDML_add(109, LCDML_0_5_5, 9, "Smart Filter", UI_func_smart_filter);
LCDML_add(110, LCDML_0_6, 1, "Stereo/Mono", UI_func_stereo_mono); LCDML_add(110, LCDML_0_5_5, 10, "Name Sequence", UI_func_set_sequence_name);
LCDML_add(111, LCDML_0_6, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); LCDML_add(111, LCDML_0_5, 6, "LOAD Seq.Data", UI_func_seq_state_load);
LCDML_add(112, LCDML_0_6, 3, "Favorites", UI_func_favorites); LCDML_add(112, LCDML_0_5, 7, "SAVE Seq.Data", UI_func_seq_state_save);
LCDML_add(113, LCDML_0_6, 4, "EEPROM Reset", UI_func_eeprom_reset); LCDML_add(113, LCDML_0, 6, "System", NULL);
LCDML_add(114, LCDML_0, 7, "Info", UI_func_information); LCDML_add(114, LCDML_0_6, 1, "Stereo/Mono", UI_func_stereo_mono);
LCDML_addAdvanced(115, LCDML_0, 8, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); LCDML_add(115, LCDML_0_6, 2, "MIDI Soft THRU", UI_func_midi_soft_thru);
#define _LCDML_DISP_cnt 115 LCDML_add(116, LCDML_0_6, 3, "Favorites", UI_func_favorites);
LCDML_add(117, LCDML_0_6, 4, "EEPROM Reset", UI_func_eeprom_reset);
LCDML_add(118, LCDML_0, 7, "Info", UI_func_information);
LCDML_addAdvanced(119, LCDML_0, 8, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default);
#define _LCDML_DISP_cnt 119
#endif #endif

337237
drumset.h

File diff suppressed because it is too large Load Diff

@ -64,222 +64,7 @@ sampler_config_t sampler_config[NUM_SAMPLESET_CONFIG] =
0.0, 0.0,
0.0 0.0
}, },
{
SAMPLER_HANDCLAP,
MIDI_CIS3,
"cp02l",
AudioSampleCp02,
"C",
0.0,
-1.0,
0.6,
0.0,
0.1
},
{
SAMPLER_HANDCLAP,
MIDI_DIS3,
"cp02r",
AudioSampleCp02,
"C",
0.0,
1.0,
0.6,
0.0,
0.2
},
{
SAMPLER_SNARE,
MIDI_D3,
"sd15",
AudioSampleSd15,
"S",
0.0,
0.2,
0.6,
0.2,
0.0
},
{
SAMPLER_HIHAT,
MIDI_FIS3,
"hh01",
AudioSampleHh01,
"h",
0.0,
0.8,
0.8,
0.3,
0.0
},
{
SAMPLER_HIHAT,
MIDI_GIS3,
"hh02",
AudioSampleHh02,
"h",
0.0,
0.8,
0.8,
0.3,
0.0
},
{
SAMPLER_HIHAT,
MIDI_AIS3,
"oh02",
AudioSampleOh02,
"H",
0.0,
0.8,
0.8,
0.3,
0.0
},
{
SAMPLER_LOWTOM,
MIDI_G3,
"lt01",
AudioSampleLt01,
"T",
0.0,
-0.7,
0.8,
0.0,
0.0
},
{
SAMPLER_HIGHTOM,
MIDI_A3,
"ht01",
AudioSampleHt01,
"T",
0.0,
-0.5,
0.8,
0.0,
0.0
},
{
SAMPLER_RIDE,
MIDI_CIS4,
"rd01",
AudioSampleRd01,
"R",
0.0,
-0.6,
0.3,
0.0,
0.0
},
{
SAMPLER_RIDE,
MIDI_DIS4,
"rd02",
AudioSampleRd02,
"R",
0.0,
-0.6,
0.3,
0.0,
0.0
},
{
SAMPLER_BASS,
MIDI_B4,
"808Kick",
AudioSample808Kick,
"B",
0.0,
0.0,
0.8,
0.0,
0.0
},
{
SAMPLER_BASS,
MIDI_C5,
"phkick1",
AudioSamplePhkick1,
"B",
0.0,
0.0,
0.9,
0.0,
0.0
},
{
SAMPLER_SNARE,
MIDI_E5,
"LNsnare1",
AudioSampleLnsnare1,
"S",
0.0,
0.0,
0.5,
0.0,
0.0
},
{
SAMPLER_HANDCLAP,
MIDI_DIS5,
"LNclap1",
AudioSampleLnclap,
"C",
0.0,
0.1,
0.5,
0.0,
0.1
},
{
SAMPLER_SNARE,
MIDI_CIS5,
"rims1",
AudioSampleRims1wav,
"R",
0.0,
-0.2,
0.5,
0.0,
0.0
},
{
SAMPLER_HIHAT,
MIDI_FIS5,
"hhcl1",
AudioSampleHhcl1wav,
"H",
0.0,
1.0,
0.6,
0.0,
0.0
},
{
SAMPLER_PERCUSSION,
MIDI_FIS6,
"Tamb",
AudioSampleTamb,
"T",
0.0,
-0.2,
0.6,
0.0,
0.0
},
{
SAMPLER_PERCUSSION,
MIDI_GIS6,
"Cowbell",
AudioSampleCowbell,
"S",
0.0,
0.2,
0.6,
0.0,
0.0
},
{ {
SAMPLER_NONE, SAMPLER_NONE,
0, 0,

File diff suppressed because it is too large Load Diff

@ -13,6 +13,9 @@ extern void handleNoteOff(byte , byte , byte );
extern void UI_func_seq_pattern_editor(uint8_t); extern void UI_func_seq_pattern_editor(uint8_t);
extern void UI_func_arpeggio(uint8_t); extern void UI_func_arpeggio(uint8_t);
extern const char* seq_find_shortname(uint8_t); extern const char* seq_find_shortname(uint8_t);
extern void set_sample_pitch (uint8_t, float); //float32_t not working
extern float get_sample_vol_max(uint8_t);
extern float get_sample_p_offset(uint8_t);
boolean interrupt_swapper = false; boolean interrupt_swapper = false;
void sequencer_part1(void) void sequencer_part1(void)
@ -36,10 +39,17 @@ void sequencer_part1(void)
for (uint8_t d = 0; d < 4; d++) for (uint8_t d = 0; d < 4; d++)
{ {
if ( seq_track_type[d] == 0) { // drum track if ( seq_track_type[d] == 0) { // drum track (drum samples and pitched one-shot samples)
if (seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step] > 0 ) if (seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step] > 0 )
{ {
handleNoteOn(drum_midi_channel, seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step] , seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step]); if (seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step] > 209) // it is a pitched sample
{
// Drum[slot]->setPlaybackRate( pow (2, (inNote - 72) / 12.00) * drum_config[sample].pitch ); get_sample_vol_max(sample)
set_sample_pitch(seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step] - 210 , (float)pow (2, (seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step] - 72) / 12.00) * get_sample_p_offset( seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step] - 210 ) );
handleNoteOn(drum_midi_channel, seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step] , 90 );
}
else // else play normal drum sample
handleNoteOn(drum_midi_channel, seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step] , seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step]);
} }
} }
else { else {

Loading…
Cancel
Save