diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index c118dac444..1632c438dd 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c @@ -54,7 +54,7 @@ struct browse_folder_info { }; static struct browse_folder_info theme = {THEME_DIR, SHOW_CFG}; static struct browse_folder_info config = {ROCKBOX_DIR, SHOW_CFG}; -static int browse_folder(void *param) +int browse_folder(void *param) { const struct browse_folder_info *info = (const struct browse_folder_info*)param; diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c index 62af2f94fe..50b49c9db9 100644 --- a/apps/menus/recording_menu.c +++ b/apps/menus/recording_menu.c @@ -62,6 +62,7 @@ #endif #include "action.h" + static bool no_source_in_menu = true; int recmenu_callback(int action,const struct menu_item_ex *this_item); @@ -803,9 +804,24 @@ MENUITEM_FUNCTION(rectrigger_item, 0, ID2P(LANG_RECORD_TRIGGER), +/* from main_menu.c */ +struct browse_folder_info { + const char* dir; + int show_options; +}; +static struct browse_folder_info rec_config_browse = {RECPRESETS_DIR, SHOW_CFG}; +int browse_folder(void *param); +MENUITEM_FUNCTION(browse_recconfigs, MENU_FUNC_USEPARAM, ID2P(LANG_CUSTOM_CFG), + browse_folder, (void*)&rec_config_browse, NULL, Icon_Config); +static int write_settings_file(void) +{ + return settings_save_config(SETTINGS_SAVE_RECPRESETS); +} +MENUITEM_FUNCTION(save_recpresets_item, 0, ID2P(LANG_SAVE_SETTINGS), + write_settings_file, NULL, NULL, Icon_Config); - -MAKE_MENU(recording_setting_menu, ID2P(LANG_RECORDING_SETTINGS), NULL, Icon_Recording, +MAKE_MENU(recording_setting_menu, ID2P(LANG_RECORDING_SETTINGS), + NULL, Icon_Recording, #if CONFIG_CODEC == MAS3587F &rec_quality, #endif @@ -827,6 +843,7 @@ MAKE_MENU(recording_setting_menu, ID2P(LANG_RECORDING_SETTINGS), NULL, Icon_Reco #ifdef HAVE_AGC &agc_preset, &agc_cliptime, #endif + &browse_recconfigs, &save_recpresets_item ); bool recording_menu(bool no_source) diff --git a/apps/settings.c b/apps/settings.c index aa8afe472c..2bae9ae1b1 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -459,7 +459,11 @@ static bool settings_write_config(char* filename, int options) else if ((options == SETTINGS_SAVE_THEME) && ((settings[i].flags&F_THEMESETTING) == 0)) continue; - +#ifdef HAVE_RECORDING + else if ((options == SETTINGS_SAVE_RECPRESETS) && + ((settings[i].flags&F_RECSETTING) == 0)) + continue; +#endif switch (settings[i].flags&F_T_MASK) { case F_T_INT: @@ -582,8 +586,21 @@ int settings_save( void ) bool settings_save_config(int options) { char filename[MAX_PATH]; - - create_numbered_filename(filename, ROCKBOX_DIR, "config", ".cfg", 2 + char *folder; + switch (options) + { + case SETTINGS_SAVE_THEME: + folder = THEME_DIR; + break; +#ifdef HAVE_RECORDING + case SETTINGS_SAVE_RECPRESETS: + folder = RECPRESETS_DIR; + break; +#endif + default: + folder = ROCKBOX_DIR; + } + create_numbered_filename(filename, folder, "config", ".cfg", 2 IF_CNFN_NUM_(, NULL)); /* allow user to modify filename */ diff --git a/apps/settings.h b/apps/settings.h index f60e4bacc7..b9c67dc8ea 100644 --- a/apps/settings.h +++ b/apps/settings.h @@ -61,7 +61,8 @@ #define BACKDROP_DIR ROCKBOX_DIR "/backdrops" #define REC_BASE_DIR "/recordings" #define EQS_DIR ROCKBOX_DIR "/eqs" -#define CODECS_DIR ROCKBOX_DIR"/codecs" +#define CODECS_DIR ROCKBOX_DIR "/codecs" +#define RECPRESETS_DIR ROCKBOX_DIR "/recpresets" #define FMPRESET_PATH ROCKBOX_DIR "/fmpresets" #define VIEWERS_CONFIG ROCKBOX_DIR "/viewers.config" @@ -231,9 +232,14 @@ bool settings_load_config(const char* file, bool apply); void status_save( void ); int settings_save(void); /* defines for the options paramater */ -#define SETTINGS_SAVE_CHANGED 0 -#define SETTINGS_SAVE_ALL 1 -#define SETTINGS_SAVE_THEME 2 +enum { + SETTINGS_SAVE_CHANGED = 0, + SETTINGS_SAVE_ALL, + SETTINGS_SAVE_THEME, +#ifdef HAVE_RECORDING + SETTINGS_SAVE_RECPRESETS, +#endif +}; bool settings_save_config(int options); void settings_reset(void); diff --git a/apps/settings_list.c b/apps/settings_list.c index efac40c7b5..b5e6d85612 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c @@ -733,7 +733,7 @@ const struct settings_list settings[] = { #ifdef HAVE_RECORDING /* recording */ - STRINGCHOICE_SETTING(0, rec_timesplit, LANG_SPLIT_TIME, 0, + STRINGCHOICE_SETTING(F_RECSETTING, rec_timesplit, LANG_SPLIT_TIME, 0, "rec timesplit", "off,00:05,00:10,00:15,00:30,01:00,01:14,01:20,02:00," "04:00,06:00,08:00,10:00,12:00,18:00,24:00", @@ -744,7 +744,7 @@ const struct settings_list settings[] = { TALK_ID(6, UNIT_HOUR), TALK_ID(8, UNIT_HOUR), TALK_ID(10, UNIT_HOUR), TALK_ID(12, UNIT_HOUR), TALK_ID(18, UNIT_HOUR), TALK_ID(20, UNIT_HOUR), TALK_ID(24, UNIT_HOUR)), - STRINGCHOICE_SETTING(0, rec_sizesplit, LANG_SPLIT_SIZE, 0, + STRINGCHOICE_SETTING(F_RECSETTING, rec_sizesplit, LANG_SPLIT_SIZE, 0, "rec sizesplit", "off,5MB,10MB,15MB,32MB,64MB,75MB,100MB,128MB," "256MB,512MB,650MB,700MB,1GB,1.5GB,1.75GB", @@ -754,28 +754,30 @@ const struct settings_list settings[] = { TALK_ID(100, UNIT_MB), TALK_ID(128, UNIT_MB), TALK_ID(256, UNIT_MB), TALK_ID(512, UNIT_MB), TALK_ID(650, UNIT_MB), TALK_ID(700, UNIT_MB), TALK_ID(1024, UNIT_MB), TALK_ID(1536, UNIT_MB), TALK_ID(1792, UNIT_MB)), - {F_T_INT,&global_settings.rec_channels,LANG_RECORDING_CHANNELS,INT(0), + {F_T_INT|F_RECSETTING, &global_settings.rec_channels, + LANG_RECORDING_CHANNELS, INT(0), "rec channels","stereo,mono",UNUSED}, - CHOICE_SETTING(0, rec_split_type, LANG_SPLIT_TYPE, 0 , + CHOICE_SETTING(F_RECSETTING, rec_split_type, LANG_SPLIT_TYPE, 0 , "rec split type", "Split, Stop", NULL, 2, ID2P(LANG_START_NEW_FILE), ID2P(LANG_STOP_RECORDING)), - CHOICE_SETTING(0, rec_split_method, LANG_SPLIT_MEASURE, 0 , + CHOICE_SETTING(F_RECSETTING, rec_split_method, LANG_SPLIT_MEASURE, 0 , "rec split method", "Time,Filesize", NULL, 2, ID2P(LANG_REC_TIME), ID2P(LANG_REC_SIZE)), - {F_T_INT,&global_settings.rec_source,LANG_RECORDING_SOURCE,INT(0), + {F_T_INT|F_RECSETTING, &global_settings.rec_source, + LANG_RECORDING_SOURCE, INT(0), "rec source", &HAVE_MIC_REC_(",mic") HAVE_LINE_REC_(",line") HAVE_SPDIF_REC_(",spdif") HAVE_FMRADIO_REC_(",fmradio")[1] ,UNUSED}, - INT_SETTING(0, rec_prerecord_time, LANG_RECORD_PRERECORD_TIME, + INT_SETTING(F_RECSETTING, rec_prerecord_time, LANG_RECORD_PRERECORD_TIME, 0, "prerecording time", UNIT_SEC, 0, 30, 1, rectime_formatter, rectime_getlang, NULL), - {F_T_INT,&global_settings.rec_directory,LANG_RECORD_DIRECTORY, + {F_T_INT|F_RECSETTING,&global_settings.rec_directory,LANG_RECORD_DIRECTORY, INT(0),"rec directory",REC_BASE_DIR ",current",UNUSED}, #ifdef HAVE_BACKLIGHT - CHOICE_SETTING(0, cliplight, LANG_CLIP_LIGHT, 0 , + CHOICE_SETTING(F_RECSETTING, cliplight, LANG_CLIP_LIGHT, 0 , "cliplight", "off,main,both,remote", NULL, #ifdef HAVE_REMOTE_LCD 4, @@ -787,34 +789,41 @@ const struct settings_list settings[] = { , ID2P(LANG_REMOTE_MAIN), ID2P(LANG_REMOTE_UNIT) #endif ), - {F_T_INT,&global_settings.cliplight,LANG_CLIP_LIGHT,INT(0), + {F_T_INT|F_RECSETTING,&global_settings.cliplight,LANG_CLIP_LIGHT,INT(0), "cliplight","off,main,both,remote",UNUSED}, #endif - {F_T_INT,&global_settings.rec_mic_gain,LANG_RECORDING_GAIN,INT(DEFAULT_REC_MIC_GAIN), + {F_T_INT|F_RECSETTING,&global_settings.rec_mic_gain, + LANG_RECORDING_GAIN,INT(DEFAULT_REC_MIC_GAIN), "rec mic gain",NULL,UNUSED}, - {F_T_INT,&global_settings.rec_left_gain,LANG_RECORDING_LEFT,INT(DEFAULT_REC_LEFT_GAIN), + {F_T_INT|F_RECSETTING,&global_settings.rec_left_gain, + LANG_RECORDING_LEFT,INT(DEFAULT_REC_LEFT_GAIN), "rec left gain",NULL,UNUSED}, - {F_T_INT,&global_settings.rec_right_gain,LANG_RECORDING_RIGHT, + {F_T_INT|F_RECSETTING,&global_settings.rec_right_gain,LANG_RECORDING_RIGHT, INT(DEFAULT_REC_RIGHT_GAIN), "rec right gain",NULL,UNUSED}, #if CONFIG_CODEC == MAS3587F - {F_T_INT,&global_settings.rec_frequency,LANG_RECORDING_FREQUENCY, + {F_T_INT|F_RECSETTING,&global_settings.rec_frequency, + LANG_RECORDING_FREQUENCY, INT(0),"rec frequency","44,48,32,22,24,16",UNUSED}, - INT_SETTING(0, rec_quality, LANG_RECORDING_QUALITY, 5, "rec quality", - UNIT_INT, 0, 7, 1, NULL, NULL, NULL), - OFFON_SETTING(0,rec_editable,LANG_RECORDING_EDITABLE, + INT_SETTING(F_RECSETTING, rec_quality, LANG_RECORDING_QUALITY, + 5, "rec quality", + UNIT_INT, 0, 7, 1, NULL, NULL, NULL), + OFFON_SETTING(F_RECSETTING,rec_editable,LANG_RECORDING_EDITABLE, false,"editable recordings",NULL), #endif /* CONFIG_CODEC == MAS3587F */ #if CONFIG_CODEC == SWCODEC - {F_T_INT,&global_settings.rec_frequency,LANG_RECORDING_FREQUENCY,INT(REC_FREQ_DEFAULT), + {F_T_INT|F_RECSETTING,&global_settings.rec_frequency, + LANG_RECORDING_FREQUENCY,INT(REC_FREQ_DEFAULT), "rec frequency",REC_FREQ_CFG_VAL_LIST,UNUSED}, - {F_T_INT,&global_settings.rec_format,LANG_RECORDING_FORMAT,INT(REC_FORMAT_DEFAULT), + {F_T_INT|F_RECSETTING,&global_settings.rec_format, + LANG_RECORDING_FORMAT,INT(REC_FORMAT_DEFAULT), "rec format",REC_FORMAT_CFG_VAL_LIST,UNUSED}, /** Encoder settings start - keep these together **/ /* aiff_enc */ /* (no settings yet) */ /* mp3_enc */ - {F_T_INT,&global_settings.mp3_enc_config.bitrate,-1,INT(MP3_ENC_BITRATE_CFG_DEFAULT), + {F_T_INT|F_RECSETTING, &global_settings.mp3_enc_config.bitrate,-1, + INT(MP3_ENC_BITRATE_CFG_DEFAULT), "mp3_enc bitrate",MP3_ENC_BITRATE_CFG_VALUE_LIST,UNUSED}, /* wav_enc */ /* (no settings yet) */ @@ -823,17 +832,23 @@ const struct settings_list settings[] = { /** Encoder settings end **/ #endif /* CONFIG_CODEC == SWCODEC */ /* values for the trigger */ - {F_T_INT,&global_settings.rec_start_thres,LANG_RECORD_START_THRESHOLD,INT(-35), + {F_T_INT|F_RECSETTING,&global_settings.rec_start_thres, + LANG_RECORD_START_THRESHOLD, INT(-35), "trigger start threshold",NULL,UNUSED}, - {F_T_INT,&global_settings.rec_stop_thres,LANG_RECORD_STOP_THRESHOLD,INT(-45), + {F_T_INT|F_RECSETTING,&global_settings.rec_stop_thres, + LANG_RECORD_STOP_THRESHOLD,INT(-45), "trigger stop threshold",NULL,UNUSED}, - {F_T_INT,&global_settings.rec_start_duration,LANG_RECORD_MIN_DURATION,INT(0), + {F_T_INT|F_RECSETTING,&global_settings.rec_start_duration, + LANG_RECORD_MIN_DURATION,INT(0), "trigger start duration",trig_durations_conf,UNUSED}, - {F_T_INT,&global_settings.rec_stop_postrec,LANG_RECORD_STOP_POSTREC,INT(2), + {F_T_INT|F_RECSETTING,&global_settings.rec_stop_postrec, + LANG_RECORD_STOP_POSTREC,INT(2), "trigger stop postrec",trig_durations_conf,UNUSED}, - {F_T_INT,&global_settings.rec_stop_gap,LANG_RECORD_STOP_GAP,INT(1), + {F_T_INT|F_RECSETTING,&global_settings.rec_stop_gap, + LANG_RECORD_STOP_GAP,INT(1), "trigger min gap",trig_durations_conf,UNUSED}, - {F_T_INT,&global_settings.rec_trigger_mode,LANG_RECORD_TRIGGER_MODE,INT(0), + {F_T_INT|F_RECSETTING,&global_settings.rec_trigger_mode, + LANG_RECORD_TRIGGER_MODE,INT(0), "trigger mode","off,once,repeat",UNUSED}, #endif /* HAVE_RECORDING */ @@ -1111,7 +1126,8 @@ const struct settings_list settings[] = { false,"Last.fm Logging",NULL), #ifdef HAVE_RECORDING - {F_T_INT,&global_settings.rec_trigger_type,LANG_RECORD_TRIGGER_TYPE, + {F_T_INT|F_RECSETTING,&global_settings.rec_trigger_type, + LANG_RECORD_TRIGGER_TYPE, INT(0),"trigger type","stop,pause,nf stp",UNUSED}, #endif diff --git a/apps/settings_list.h b/apps/settings_list.h index 97443e35be..9bc8eb9621 100644 --- a/apps/settings_list.h +++ b/apps/settings_list.h @@ -91,7 +91,8 @@ struct choice_setting { #define F_MAX_ISFUNC 0x200000 /* max(above) is function pointer to above type */ #define F_DEF_ISFUNC 0x400000 /* default_val is function pointer to above type */ -#define F_THEMESETTING 0x800000 +#define F_THEMESETTING 0x0800000 +#define F_RECSETTING 0x1000000 #define F_NVRAM_BYTES_MASK 0xE000 /*0-4 bytes can be stored */ #define F_NVRAM_MASK_SHIFT 13 @@ -102,10 +103,10 @@ struct choice_setting { - a NVRAM setting is removed */ #define F_TEMPVAR 0x400 /* used if the setting should be set using a temp var */ -#define F_FLIPLIST 0x800 /* used if the order in the setting screen is backwards */ +#define F_FLIPLIST 0x800 /* used if the order in the setting screen is backwards */ struct settings_list { - uint32_t flags; /* ____ ____ TFFF ____ NNN_ FTVC IFRB STTT */ + uint32_t flags; /* ____ ___R TFFF ____ NNN_ FTVC IFRB STTT */ void *setting; int lang_id; /* -1 for none */ union storage_type default_val; diff --git a/tools/buildzip.pl b/tools/buildzip.pl index 4beade7739..98419d8763 100755 --- a/tools/buildzip.pl +++ b/tools/buildzip.pl @@ -200,6 +200,7 @@ sub buildzip { mkdir ".rockbox/langs", 0777; mkdir ".rockbox/rocks", 0777; + mkdir ".rockbox/recpresets", 0777; if($swcodec) { mkdir ".rockbox/eqs", 0777;