|
|
@ -87,10 +87,6 @@ uint8_t seq_active_function = 99; |
|
|
|
uint8_t activesample; |
|
|
|
uint8_t activesample; |
|
|
|
#endif |
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
#ifdef DISPLAY_LCD_SPI |
|
|
|
|
|
|
|
extern void change_disp_sd(bool d); |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef SGTL5000_AUDIO_ENHANCE |
|
|
|
#ifdef SGTL5000_AUDIO_ENHANCE |
|
|
|
#include "control_sgtl5000plus.h" |
|
|
|
#include "control_sgtl5000plus.h" |
|
|
|
extern AudioControlSGTL5000Plus sgtl5000; |
|
|
|
extern AudioControlSGTL5000Plus sgtl5000; |
|
|
@ -7565,13 +7561,7 @@ void UI_func_voice_select(uint8_t param) |
|
|
|
memset(g_bank_name[selected_instance_id], 0, BANK_NAME_LEN); |
|
|
|
memset(g_bank_name[selected_instance_id], 0, BANK_NAME_LEN); |
|
|
|
bank_tmp = constrain(configuration.dexed[selected_instance_id].bank - ENCODER[ENC_R].speed(), 0, MAX_BANKS - 1); |
|
|
|
bank_tmp = constrain(configuration.dexed[selected_instance_id].bank - ENCODER[ENC_R].speed(), 0, MAX_BANKS - 1); |
|
|
|
configuration.dexed[selected_instance_id].bank = bank_tmp; |
|
|
|
configuration.dexed[selected_instance_id].bank = bank_tmp; |
|
|
|
#ifdef DISPLAY_LCD_SPI |
|
|
|
|
|
|
|
change_disp_sd(false); |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
load_sd_voice(configuration.dexed[selected_instance_id].bank, configuration.dexed[selected_instance_id].voice, selected_instance_id); |
|
|
|
load_sd_voice(configuration.dexed[selected_instance_id].bank, configuration.dexed[selected_instance_id].voice, selected_instance_id); |
|
|
|
#ifdef DISPLAY_LCD_SPI |
|
|
|
|
|
|
|
change_disp_sd(true); |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
break; |
|
|
|
break; |
|
|
|
case MENU_VOICE_SOUND: |
|
|
|
case MENU_VOICE_SOUND: |
|
|
|
memset(g_voice_name[selected_instance_id], 0, VOICE_NAME_LEN); |
|
|
|
memset(g_voice_name[selected_instance_id], 0, VOICE_NAME_LEN); |
|
|
@ -7588,14 +7578,7 @@ void UI_func_voice_select(uint8_t param) |
|
|
|
if (voice_tmp < 0) |
|
|
|
if (voice_tmp < 0) |
|
|
|
voice_tmp = MAX_VOICES + voice_tmp; |
|
|
|
voice_tmp = MAX_VOICES + voice_tmp; |
|
|
|
configuration.dexed[selected_instance_id].voice = constrain(voice_tmp, 0, MAX_VOICES - 1); |
|
|
|
configuration.dexed[selected_instance_id].voice = constrain(voice_tmp, 0, MAX_VOICES - 1); |
|
|
|
|
|
|
|
|
|
|
|
#ifdef DISPLAY_LCD_SPI |
|
|
|
|
|
|
|
change_disp_sd(false); |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
load_sd_voice(configuration.dexed[selected_instance_id].bank, configuration.dexed[selected_instance_id].voice, selected_instance_id); |
|
|
|
load_sd_voice(configuration.dexed[selected_instance_id].bank, configuration.dexed[selected_instance_id].voice, selected_instance_id); |
|
|
|
#ifdef DISPLAY_LCD_SPI |
|
|
|
|
|
|
|
change_disp_sd(true); |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
break; |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
@ -7603,39 +7586,20 @@ void UI_func_voice_select(uint8_t param) |
|
|
|
if (configuration.sys.favorites == 1) |
|
|
|
if (configuration.sys.favorites == 1) |
|
|
|
{ |
|
|
|
{ |
|
|
|
locate_previous_favorite(); |
|
|
|
locate_previous_favorite(); |
|
|
|
#ifdef DISPLAY_LCD_SPI |
|
|
|
|
|
|
|
change_disp_sd(false); |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
load_sd_voice(configuration.dexed[selected_instance_id].bank, configuration.dexed[selected_instance_id].voice, selected_instance_id); |
|
|
|
load_sd_voice(configuration.dexed[selected_instance_id].bank, configuration.dexed[selected_instance_id].voice, selected_instance_id); |
|
|
|
#ifdef DISPLAY_LCD_SPI |
|
|
|
|
|
|
|
change_disp_sd(true); |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
else //only non-Favs
|
|
|
|
else //only non-Favs
|
|
|
|
if (configuration.sys.favorites == 2) |
|
|
|
if (configuration.sys.favorites == 2) |
|
|
|
{ |
|
|
|
{ |
|
|
|
locate_previous_non_favorite(); |
|
|
|
locate_previous_non_favorite(); |
|
|
|
#ifdef DISPLAY_LCD_SPI |
|
|
|
|
|
|
|
change_disp_sd(false); |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
load_sd_voice(configuration.dexed[selected_instance_id].bank, configuration.dexed[selected_instance_id].voice, selected_instance_id); |
|
|
|
load_sd_voice(configuration.dexed[selected_instance_id].bank, configuration.dexed[selected_instance_id].voice, selected_instance_id); |
|
|
|
#ifdef DISPLAY_LCD_SPI |
|
|
|
|
|
|
|
change_disp_sd(true); |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
//break;
|
|
|
|
//break;
|
|
|
|
|
|
|
|
|
|
|
|
} else //random non-Favs
|
|
|
|
} else //random non-Favs
|
|
|
|
if (configuration.sys.favorites == 3) |
|
|
|
if (configuration.sys.favorites == 3) |
|
|
|
{ |
|
|
|
{ |
|
|
|
locate_random_non_favorite(); |
|
|
|
locate_random_non_favorite(); |
|
|
|
|
|
|
|
|
|
|
|
#ifdef DISPLAY_LCD_SPI |
|
|
|
|
|
|
|
change_disp_sd(false); |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
load_sd_voice(configuration.dexed[selected_instance_id].bank, configuration.dexed[selected_instance_id].voice, selected_instance_id); |
|
|
|
load_sd_voice(configuration.dexed[selected_instance_id].bank, configuration.dexed[selected_instance_id].voice, selected_instance_id); |
|
|
|
#ifdef DISPLAY_LCD_SPI |
|
|
|
|
|
|
|
change_disp_sd(true); |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} //end UP
|
|
|
|
} //end UP
|
|
|
|
else if (LCDML.BT_checkDown()) |
|
|
|
else if (LCDML.BT_checkDown()) |
|
|
@ -7649,13 +7613,7 @@ void UI_func_voice_select(uint8_t param) |
|
|
|
memset(g_bank_name[selected_instance_id], 0, BANK_NAME_LEN); |
|
|
|
memset(g_bank_name[selected_instance_id], 0, BANK_NAME_LEN); |
|
|
|
bank_tmp = constrain(configuration.dexed[selected_instance_id].bank + ENCODER[ENC_R].speed(), 0, MAX_BANKS - 1); |
|
|
|
bank_tmp = constrain(configuration.dexed[selected_instance_id].bank + ENCODER[ENC_R].speed(), 0, MAX_BANKS - 1); |
|
|
|
configuration.dexed[selected_instance_id].bank = bank_tmp; |
|
|
|
configuration.dexed[selected_instance_id].bank = bank_tmp; |
|
|
|
#ifdef DISPLAY_LCD_SPI |
|
|
|
|
|
|
|
change_disp_sd(false); |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
load_sd_voice(configuration.dexed[selected_instance_id].bank, configuration.dexed[selected_instance_id].voice, selected_instance_id); |
|
|
|
load_sd_voice(configuration.dexed[selected_instance_id].bank, configuration.dexed[selected_instance_id].voice, selected_instance_id); |
|
|
|
#ifdef DISPLAY_LCD_SPI |
|
|
|
|
|
|
|
change_disp_sd(true); |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
break; |
|
|
|
break; |
|
|
|
case MENU_VOICE_SOUND: |
|
|
|
case MENU_VOICE_SOUND: |
|
|
|
memset(g_voice_name[selected_instance_id], 0, VOICE_NAME_LEN); |
|
|
|
memset(g_voice_name[selected_instance_id], 0, VOICE_NAME_LEN); |
|
|
@ -7671,14 +7629,7 @@ void UI_func_voice_select(uint8_t param) |
|
|
|
voice_tmp = MAX_VOICES - 1; |
|
|
|
voice_tmp = MAX_VOICES - 1; |
|
|
|
} |
|
|
|
} |
|
|
|
configuration.dexed[selected_instance_id].voice = constrain(voice_tmp, 0, MAX_VOICES - 1); |
|
|
|
configuration.dexed[selected_instance_id].voice = constrain(voice_tmp, 0, MAX_VOICES - 1); |
|
|
|
|
|
|
|
|
|
|
|
#ifdef DISPLAY_LCD_SPI |
|
|
|
|
|
|
|
change_disp_sd(false); |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
load_sd_voice(configuration.dexed[selected_instance_id].bank, configuration.dexed[selected_instance_id].voice, selected_instance_id); |
|
|
|
load_sd_voice(configuration.dexed[selected_instance_id].bank, configuration.dexed[selected_instance_id].voice, selected_instance_id); |
|
|
|
#ifdef DISPLAY_LCD_SPI |
|
|
|
|
|
|
|
change_disp_sd(true); |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
break; |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
@ -7687,39 +7638,20 @@ void UI_func_voice_select(uint8_t param) |
|
|
|
{ |
|
|
|
{ |
|
|
|
|
|
|
|
|
|
|
|
locate_next_favorite(); |
|
|
|
locate_next_favorite(); |
|
|
|
|
|
|
|
|
|
|
|
#ifdef DISPLAY_LCD_SPI |
|
|
|
|
|
|
|
change_disp_sd(false); |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
load_sd_voice(configuration.dexed[selected_instance_id].bank, configuration.dexed[selected_instance_id].voice, selected_instance_id); |
|
|
|
load_sd_voice(configuration.dexed[selected_instance_id].bank, configuration.dexed[selected_instance_id].voice, selected_instance_id); |
|
|
|
#ifdef DISPLAY_LCD_SPI |
|
|
|
|
|
|
|
change_disp_sd(true); |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
//break;
|
|
|
|
//break;
|
|
|
|
} |
|
|
|
} |
|
|
|
else //only non-Favs
|
|
|
|
else //only non-Favs
|
|
|
|
if (configuration.sys.favorites == 2) |
|
|
|
if (configuration.sys.favorites == 2) |
|
|
|
{ |
|
|
|
{ |
|
|
|
locate_next_non_favorite(); |
|
|
|
locate_next_non_favorite(); |
|
|
|
#ifdef DISPLAY_LCD_SPI |
|
|
|
|
|
|
|
change_disp_sd(false); |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
load_sd_voice(configuration.dexed[selected_instance_id].bank, configuration.dexed[selected_instance_id].voice, selected_instance_id); |
|
|
|
load_sd_voice(configuration.dexed[selected_instance_id].bank, configuration.dexed[selected_instance_id].voice, selected_instance_id); |
|
|
|
#ifdef DISPLAY_LCD_SPI |
|
|
|
|
|
|
|
change_disp_sd(true); |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
//break;
|
|
|
|
//break;
|
|
|
|
} else //random non-Favs
|
|
|
|
} else //random non-Favs
|
|
|
|
if (configuration.sys.favorites == 3) |
|
|
|
if (configuration.sys.favorites == 3) |
|
|
|
{ |
|
|
|
{ |
|
|
|
locate_random_non_favorite(); |
|
|
|
locate_random_non_favorite(); |
|
|
|
#ifdef DISPLAY_LCD_SPI |
|
|
|
|
|
|
|
change_disp_sd(false); |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
load_sd_voice(configuration.dexed[selected_instance_id].bank, configuration.dexed[selected_instance_id].voice, selected_instance_id); |
|
|
|
load_sd_voice(configuration.dexed[selected_instance_id].bank, configuration.dexed[selected_instance_id].voice, selected_instance_id); |
|
|
|
#ifdef DISPLAY_LCD_SPI |
|
|
|
|
|
|
|
change_disp_sd(true); |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|