len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 10:37:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

recscreen: clean up menu building code

Browse source 
Remove the use of constants and ifdefs in favor of a
single enum and build the menu with a counter. This
simplifies the source and optimizes to the same code.

Change-Id: Ib07f0634ac8f663452c3e6e3c3d92fb6da1a1b4c
This commit is contained in:
Aidan MacDonald 2022-01-14 00:53:44 +00:00
parent acc7d16e3b
commit f68c6c14d9
1 changed files with 31 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

92
apps/recorder/recording.c
View file

@ -739,43 +739,22 @@ static void trigger_listener(int trigger_status)
/* Stuff for drawing the screen */ /* Stuff for drawing the screen */
enum rec_list_items_stereo { enum rec_list_items_stereo {
ITEM_VOLUME = 0, ITEM_VOLUME,
ITEM_GAIN = 1, ITEM_GAIN,
ITEM_GAIN_L = 2, #if defined(HAVE_LINE_REC) || defined(HAVE_FMRADIO_REC)
ITEM_GAIN_R = 3, ITEM_GAIN_L,
#ifdef HAVE_AGC ITEM_GAIN_R,
ITEM_AGC_MODE = 4,
ITEM_AGC_MAXDB = 5,
ITEM_FILENAME = 7,
ITEM_COUNT = 7,
#else
ITEM_FILENAME = 7,
ITEM_COUNT = 5,
#endif #endif
};
enum rec_list_items_mono {
ITEM_VOLUME_M = 0,
ITEM_GAIN_M = 1,
#ifdef HAVE_AGC #ifdef HAVE_AGC
ITEM_AGC_MODE_M = 4, ITEM_AGC_MODE,
ITEM_AGC_MAXDB_M = 5, ITEM_AGC_MAXDB,
ITEM_FILENAME_M = 7,
ITEM_COUNT_M = 5,
#else
ITEM_FILENAME_M = 7,
ITEM_COUNT_M = 3,
#endif #endif
};
#ifdef HAVE_SPDIF_REC #ifdef HAVE_SPDIF_REC
enum rec_list_items_spdif { ITEM_SAMPLERATE,
ITEM_VOLUME_D = 0,
ITEM_SAMPLERATE_D = 6,
ITEM_FILENAME_D = 7,
ITEM_COUNT_D = 3,
};
#endif #endif
ITEM_FILENAME,
ITEM_COUNT,
};
static int listid_to_enum[ITEM_COUNT]; static int listid_to_enum[ITEM_COUNT];
@ -876,7 +855,7 @@ static const char* reclist_get_name(int selected_item, void * data,
} break; } break;
#endif #endif
#ifdef HAVE_SPDIF_REC #ifdef HAVE_SPDIF_REC
case ITEM_SAMPLERATE_D: case ITEM_SAMPLERATE:
snprintf(buffer, buffer_len, "%s: %lu", snprintf(buffer, buffer_len, "%s: %lu",
str(LANG_FREQUENCY), pcm_rec_sample_rate()); str(LANG_FREQUENCY), pcm_rec_sample_rate());
break; break;
@ -1170,46 +1149,37 @@ bool recording_screen(bool no_source)
set_gain(); set_gain();
update_countdown = 0; /* Update immediately */ update_countdown = 0; /* Update immediately */
int listi = 0;
/* populate translation table for list id -> enum */ /* populate translation table for list id -> enum */
#ifdef HAVE_SPDIF_REC #ifdef HAVE_SPDIF_REC
if(global_settings.rec_source == AUDIO_SRC_SPDIF) if(global_settings.rec_source == AUDIO_SRC_SPDIF)
{ {
listid_to_enum[0] = ITEM_VOLUME_D; listid_to_enum[listi++] = ITEM_VOLUME;
listid_to_enum[1] = ITEM_SAMPLERATE_D; listid_to_enum[listi++] = ITEM_SAMPLERATE;
listid_to_enum[2] = ITEM_FILENAME_D; listid_to_enum[listi++] = ITEM_FILENAME;
gui_synclist_set_nb_items(&lists, ITEM_COUNT_D); /* spdif */ gui_synclist_set_nb_items(&lists, listi); /* spdif */
} }
else else
#endif #endif
if(HAVE_MIC_REC_((global_settings.rec_source == AUDIO_SRC_MIC) || )
(global_settings.rec_channels == 1))
{ {
listid_to_enum[0] = ITEM_VOLUME_M; listid_to_enum[listi++] = ITEM_VOLUME;
listid_to_enum[1] = ITEM_GAIN_M; listid_to_enum[listi++] = ITEM_GAIN;
#ifdef HAVE_AGC #if defined(HAVE_LINE_REC) || defined(HAVE_FMRADIO_REC)
listid_to_enum[2] = ITEM_AGC_MODE_M; if(HAVE_MIC_REC_((global_settings.rec_source != AUDIO_SRC_MIC) || )
listid_to_enum[3] = ITEM_AGC_MAXDB_M; (global_settings.rec_channels != 1)) {
listid_to_enum[4] = ITEM_FILENAME_M; listid_to_enum[listi++] = ITEM_GAIN_L;
#else listid_to_enum[listi++] = ITEM_GAIN_R;
listid_to_enum[2] = ITEM_FILENAME_M; }
#endif #endif
gui_synclist_set_nb_items(&lists, ITEM_COUNT_M); /* mono */
}
else
{
listid_to_enum[0] = ITEM_VOLUME;
listid_to_enum[1] = ITEM_GAIN;
listid_to_enum[2] = ITEM_GAIN_L;
listid_to_enum[3] = ITEM_GAIN_R;
#ifdef HAVE_AGC #ifdef HAVE_AGC
listid_to_enum[4] = ITEM_AGC_MODE; listid_to_enum[listi++] = ITEM_AGC_MODE;
listid_to_enum[5] = ITEM_AGC_MAXDB; listid_to_enum[listi++] = ITEM_AGC_MAXDB;
listid_to_enum[6] = ITEM_FILENAME;
#else
listid_to_enum[4] = ITEM_FILENAME;
#endif #endif
gui_synclist_set_nb_items(&lists, ITEM_COUNT); /* stereo */ listid_to_enum[listi++] = ITEM_FILENAME;
gui_synclist_set_nb_items(&lists, listi); /* stereo */
} }
gui_synclist_draw(&lists); gui_synclist_draw(&lists);