diff options
| author | Aidan MacDonald <amachronic@protonmail.com> | 2022-01-14 01:05:21 +0000 |
|---|---|---|
| committer | Aidan MacDonald <amachronic@protonmail.com> | 2022-01-29 15:13:54 -0500 |
| commit | 127bb1b6e1ad67a24a527261f6eb7053c142ed26 (patch) | |
| tree | e19ce7c1f05c43f92703066e8b344c5cb7985270 | |
| parent | c1f1d9140407757fab16c418eed09f5517c649d7 (diff) | |
| download | rockbox-127bb1b6e1.tar.gz rockbox-127bb1b6e1.zip | |
FiiO M3K: remove volume setting on rec. screen
This controls the playback volume, which is not useful for
the M3K because it's impossible to play back and record at
the same time.
Change-Id: I5b0931c22b484f3ff6441d6c88079f18ec70f7f8
| -rw-r--r-- | apps/recorder/recording.c | 12 | ||||
| -rw-r--r-- | firmware/export/config/fiiom3k.h | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index 7215812f49..b973d9750c 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c @@ -739,7 +739,9 @@ static void trigger_listener(int trigger_status) /* Stuff for drawing the screen */ enum rec_list_items_stereo { +#ifndef HAVE_RECORDING_WITHOUT_MONITORING ITEM_VOLUME, +#endif ITEM_GAIN, #if defined(HAVE_LINE_REC) || defined(HAVE_FMRADIO_REC) ITEM_GAIN_L, @@ -771,12 +773,14 @@ static const char* reclist_get_name(int selected_item, void * data, switch (listid_to_enum[selected_item]) { +#ifndef HAVE_RECORDING_WITHOUT_MONITORING case ITEM_VOLUME: snprintf(buffer, buffer_len, "%s: %s", str(LANG_VOLUME), fmt_gain(SOUND_VOLUME, global_settings.volume, buf2, sizeof(buf2))); break; +#endif case ITEM_GAIN: switch(global_settings.rec_source) { #ifdef HAVE_MIC_REC @@ -1155,7 +1159,9 @@ bool recording_screen(bool no_source) #ifdef HAVE_SPDIF_REC if(global_settings.rec_source == AUDIO_SRC_SPDIF) { +#ifndef HAVE_RECORDING_WITHOUT_MONITORING listid_to_enum[listi++] = ITEM_VOLUME; +#endif listid_to_enum[listi++] = ITEM_SAMPLERATE; listid_to_enum[listi++] = ITEM_FILENAME; @@ -1164,7 +1170,9 @@ bool recording_screen(bool no_source) else #endif { +#ifndef HAVE_RECORDING_WITHOUT_MONITORING listid_to_enum[listi++] = ITEM_VOLUME; +#endif listid_to_enum[listi++] = ITEM_GAIN; #if defined(HAVE_LINE_REC) || defined(HAVE_FMRADIO_REC) if(HAVE_MIC_REC_((global_settings.rec_source != AUDIO_SRC_MIC) || ) @@ -1265,9 +1273,11 @@ bool recording_screen(bool no_source) case ACTION_SETTINGS_INCREPEAT: switch (listid_to_enum[gui_synclist_get_sel_pos(&lists)]) { +#ifndef HAVE_RECORDING_WITHOUT_MONITORING case ITEM_VOLUME: recording_step_levels(SOUND_VOLUME, 1); break; +#endif case ITEM_GAIN: switch(global_settings.rec_source) { #ifdef HAVE_MIC_REC @@ -1335,9 +1345,11 @@ bool recording_screen(bool no_source) case ACTION_SETTINGS_DECREPEAT: switch (listid_to_enum[gui_synclist_get_sel_pos(&lists)]) { +#ifndef HAVE_RECORDING_WITHOUT_MONITORING case ITEM_VOLUME: recording_step_levels(SOUND_VOLUME, -1); break; +#endif case ITEM_GAIN: switch(global_settings.rec_source) { #ifdef HAVE_MIC_REC diff --git a/firmware/export/config/fiiom3k.h b/firmware/export/config/fiiom3k.h index ea97d52d76..baf4cf4660 100644 --- a/firmware/export/config/fiiom3k.h +++ b/firmware/export/config/fiiom3k.h @@ -59,6 +59,7 @@ #define INPUT_SRC_CAPS SRC_CAP_MIC #define AUDIOHW_CAPS (FILTER_ROLL_OFF_CAP|POWER_MODE_CAP|MIC_GAIN_CAP) #define HAVE_RECORDING +#define HAVE_RECORDING_WITHOUT_MONITORING #define HAVE_AK4376 #define HAVE_X1000_ICODEC_REC #define HAVE_SW_TONE_CONTROLS |