From 7c776d4e168ff87367f84e22550a463a51a66e37 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Sun, 11 Feb 2007 10:09:38 +0000 Subject: [PATCH] Make amiconn happy git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12270 a1c6a512-1295-4272-9138-f99709370657 --- apps/settings_list.c | 293 ++++++++++++++++++++++--------------------- 1 file changed, 148 insertions(+), 145 deletions(-) diff --git a/apps/settings_list.c b/apps/settings_list.c index dbb121e86b..68ffb3e9db 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c @@ -77,9 +77,6 @@ static const char backlight_times_conf [] = "off,on,1,2,3,4,5,6,7,8,9,10,15,20,25,30,45,60,90"; #endif - -#define GS(a) &global_settings.a - #define NVRAM(bytes) (bytes< 1 INT_SETTING(0,max_files_in_playlist,LANG_MAX_FILES_IN_PLAYLIST,10000, "max files in playlist", NULL, UNIT_INT,1000,20000,1000,NULL,NULL), - {F_T_INT,GS(max_files_in_dir),LANG_MAX_FILES_IN_DIR, + {F_T_INT,&global_settings.max_files_in_dir,LANG_MAX_FILES_IN_DIR, INT(400),"max files in dir",NULL,UNUSED}, #else - {F_T_INT,GS(max_files_in_playlist),LANG_MAX_FILES_IN_PLAYLIST, + {F_T_INT,&global_settings.max_files_in_playlist,LANG_MAX_FILES_IN_PLAYLIST, INT(1000),"max files in playlist",NULL,UNUSED}, - {F_T_INT,GS(max_files_in_dir),LANG_MAX_FILES_IN_DIR, + {F_T_INT,&global_settings.max_files_in_dir,LANG_MAX_FILES_IN_DIR, INT(200),"max files in dir",NULL,UNUSED}, #endif - {F_T_INT,GS(battery_capacity),LANG_BATTERY_CAPACITY, + {F_T_INT,&global_settings.battery_capacity,LANG_BATTERY_CAPACITY, INT(BATTERY_CAPACITY_DEFAULT), "battery capacity",NULL,UNUSED}, #ifdef CONFIG_CHARGING @@ -271,22 +274,22 @@ const struct settings_list settings[] = { #endif #if BATTERY_TYPES_COUNT > 1 - {F_T_INT,GS(battery_type), LANG_BATTERY_TYPE, INT(0), + {F_T_INT,&global_settings.battery_type, LANG_BATTERY_TYPE, INT(0), "battery type","alkaline,nimh",UNUSED}, #endif #ifdef HAVE_REMOTE_LCD /* remote lcd */ - {F_T_INT,GS(remote_contrast), LANG_CONTRAST, + {F_T_INT,&global_settings.remote_contrast, LANG_CONTRAST, INT(DEFAULT_REMOTE_CONTRAST_SETTING), "remote contrast",NULL,UNUSED}, OFFON_SETTING(0,remote_invert, LANG_INVERT, false,"remote invert", NULL), OFFON_SETTING(0,remote_flip_display, LANG_FLIP_DISPLAY, false,"remote flip display", NULL), - {F_T_INT,GS(remote_backlight_timeout), LANG_BACKLIGHT, INT(6), + {F_T_INT,&global_settings.remote_backlight_timeout, LANG_BACKLIGHT, INT(6), "remote backlight timeout",backlight_times_conf,UNUSED}, #ifdef CONFIG_CHARGING - {F_T_INT,GS(remote_backlight_timeout_plugged), + {F_T_INT,&global_settings.remote_backlight_timeout_plugged, LANG_BACKLIGHT_ON_WHEN_CHARGING, INT(11), "remote backlight timeout plugged",backlight_times_conf,UNUSED}, #endif @@ -318,73 +321,73 @@ const struct settings_list settings[] = { #endif #endif /* CONFIG_BACKLIGHT */ #ifdef HAVE_BACKLIGHT_BRIGHTNESS - {F_T_INT,GS(brightness),LANG_BRIGHTNESS, + {F_T_INT,&global_settings.brightness,LANG_BRIGHTNESS, INT(DEFAULT_BRIGHTNESS_SETTING), "brightness", NULL ,UNUSED}, #endif #ifdef HAVE_BACKLIGHT_PWM_FADING /* backlight fading */ - {F_T_INT,GS(backlight_fade_in), LANG_BACKLIGHT_FADE_IN, INT(1), + {F_T_INT,&global_settings.backlight_fade_in, LANG_BACKLIGHT_FADE_IN, INT(1), "backlight fade in","off,500ms,1s,2s",UNUSED}, - {F_T_INT,GS(backlight_fade_out), LANG_BACKLIGHT_FADE_OUT, INT(1), + {F_T_INT,&global_settings.backlight_fade_out, LANG_BACKLIGHT_FADE_OUT, INT(1), "backlight fade out","off,500ms,1s,2s,3s,4s,5s,10s",UNUSED}, #endif - {F_T_INT,GS(scroll_speed), LANG_SCROLL_SPEED , + {F_T_INT,&global_settings.scroll_speed, LANG_SCROLL_SPEED , INT(9),"scroll speed",NULL,UNUSED}, - {F_T_INT,GS(scroll_delay), LANG_SCROLL_DELAY, + {F_T_INT,&global_settings.scroll_delay, LANG_SCROLL_DELAY, INT(100),"scroll delay",NULL,UNUSED}, - {F_T_INT,GS(bidir_limit), LANG_BIDIR_SCROLL, + {F_T_INT,&global_settings.bidir_limit, LANG_BIDIR_SCROLL, INT(50),"bidir limit",NULL,UNUSED}, #ifdef HAVE_REMOTE_LCD - {F_T_INT,GS(remote_scroll_speed),LANG_SCROLL_SPEED,INT(9), + {F_T_INT,&global_settings.remote_scroll_speed,LANG_SCROLL_SPEED,INT(9), "remote scroll speed",NULL,UNUSED}, - {F_T_INT,GS(remote_scroll_step),LANG_SCROLL_STEP,INT(6), + {F_T_INT,&global_settings.remote_scroll_step,LANG_SCROLL_STEP,INT(6), "remote scroll step",NULL,UNUSED}, - {F_T_INT,GS(remote_scroll_delay),LANG_SCROLL_DELAY,INT(100), + {F_T_INT,&global_settings.remote_scroll_delay,LANG_SCROLL_DELAY,INT(100), "remote scroll delay",NULL,UNUSED}, - {F_T_INT,GS(remote_bidir_limit),LANG_BIDIR_SCROLL,INT(50), + {F_T_INT,&global_settings.remote_bidir_limit,LANG_BIDIR_SCROLL,INT(50), "remote bidir limit",NULL,UNUSED}, #endif #ifdef HAVE_LCD_BITMAP OFFON_SETTING(0,offset_out_of_view,LANG_SCREEN_SCROLL_VIEW, false,"Screen Scrolls Out Of View",NULL), - {F_T_INT,GS(scroll_step),LANG_SCROLL_STEP,INT(6),"scroll step",NULL,UNUSED}, - {F_T_INT,GS(screen_scroll_step),LANG_SCREEN_SCROLL_STEP, + {F_T_INT,&global_settings.scroll_step,LANG_SCROLL_STEP,INT(6),"scroll step",NULL,UNUSED}, + {F_T_INT,&global_settings.screen_scroll_step,LANG_SCREEN_SCROLL_STEP, INT(16),"screen scroll step",NULL,UNUSED}, #endif /* HAVE_LCD_BITMAP */ #ifdef HAVE_LCD_CHARCELLS - {F_T_INT,GS(jump_scroll),LANG_JUMP_SCROLL,INT(0),"jump scroll",NULL,UNUSED}, - {F_T_INT,GS(jump_scroll_delay),LANG_JUMP_SCROLL_DELAY, + {F_T_INT,&global_settings.jump_scroll,LANG_JUMP_SCROLL,INT(0),"jump scroll",NULL,UNUSED}, + {F_T_INT,&global_settings.jump_scroll_delay,LANG_JUMP_SCROLL_DELAY, INT(50),"jump scroll delay",NULL,UNUSED}, #endif OFFON_SETTING(0,scroll_paginated,LANG_SCROLL_PAGINATED, false,"scroll paginated",NULL), #ifdef HAVE_LCD_COLOR - {F_T_INT|F_RGB|F_THEMESETTING ,GS(fg_color),-1,INT(LCD_DEFAULT_FG), + {F_T_INT|F_RGB|F_THEMESETTING ,&global_settings.fg_color,-1,INT(LCD_DEFAULT_FG), "foreground color",NULL,UNUSED}, - {F_T_INT|F_RGB|F_THEMESETTING ,GS(bg_color),-1,INT(LCD_DEFAULT_BG), + {F_T_INT|F_RGB|F_THEMESETTING ,&global_settings.bg_color,-1,INT(LCD_DEFAULT_BG), "background color",NULL,UNUSED}, #endif /* more playback */ OFFON_SETTING(0,play_selected,LANG_PLAY_SELECTED,true,"play selected",NULL), OFFON_SETTING(0,party_mode,LANG_PARTY_MODE,false,"party mode",NULL), OFFON_SETTING(0,fade_on_stop,LANG_FADE_ON_STOP,true,"volume fade",NULL), - {F_T_INT,GS(ff_rewind_min_step),LANG_FFRW_STEP,INT(FF_REWIND_1000), + {F_T_INT,&global_settings.ff_rewind_min_step,LANG_FFRW_STEP,INT(FF_REWIND_1000), "scan min step","1,2,3,4,5,6,8,10,15,20,25,30,45,60",UNUSED}, - {F_T_INT,GS(ff_rewind_accel),LANG_FFRW_ACCEL,INT(3), + {F_T_INT,&global_settings.ff_rewind_accel,LANG_FFRW_ACCEL,INT(3), "scan accel",NULL,UNUSED}, #if CONFIG_CODEC == SWCODEC - {F_T_INT,GS(buffer_margin),LANG_MP3BUFFER_MARGIN,INT(0),"antiskip", + {F_T_INT,&global_settings.buffer_margin,LANG_MP3BUFFER_MARGIN,INT(0),"antiskip", "5s,15s,30s,1min,2min,3min,5min,10min",UNUSED}, #else - {F_T_INT,GS(buffer_margin),LANG_MP3BUFFER_MARGIN,INT(0), + {F_T_INT,&global_settings.buffer_margin,LANG_MP3BUFFER_MARGIN,INT(0), "antiskip",NULL,UNUSED}, #endif /* disk */ #ifndef HAVE_MMC - {F_T_INT,GS(disk_spindown),LANG_SPINDOWN,INT(5),"disk spindown",NULL,UNUSED}, + {F_T_INT,&global_settings.disk_spindown,LANG_SPINDOWN,INT(5),"disk spindown",NULL,UNUSED}, #endif /* HAVE_MMC */ /* browser */ - {F_T_INT,GS(dirfilter),LANG_FILTER,INT(SHOW_SUPPORTED),"show files", + {F_T_INT,&global_settings.dirfilter,LANG_FILTER,INT(SHOW_SUPPORTED),"show files", "all,supported,music,playlists" #ifdef HAVE_TAGCACHE ",id3 database" @@ -396,34 +399,34 @@ const struct settings_list settings[] = { "playlist viewer icons",NULL), OFFON_SETTING(0,playlist_viewer_indices,LANG_SHOW_INDICES,true, "playlist viewer indices",NULL), - {F_T_INT,GS(playlist_viewer_track_display),LANG_TRACK_DISPLAY, + {F_T_INT,&global_settings.playlist_viewer_track_display,LANG_TRACK_DISPLAY, INT(0),"playlist viewer track display","track name,full path",UNUSED}, CHOICE_SETTING(0, recursive_dir_insert, LANG_RECURSE_DIRECTORY , RECURSE_OFF, "recursive directory insert", off_on_ask, NULL , 3 , ID2P(LANG_OFF), ID2P(LANG_ON), ID2P(LANG_RESUME_SETTING_ASK)), /* bookmarks */ - {F_T_INT,GS(autocreatebookmark),LANG_BOOKMARK_SETTINGS_AUTOCREATE, + {F_T_INT,&global_settings.autocreatebookmark,LANG_BOOKMARK_SETTINGS_AUTOCREATE, INT(BOOKMARK_NO),"autocreate bookmarks", "off,on,ask,recent only - on,recent only - ask",UNUSED}, - {F_T_INT,GS(autoloadbookmark),LANG_BOOKMARK_SETTINGS_AUTOLOAD, + {F_T_INT,&global_settings.autoloadbookmark,LANG_BOOKMARK_SETTINGS_AUTOLOAD, INT(BOOKMARK_NO), "autoload bookmarks",off_on_ask,UNUSED}, - {F_T_INT,GS(usemrb),LANG_BOOKMARK_SETTINGS_MAINTAIN_RECENT_BOOKMARKS, + {F_T_INT,&global_settings.usemrb,LANG_BOOKMARK_SETTINGS_MAINTAIN_RECENT_BOOKMARKS, INT(BOOKMARK_NO), "use most-recent-bookmarks","off,on,unique only",UNUSED}, #ifdef HAVE_LCD_BITMAP /* peak meter */ - {F_T_INT, GS(peak_meter_clip_hold), LANG_PM_CLIP_HOLD, + {F_T_INT, &global_settings.peak_meter_clip_hold, LANG_PM_CLIP_HOLD, INT(16), "peak meter clip hold", "on,1,2,3,4,5,6,7,8,9,10,15,20,25,30,45,60,90,2min" ",3min,5min,10min,20min,45min,90min", UNUSED}, - {F_T_INT,GS(peak_meter_hold), LANG_PM_PEAK_HOLD, + {F_T_INT,&global_settings.peak_meter_hold, LANG_PM_PEAK_HOLD, INT(3),"peak meter hold", "off,200ms,300ms,500ms,1,2,3,4,5,6,7,8,9,10,15,20,30,1min",UNUSED}, - {F_T_INT,GS(peak_meter_release),LANG_PM_RELEASE, + {F_T_INT,&global_settings.peak_meter_release,LANG_PM_RELEASE, INT(8),"peak meter release",NULL,UNUSED}, OFFON_SETTING(0,peak_meter_dbfs,LANG_PM_DBFS,true,"peak meter dbfs",NULL), - {F_T_INT,GS(peak_meter_min),LANG_PM_MIN,INT(60),"peak meter min",NULL,UNUSED}, - {F_T_INT,GS(peak_meter_max),LANG_PM_MAX,INT(0),"peak meter max",NULL,UNUSED}, + {F_T_INT,&global_settings.peak_meter_min,LANG_PM_MIN,INT(60),"peak meter min",NULL,UNUSED}, + {F_T_INT,&global_settings.peak_meter_max,LANG_PM_MAX,INT(0),"peak meter max",NULL,UNUSED}, #endif #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) SOUND_SETTING(0, mdb_strength, LANG_MDB_STRENGTH, @@ -441,16 +444,16 @@ const struct settings_list settings[] = { OFFON_SETTING(0,line_in,LANG_LINE_IN,false,"line in",NULL), #endif /* voice */ - {F_T_INT,GS(talk_dir),LANG_VOICE_DIR,INT(0), + {F_T_INT,&global_settings.talk_dir,LANG_VOICE_DIR,INT(0), "talk dir",off_number_spell_hover,UNUSED}, - {F_T_INT,GS(talk_file),LANG_VOICE_FILE,INT(0), + {F_T_INT,&global_settings.talk_file,LANG_VOICE_FILE,INT(0), "talk file",off_number_spell_hover,UNUSED}, OFFON_SETTING(0,talk_menu,LANG_VOICE_MENU,true,"talk menu",NULL), /* file sorting */ - {F_T_INT,GS(sort_file),LANG_SORT_FILE,INT(0), + {F_T_INT,&global_settings.sort_file,LANG_SORT_FILE,INT(0), "sort files","alpha,oldest,newest,type",UNUSED}, - {F_T_INT,GS(sort_dir),LANG_SORT_DIR,INT(0), + {F_T_INT,&global_settings.sort_dir,LANG_SORT_DIR,INT(0), "sort dirs","alpha,oldest,newest",UNUSED}, BOOL_SETTING(0,id3_v1_first,LANG_ID3_ORDER,false, "id3 tag priority","v2-v1,v1-v2", @@ -460,19 +463,19 @@ const struct settings_list settings[] = { /* recording */ OFFON_SETTING(0,rec_startup,LANG_RECORD_STARTUP,false, "rec screen on startup",NULL), - {F_T_INT,GS(rec_timesplit), LANG_SPLIT_TIME, INT(0),"rec timesplit", + {F_T_INT,&global_settings.rec_timesplit, LANG_SPLIT_TIME, INT(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",UNUSED}, - {F_T_INT,GS(rec_sizesplit),LANG_SPLIT_SIZE,INT(0),"rec sizesplit", + {F_T_INT,&global_settings.rec_sizesplit,LANG_SPLIT_SIZE,INT(0),"rec sizesplit", "off,5MB,10MB,15MB,32MB,64MB,75MB,100MB,128MB," "256MB,512MB,650MB,700MB,1GB,1.5GB,1.75GB",UNUSED}, - {F_T_INT,GS(rec_channels),LANG_RECORDING_CHANNELS,INT(0), + {F_T_INT,&global_settings.rec_channels,LANG_RECORDING_CHANNELS,INT(0), "rec channels","stereo,mono",UNUSED}, - {F_T_INT,GS(rec_split_type),LANG_RECORDING_CHANNELS,INT(0), + {F_T_INT,&global_settings.rec_split_type,LANG_RECORDING_CHANNELS,INT(0), "rec split type","Split, Stop",UNUSED}, - {F_T_INT,GS(rec_split_method),LANG_SPLIT_MEASURE,INT(0), + {F_T_INT,&global_settings.rec_split_method,LANG_SPLIT_MEASURE,INT(0), "rec split method","Time,Filesize",UNUSED}, - {F_T_INT,GS(rec_source),LANG_RECORDING_SOURCE,INT(0), + {F_T_INT,&global_settings.rec_source,LANG_RECORDING_SOURCE,INT(0), "rec source","mic,line" #ifdef HAVE_SPDIF_IN ",spdif" @@ -481,39 +484,39 @@ const struct settings_list settings[] = { ",fmradio" #endif ,UNUSED}, - {F_T_INT,GS(rec_prerecord_time),LANG_RECORD_PRERECORD_TIME, + {F_T_INT,&global_settings.rec_prerecord_time,LANG_RECORD_PRERECORD_TIME, INT(0),"prerecording time",NULL,UNUSED}, - {F_T_INT,GS(rec_directory),LANG_RECORD_DIRECTORY, + {F_T_INT,&global_settings.rec_directory,LANG_RECORD_DIRECTORY, INT(0),"rec directory",REC_BASE_DIR ",current",UNUSED}, #ifdef CONFIG_BACKLIGHT - {F_T_INT,GS(cliplight),LANG_CLIP_LIGHT,INT(0), + {F_T_INT,&global_settings.cliplight,LANG_CLIP_LIGHT,INT(0), "cliplight","off,main,both,remote",UNUSED}, #endif - {F_T_INT,GS(rec_mic_gain),LANG_RECORDING_GAIN,INT(DEFAULT_REC_MIC_GAIN), + {F_T_INT,&global_settings.rec_mic_gain,LANG_RECORDING_GAIN,INT(DEFAULT_REC_MIC_GAIN), "rec mic gain",NULL,UNUSED}, - {F_T_INT,GS(rec_left_gain),LANG_RECORDING_LEFT,INT(DEFAULT_REC_LEFT_GAIN), + {F_T_INT,&global_settings.rec_left_gain,LANG_RECORDING_LEFT,INT(DEFAULT_REC_LEFT_GAIN), "rec left gain",NULL,UNUSED}, - {F_T_INT,GS(rec_right_gain),LANG_RECORDING_RIGHT, + {F_T_INT,&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,GS(rec_frequency),LANG_RECORDING_FREQUENCY, + {F_T_INT,&global_settings.rec_frequency,LANG_RECORDING_FREQUENCY, INT(0),"rec frequency","44,48,32,22,24,16",UNUSED}, - {F_T_INT,GS(rec_quality),LANG_RECORDING_QUALITY,INT(5), + {F_T_INT,&global_settings.rec_quality,LANG_RECORDING_QUALITY,INT(5), "rec quality",NULL,UNUSED}, OFFON_SETTING(0,rec_editable,LANG_RECORDING_EDITABLE, false,"editable recordings",NULL), #endif /* CONFIG_CODEC == MAS3587F */ #if CONFIG_CODEC == SWCODEC - {F_T_INT,GS(rec_frequency),LANG_RECORDING_FREQUENCY,INT(REC_FREQ_DEFAULT), + {F_T_INT,&global_settings.rec_frequency,LANG_RECORDING_FREQUENCY,INT(REC_FREQ_DEFAULT), "rec frequency",REC_FREQ_CFG_VAL_LIST,UNUSED}, - {F_T_INT,GS(rec_format),LANG_RECORDING_FORMAT,INT(REC_FORMAT_DEFAULT), + {F_T_INT,&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,GS(mp3_enc_config.bitrate),-1,INT(MP3_ENC_BITRATE_CFG_DEFAULT), + {F_T_INT,&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) */ @@ -522,54 +525,54 @@ const struct settings_list settings[] = { /** Encoder settings end **/ #endif /* CONFIG_CODEC == SWCODEC */ /* values for the trigger */ - {F_T_INT,GS(rec_start_thres),LANG_RECORD_START_THRESHOLD,INT(-35), + {F_T_INT,&global_settings.rec_start_thres,LANG_RECORD_START_THRESHOLD,INT(-35), "trigger start threshold",NULL,UNUSED}, - {F_T_INT,GS(rec_stop_thres),LANG_RECORD_STOP_THRESHOLD,INT(-45), + {F_T_INT,&global_settings.rec_stop_thres,LANG_RECORD_STOP_THRESHOLD,INT(-45), "trigger stop threshold",NULL,UNUSED}, - {F_T_INT,GS(rec_start_duration),LANG_RECORD_MIN_DURATION,INT(0), + {F_T_INT,&global_settings.rec_start_duration,LANG_RECORD_MIN_DURATION,INT(0), "trigger start duration",trig_durations_conf,UNUSED}, - {F_T_INT,GS(rec_stop_postrec),LANG_RECORD_STOP_POSTREC,INT(2), + {F_T_INT,&global_settings.rec_stop_postrec,LANG_RECORD_STOP_POSTREC,INT(2), "trigger stop postrec",trig_durations_conf,UNUSED}, - {F_T_INT,GS(rec_stop_gap),LANG_RECORD_STOP_GAP,INT(1), + {F_T_INT,&global_settings.rec_stop_gap,LANG_RECORD_STOP_GAP,INT(1), "trigger min gap",trig_durations_conf,UNUSED}, - {F_T_INT,GS(rec_trigger_mode),LANG_RECORD_TRIGGER_MODE,INT(0), + {F_T_INT,&global_settings.rec_trigger_mode,LANG_RECORD_TRIGGER_MODE,INT(0), "trigger mode","off,once,repeat",UNUSED}, #endif /* HAVE_RECORDING */ #ifdef HAVE_SPDIF_POWER OFFON_SETTING(0,spdif_enable,LANG_SPDIF_ENABLE,false,"spdif enable",NULL), #endif - {F_T_INT,GS(next_folder),LANG_NEXT_FOLDER,INT(FOLDER_ADVANCE_OFF), + {F_T_INT,&global_settings.next_folder,LANG_NEXT_FOLDER,INT(FOLDER_ADVANCE_OFF), "folder navigation","off,on,random",UNUSED}, OFFON_SETTING(0,runtimedb,LANG_RUNTIMEDB_ACTIVE,false,"gather runtime data",NULL), #if CONFIG_CODEC == SWCODEC /* replay gain */ OFFON_SETTING(0,replaygain,LANG_REPLAYGAIN,false,"replaygain",NULL), - {F_T_INT,GS(replaygain_type),LANG_REPLAYGAIN_MODE,INT(REPLAYGAIN_ALBUM), + {F_T_INT,&global_settings.replaygain_type,LANG_REPLAYGAIN_MODE,INT(REPLAYGAIN_ALBUM), "replaygain type","track,album,track shuffle",UNUSED}, OFFON_SETTING(0,replaygain_noclip,LANG_REPLAYGAIN_NOCLIP, false,"replaygain noclip",NULL), - {F_T_INT,GS(replaygain_preamp),LANG_REPLAYGAIN_PREAMP, + {F_T_INT,&global_settings.replaygain_preamp,LANG_REPLAYGAIN_PREAMP, INT(0),"replaygain preamp",NULL,UNUSED}, - {F_T_INT,GS(beep),LANG_BEEP,INT(0),"beep","off,weak,moderate,strong",UNUSED}, + {F_T_INT,&global_settings.beep,LANG_BEEP,INT(0),"beep","off,weak,moderate,strong",UNUSED}, /* crossfade */ - {F_T_INT,GS(crossfade),LANG_CROSSFADE_ENABLE,INT(0),"crossfade", + {F_T_INT,&global_settings.crossfade,LANG_CROSSFADE_ENABLE,INT(0),"crossfade", "off,shuffle,track skip,shuffle and track skip,always",UNUSED}, - {F_T_INT,GS(crossfade_fade_in_delay),LANG_CROSSFADE_FADE_IN_DELAY,INT(0), + {F_T_INT,&global_settings.crossfade_fade_in_delay,LANG_CROSSFADE_FADE_IN_DELAY,INT(0), "crossfade fade in delay",NULL,UNUSED}, - {F_T_INT,GS(crossfade_fade_out_delay), + {F_T_INT,&global_settings.crossfade_fade_out_delay, LANG_CROSSFADE_FADE_OUT_DELAY,INT(0), "crossfade fade out delay",NULL,UNUSED}, - {F_T_INT,GS(crossfade_fade_in_duration), + {F_T_INT,&global_settings.crossfade_fade_in_duration, LANG_CROSSFADE_FADE_IN_DURATION,INT(0), "crossfade fade in duration",NULL,UNUSED}, - {F_T_INT,GS(crossfade_fade_out_duration), + {F_T_INT,&global_settings.crossfade_fade_out_duration, LANG_CROSSFADE_FADE_OUT_DURATION,INT(0), "crossfade fade out duration",NULL,UNUSED}, - {F_T_INT,GS(crossfade_fade_out_mixmode), + {F_T_INT,&global_settings.crossfade_fade_out_mixmode, LANG_CROSSFADE_FADE_OUT_MODE,INT(0), "crossfade fade out mode","crossfade,mix",UNUSED}, @@ -590,40 +593,40 @@ const struct settings_list settings[] = { crossfeed_format, crossfeed_hf_cutoff_helper), /* equalizer */ OFFON_SETTING(0,eq_enabled,LANG_EQUALIZER_ENABLED,false,"eq enabled",NULL), - {F_T_INT,GS(eq_precut),LANG_EQUALIZER_PRECUT,INT(0), + {F_T_INT,&global_settings.eq_precut,LANG_EQUALIZER_PRECUT,INT(0), "eq precut",NULL,UNUSED}, /* 0..32768 Hz */ - {F_T_INT,GS(eq_band0_cutoff),LANG_EQUALIZER_BAND_CUTOFF,INT(60), + {F_T_INT,&global_settings.eq_band0_cutoff,LANG_EQUALIZER_BAND_CUTOFF,INT(60), "eq band 0 cutoff",NULL,UNUSED}, - {F_T_INT,GS(eq_band1_cutoff),LANG_EQUALIZER_BAND_CUTOFF,INT(200), + {F_T_INT,&global_settings.eq_band1_cutoff,LANG_EQUALIZER_BAND_CUTOFF,INT(200), "eq band 1 cutoff",NULL,UNUSED}, - {F_T_INT,GS(eq_band2_cutoff),LANG_EQUALIZER_BAND_CUTOFF,INT(800), + {F_T_INT,&global_settings.eq_band2_cutoff,LANG_EQUALIZER_BAND_CUTOFF,INT(800), "eq band 2 cutoff",NULL,UNUSED}, - {F_T_INT,GS(eq_band3_cutoff),LANG_EQUALIZER_BAND_CUTOFF,INT(4000), + {F_T_INT,&global_settings.eq_band3_cutoff,LANG_EQUALIZER_BAND_CUTOFF,INT(4000), "eq band 3 cutoff",NULL,UNUSED}, - {F_T_INT,GS(eq_band4_cutoff),LANG_EQUALIZER_BAND_CUTOFF,INT(12000), + {F_T_INT,&global_settings.eq_band4_cutoff,LANG_EQUALIZER_BAND_CUTOFF,INT(12000), "eq band 4 cutoff",NULL,UNUSED}, /* 0..64 (or 0.0 to 6.4) */ - {F_T_INT,GS(eq_band0_q),LANG_EQUALIZER_BAND_Q,INT(7), + {F_T_INT,&global_settings.eq_band0_q,LANG_EQUALIZER_BAND_Q,INT(7), "eq band 0 q",NULL,UNUSED}, - {F_T_INT,GS(eq_band1_q),LANG_EQUALIZER_BAND_Q,INT(10), + {F_T_INT,&global_settings.eq_band1_q,LANG_EQUALIZER_BAND_Q,INT(10), "eq band 1 q",NULL,UNUSED}, - {F_T_INT,GS(eq_band2_q),LANG_EQUALIZER_BAND_Q,INT(10), + {F_T_INT,&global_settings.eq_band2_q,LANG_EQUALIZER_BAND_Q,INT(10), "eq band 2 q",NULL,UNUSED}, - {F_T_INT,GS(eq_band3_q),LANG_EQUALIZER_BAND_Q,INT(10), + {F_T_INT,&global_settings.eq_band3_q,LANG_EQUALIZER_BAND_Q,INT(10), "eq band 3 q",NULL,UNUSED}, - {F_T_INT,GS(eq_band4_q),LANG_EQUALIZER_BAND_Q,INT(7), + {F_T_INT,&global_settings.eq_band4_q,LANG_EQUALIZER_BAND_Q,INT(7), "eq band 4 q",NULL,UNUSED}, /* -240..240 (or -24db to +24db) */ - {F_T_INT,GS(eq_band0_gain),LANG_EQUALIZER_BAND_GAIN,INT(0), + {F_T_INT,&global_settings.eq_band0_gain,LANG_EQUALIZER_BAND_GAIN,INT(0), "eq band 0 gain",NULL,UNUSED}, - {F_T_INT,GS(eq_band1_gain),LANG_EQUALIZER_BAND_GAIN,INT(0), + {F_T_INT,&global_settings.eq_band1_gain,LANG_EQUALIZER_BAND_GAIN,INT(0), "eq band 1 gain",NULL,UNUSED}, - {F_T_INT,GS(eq_band2_gain),LANG_EQUALIZER_BAND_GAIN,INT(0), + {F_T_INT,&global_settings.eq_band2_gain,LANG_EQUALIZER_BAND_GAIN,INT(0), "eq band 2 gain",NULL,UNUSED}, - {F_T_INT,GS(eq_band3_gain),LANG_EQUALIZER_BAND_GAIN,INT(0), + {F_T_INT,&global_settings.eq_band3_gain,LANG_EQUALIZER_BAND_GAIN,INT(0), "eq band 3 gain",NULL,UNUSED}, - {F_T_INT,GS(eq_band4_gain),LANG_EQUALIZER_BAND_GAIN,INT(0), + {F_T_INT,&global_settings.eq_band4_gain,LANG_EQUALIZER_BAND_GAIN,INT(0), "eq band 4 gain",NULL,UNUSED}, /* dithering */ @@ -643,7 +646,7 @@ const struct settings_list settings[] = { LANG_TAGCACHE_AUTOUPDATE,false,"tagcache_autoupdate",NULL), #endif - {F_T_INT,GS(default_codepage),LANG_DEFAULT_CODEPAGE, + {F_T_INT,&global_settings.default_codepage,LANG_DEFAULT_CODEPAGE, INT(0),"default codepage", "iso8859-1,iso8859-7,iso8859-8,cp1251,iso8859-11,cp1256," "iso8859-9,iso8859-2,sjis,gb2312,ksx1001,big5,utf-8,cp1256",UNUSED}, @@ -654,12 +657,12 @@ const struct settings_list settings[] = { #ifdef CONFIG_BACKLIGHT #ifdef HAS_BUTTON_HOLD - {F_T_INT,GS(backlight_on_button_hold),LANG_BACKLIGHT_ON_BUTTON_HOLD,INT(0), + {F_T_INT,&global_settings.backlight_on_button_hold,LANG_BACKLIGHT_ON_BUTTON_HOLD,INT(0), "backlight on button hold","normal,off,on",UNUSED}, #endif #ifdef HAVE_LCD_SLEEP - {F_T_INT,GS(lcd_sleep_after_backlight_off), + {F_T_INT,&global_settings.lcd_sleep_after_backlight_off, LANG_LCD_SLEEP_AFTER_BACKLIGHT_OFF,INT(3), "lcd sleep after backlight off", "always,never,5,10,15,20,30,45,60,90",UNUSED}, @@ -670,78 +673,78 @@ const struct settings_list settings[] = { OFFON_SETTING(0,eq_hw_enabled,LANG_EQUALIZER_HARDWARE_ENABLED,false, "eq hardware enabled",NULL), - {F_T_INT,GS(eq_hw_band0_cutoff),LANG_EQUALIZER_BAND_CUTOFF,INT(1), + {F_T_INT,&global_settings.eq_hw_band0_cutoff,LANG_EQUALIZER_BAND_CUTOFF,INT(1), "eq hardware band 0 cutoff", "80Hz,105Hz,135Hz,175Hz",UNUSED}, - {F_T_INT,GS(eq_hw_band0_gain),LANG_EQUALIZER_BAND_GAIN,INT(0), + {F_T_INT,&global_settings.eq_hw_band0_gain,LANG_EQUALIZER_BAND_GAIN,INT(0), "eq hardware band 0 gain",NULL,UNUSED}, - {F_T_INT,GS(eq_hw_band1_center),LANG_EQUALIZER_BAND_CENTER,INT(1), + {F_T_INT,&global_settings.eq_hw_band1_center,LANG_EQUALIZER_BAND_CENTER,INT(1), "eq hardware band 1 center", "230Hz,300Hz,385Hz,500Hz",UNUSED}, - {F_T_INT,GS(eq_hw_band1_bandwidth),LANG_EQUALIZER_BANDWIDTH,INT(0), + {F_T_INT,&global_settings.eq_hw_band1_bandwidth,LANG_EQUALIZER_BANDWIDTH,INT(0), "eq hardware band 1 bandwidth","narrow,wide",UNUSED}, - {F_T_INT,GS(eq_hw_band1_gain),LANG_EQUALIZER_BAND_GAIN,INT(0), + {F_T_INT,&global_settings.eq_hw_band1_gain,LANG_EQUALIZER_BAND_GAIN,INT(0), "eq hardware band 1 gain",NULL,UNUSED}, - {F_T_INT,GS(eq_hw_band2_center),LANG_EQUALIZER_BAND_CENTER,INT(1), + {F_T_INT,&global_settings.eq_hw_band2_center,LANG_EQUALIZER_BAND_CENTER,INT(1), "eq hardware band 2 center", "650Hz,850Hz,1.1kHz,1.4kHz",UNUSED}, - {F_T_INT,GS(eq_hw_band2_bandwidth),LANG_EQUALIZER_BANDWIDTH,INT(0), + {F_T_INT,&global_settings.eq_hw_band2_bandwidth,LANG_EQUALIZER_BANDWIDTH,INT(0), "eq hardware band 2 bandwidth","narrow,wide",UNUSED}, - {F_T_INT,GS(eq_hw_band2_gain),LANG_EQUALIZER_BAND_GAIN,INT(0), + {F_T_INT,&global_settings.eq_hw_band2_gain,LANG_EQUALIZER_BAND_GAIN,INT(0), "eq hardware band 2 gain",NULL,UNUSED}, - {F_T_INT,GS(eq_hw_band3_center),LANG_EQUALIZER_BAND_CENTER,INT(1), + {F_T_INT,&global_settings.eq_hw_band3_center,LANG_EQUALIZER_BAND_CENTER,INT(1), "eq hardware band 3 center", "1.8kHz,2.4kHz,3.2kHz,4.1kHz",UNUSED}, - {F_T_INT,GS(eq_hw_band3_bandwidth),LANG_EQUALIZER_BANDWIDTH,INT(0), + {F_T_INT,&global_settings.eq_hw_band3_bandwidth,LANG_EQUALIZER_BANDWIDTH,INT(0), "eq hardware band 3 bandwidth","narrow,wide",UNUSED}, - {F_T_INT,GS(eq_hw_band3_gain),LANG_EQUALIZER_BAND_GAIN,INT(0), + {F_T_INT,&global_settings.eq_hw_band3_gain,LANG_EQUALIZER_BAND_GAIN,INT(0), "eq hardware band 3 gain",NULL,UNUSED}, - {F_T_INT,GS(eq_hw_band4_cutoff),LANG_EQUALIZER_BAND_CUTOFF,INT(1), + {F_T_INT,&global_settings.eq_hw_band4_cutoff,LANG_EQUALIZER_BAND_CUTOFF,INT(1), "eq hardware band 4 cutoff", "5.3kHz,6.9kHz,9kHz,11.7kHz",UNUSED}, - {F_T_INT,GS(eq_hw_band4_gain),LANG_EQUALIZER_BAND_GAIN,INT(0), + {F_T_INT,&global_settings.eq_hw_band4_gain,LANG_EQUALIZER_BAND_GAIN,INT(0), "eq hardware band 4 gain",NULL,UNUSED}, #endif OFFON_SETTING(0,hold_lr_for_scroll_in_list,-1,true, "hold_lr_for_scroll_in_list",NULL), - {F_T_INT,GS(show_path_in_browser),LANG_SHOW_PATH,INT(SHOW_PATH_OFF), + {F_T_INT,&global_settings.show_path_in_browser,LANG_SHOW_PATH,INT(SHOW_PATH_OFF), "show path in browser","off,current directory,full path",UNUSED}, #ifdef HAVE_AGC - {F_T_INT,GS(rec_agc_preset_mic),LANG_RECORD_AGC_PRESET,INT(1), + {F_T_INT,&global_settings.rec_agc_preset_mic,LANG_RECORD_AGC_PRESET,INT(1), "agc mic preset",NULL,UNUSED}, - {F_T_INT,GS(rec_agc_preset_line),LANG_RECORD_AGC_PRESET,INT(1), + {F_T_INT,&global_settings.rec_agc_preset_line,LANG_RECORD_AGC_PRESET,INT(1), "agc line preset",NULL,UNUSED}, - {F_T_INT,GS(rec_agc_maxgain_mic),-1,INT(104), + {F_T_INT,&global_settings.rec_agc_maxgain_mic,-1,INT(104), "agc maximum mic gain",NULL,UNUSED}, - {F_T_INT,GS(rec_agc_maxgain_line),-1,INT(96), + {F_T_INT,&global_settings.rec_agc_maxgain_line,-1,INT(96), "agc maximum line gain",NULL,UNUSED}, - {F_T_INT,GS(rec_agc_cliptime),LANG_RECORD_AGC_CLIPTIME,INT(1), + {F_T_INT,&global_settings.rec_agc_cliptime,LANG_RECORD_AGC_CLIPTIME,INT(1), "agc cliptime","0.2s,0.4s,0.6s,0.8,1s",UNUSED}, #endif #ifdef HAVE_REMOTE_LCD #ifdef HAS_REMOTE_BUTTON_HOLD - {F_T_INT,GS(remote_backlight_on_button_hold), + {F_T_INT,&global_settings.remote_backlight_on_button_hold, LANG_BACKLIGHT_ON_BUTTON_HOLD,INT(0), "remote backlight on button hold","normal,off,on",UNUSED}, #endif #endif #ifdef HAVE_HEADPHONE_DETECTION - {F_T_INT,GS(unplug_mode),LANG_UNPLUG,INT(0), + {F_T_INT,&global_settings.unplug_mode,LANG_UNPLUG,INT(0), "pause on headphone unplug",NULL,UNUSED}, - {F_T_INT,GS(unplug_rw),LANG_UNPLUG_RW,INT(0), + {F_T_INT,&global_settings.unplug_rw,LANG_UNPLUG_RW,INT(0), "rewind duration on pause",NULL,UNUSED}, OFFON_SETTING(0,unplug_autoresume,LANG_UNPLUG_DISABLE_AUTORESUME,false, "disable autoresume if phones not present",NULL), #endif #ifdef CONFIG_TUNER - {F_T_INT,GS(fm_region),LANG_FM_REGION,INT(0), + {F_T_INT,&global_settings.fm_region,LANG_FM_REGION,INT(0), "fm_region","eu,us,jp,kr",UNUSED}, #endif @@ -749,7 +752,7 @@ const struct settings_list settings[] = { false,"Last.fm Logging",NULL), #ifdef HAVE_RECORDING - {F_T_INT,GS(rec_trigger_type),LANG_RECORD_TRIGGER_TYPE, + {F_T_INT,&global_settings.rec_trigger_type,LANG_RECORD_TRIGGER_TYPE, INT(0),"trigger type","stop,pause,nf stp",UNUSED}, #endif