diff options
author | Jens Arnold <amiconn@rockbox.org> | 2005-08-29 21:15:27 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2005-08-29 21:15:27 +0000 |
commit | d6c054575b4561b4c657565ecb4ff82565fa6c78 (patch) | |
tree | c05a7f619a2580a8ae3ee29e863f076d1065c398 /apps/settings.c | |
parent | 99a0598c284471342fcda1fdcba90d4b666bfbb3 (diff) | |
download | rockbox-d6c054575b4561b4c657565ecb4ff82565fa6c78.tar.gz rockbox-d6c054575b4561b4c657565ecb4ff82565fa6c78.zip |
Renamed CONFIG_HWCODEC and MASNONE to the more appropriate CONFIG_CODEC and SWCODEC, respectively.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7416 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.c')
-rw-r--r-- | apps/settings.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/apps/settings.c b/apps/settings.c index 6fd2ec64bf..6649ce3f89 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -66,14 +66,14 @@ | |||
66 | #include "version.h" | 66 | #include "version.h" |
67 | #include "rtc.h" | 67 | #include "rtc.h" |
68 | #include "sound.h" | 68 | #include "sound.h" |
69 | #if CONFIG_HWCODEC == MAS3507D | 69 | #if CONFIG_CODEC == MAS3507D |
70 | void dac_line_in(bool enable); | 70 | void dac_line_in(bool enable); |
71 | #endif | 71 | #endif |
72 | struct user_settings global_settings; | 72 | struct user_settings global_settings; |
73 | #ifdef HAVE_RECORDING | 73 | #ifdef HAVE_RECORDING |
74 | const char rec_base_directory[] = REC_BASE_DIR; | 74 | const char rec_base_directory[] = REC_BASE_DIR; |
75 | #endif | 75 | #endif |
76 | #if CONFIG_HWCODEC == MASNONE | 76 | #if CONFIG_CODEC == SWCODEC |
77 | #include "pcmbuf.h" | 77 | #include "pcmbuf.h" |
78 | #include "pcm_playback.h" | 78 | #include "pcm_playback.h" |
79 | #endif | 79 | #endif |
@@ -183,14 +183,14 @@ static const struct bit_entry rtc_bits[] = | |||
183 | /* sound */ | 183 | /* sound */ |
184 | {7, S_O(volume), 70, "volume", NULL }, /* 0...100 */ | 184 | {7, S_O(volume), 70, "volume", NULL }, /* 0...100 */ |
185 | {8 | SIGNED, S_O(balance), 0, "balance", NULL }, /* -100...100 */ | 185 | {8 | SIGNED, S_O(balance), 0, "balance", NULL }, /* -100...100 */ |
186 | #if CONFIG_HWCODEC != MASNONE /* any MAS */ | 186 | #if CONFIG_CODEC != SWCODEC /* any MAS */ |
187 | {5 | SIGNED, S_O(bass), 0, "bass", NULL }, /* -15..+15 / -12..+12 */ | 187 | {5 | SIGNED, S_O(bass), 0, "bass", NULL }, /* -15..+15 / -12..+12 */ |
188 | {5 | SIGNED, S_O(treble), 0, "treble", NULL }, /* -15..+15 / -12..+12 */ | 188 | {5 | SIGNED, S_O(treble), 0, "treble", NULL }, /* -15..+15 / -12..+12 */ |
189 | #elif defined HAVE_UDA1380 | 189 | #elif defined HAVE_UDA1380 |
190 | {5, S_O(bass), 0, "bass", NULL }, /* 0..+24 */ | 190 | {5, S_O(bass), 0, "bass", NULL }, /* 0..+24 */ |
191 | {3, S_O(treble), 0, "treble", NULL }, /* 0..+6 */ | 191 | {3, S_O(treble), 0, "treble", NULL }, /* 0..+6 */ |
192 | #endif | 192 | #endif |
193 | #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) | 193 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
194 | {5, S_O(loudness), 0, "loudness", NULL }, /* 0...17 */ | 194 | {5, S_O(loudness), 0, "loudness", NULL }, /* 0...17 */ |
195 | {3, S_O(avc), 0, "auto volume", "off,20ms,2,4,8" }, | 195 | {3, S_O(avc), 0, "auto volume", "off,20ms,2,4,8" }, |
196 | {1, S_O(superbass), false, "superbass", off_on }, | 196 | {1, S_O(superbass), false, "superbass", off_on }, |
@@ -312,7 +312,7 @@ static const struct bit_entry hd_bits[] = | |||
312 | {4, S_O(ff_rewind_min_step), FF_REWIND_1000, | 312 | {4, S_O(ff_rewind_min_step), FF_REWIND_1000, |
313 | "scan min step", "1,2,3,4,5,6,8,10,15,20,25,30,45,60" }, | 313 | "scan min step", "1,2,3,4,5,6,8,10,15,20,25,30,45,60" }, |
314 | {4, S_O(ff_rewind_accel), 3, "scan accel", NULL }, | 314 | {4, S_O(ff_rewind_accel), 3, "scan accel", NULL }, |
315 | #if CONFIG_HWCODEC == MASNONE | 315 | #if CONFIG_CODEC == SWCODEC |
316 | {3, S_O(buffer_margin), 0, "antiskip", | 316 | {3, S_O(buffer_margin), 0, "antiskip", |
317 | "5s,15s,30s,1min,2min,3min,5min,10min" }, | 317 | "5s,15s,30s,1min,2min,3min,5min,10min" }, |
318 | #else | 318 | #else |
@@ -356,7 +356,7 @@ static const struct bit_entry hd_bits[] = | |||
356 | {7, S_O(peak_meter_min), 60, "peak meter min", NULL }, /* 0...100 */ | 356 | {7, S_O(peak_meter_min), 60, "peak meter min", NULL }, /* 0...100 */ |
357 | {7, S_O(peak_meter_max), 0, "peak meter max", NULL }, /* 0...100 */ | 357 | {7, S_O(peak_meter_max), 0, "peak meter max", NULL }, /* 0...100 */ |
358 | #endif | 358 | #endif |
359 | #if CONFIG_HWCODEC == MAS3587F | 359 | #if CONFIG_CODEC == MAS3587F |
360 | /* recording */ | 360 | /* recording */ |
361 | {1, S_O(rec_editable), false, "editable recordings", off_on }, | 361 | {1, S_O(rec_editable), false, "editable recordings", off_on }, |
362 | {4, S_O(rec_timesplit), 0, "rec timesplit", /* 0...15 */ | 362 | {4, S_O(rec_timesplit), 0, "rec timesplit", /* 0...15 */ |
@@ -376,14 +376,14 @@ static const struct bit_entry hd_bits[] = | |||
376 | {1, S_O(rec_directory), 0, /* rec_base_directory */ | 376 | {1, S_O(rec_directory), 0, /* rec_base_directory */ |
377 | "rec directory", REC_BASE_DIR ",current" }, | 377 | "rec directory", REC_BASE_DIR ",current" }, |
378 | #endif | 378 | #endif |
379 | #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) | 379 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
380 | {7, S_O(mdb_strength), 0, "mdb strength", NULL}, | 380 | {7, S_O(mdb_strength), 0, "mdb strength", NULL}, |
381 | {7, S_O(mdb_harmonics), 0, "mdb harmonics", NULL}, | 381 | {7, S_O(mdb_harmonics), 0, "mdb harmonics", NULL}, |
382 | {9, S_O(mdb_center), 0, "mdb center", NULL}, | 382 | {9, S_O(mdb_center), 0, "mdb center", NULL}, |
383 | {9, S_O(mdb_shape), 0, "mdb shape", NULL}, | 383 | {9, S_O(mdb_shape), 0, "mdb shape", NULL}, |
384 | {1, S_O(mdb_enable), 0, "mdb enable", off_on}, | 384 | {1, S_O(mdb_enable), 0, "mdb enable", off_on}, |
385 | #endif | 385 | #endif |
386 | #if CONFIG_HWCODEC == MAS3507D | 386 | #if CONFIG_CODEC == MAS3507D |
387 | {1, S_O(line_in), false, "line in", off_on }, | 387 | {1, S_O(line_in), false, "line in", off_on }, |
388 | #endif | 388 | #endif |
389 | /* voice */ | 389 | /* voice */ |
@@ -407,7 +407,7 @@ static const struct bit_entry hd_bits[] = | |||
407 | {4, S_O(rec_trigger_mode ), 1, "trigger mode", "off,no rearm,rearm"}, | 407 | {4, S_O(rec_trigger_mode ), 1, "trigger mode", "off,no rearm,rearm"}, |
408 | #endif | 408 | #endif |
409 | 409 | ||
410 | #if CONFIG_HWCODEC == MASNONE | 410 | #if CONFIG_CODEC == SWCODEC |
411 | {3, S_O(crossfade_duration), 0, "crossfade duration", "1s,2s,4s,6s,8s,10s,12s,14s"}, | 411 | {3, S_O(crossfade_duration), 0, "crossfade duration", "1s,2s,4s,6s,8s,10s,12s,14s"}, |
412 | #endif | 412 | #endif |
413 | 413 | ||
@@ -425,7 +425,7 @@ static const struct bit_entry hd_bits[] = | |||
425 | {1, S_O(next_folder), false, "move to next folder", off_on }, | 425 | {1, S_O(next_folder), false, "move to next folder", off_on }, |
426 | {1, S_O(runtimedb), false, "gather runtime data", off_on }, | 426 | {1, S_O(runtimedb), false, "gather runtime data", off_on }, |
427 | 427 | ||
428 | #if CONFIG_HWCODEC == MASNONE | 428 | #if CONFIG_CODEC == SWCODEC |
429 | {2, S_O(crossfade), 0, "crossfade type", "off,crossfade,mix"}, | 429 | {2, S_O(crossfade), 0, "crossfade type", "off,crossfade,mix"}, |
430 | {1, S_O(replaygain), false, "replaygain", off_on }, | 430 | {1, S_O(replaygain), false, "replaygain", off_on }, |
431 | {1, S_O(replaygain_track), false, "replaygain type", "track,album" }, | 431 | {1, S_O(replaygain_track), false, "replaygain type", "track,album" }, |
@@ -776,7 +776,7 @@ void sound_settings_apply(void) | |||
776 | sound_set(SOUND_VOLUME, global_settings.volume); | 776 | sound_set(SOUND_VOLUME, global_settings.volume); |
777 | sound_set(SOUND_CHANNELS, global_settings.channel_config); | 777 | sound_set(SOUND_CHANNELS, global_settings.channel_config); |
778 | sound_set(SOUND_STEREO_WIDTH, global_settings.stereo_width); | 778 | sound_set(SOUND_STEREO_WIDTH, global_settings.stereo_width); |
779 | #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) | 779 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
780 | sound_set(SOUND_LOUDNESS, global_settings.loudness); | 780 | sound_set(SOUND_LOUDNESS, global_settings.loudness); |
781 | sound_set(SOUND_AVC, global_settings.avc); | 781 | sound_set(SOUND_AVC, global_settings.avc); |
782 | sound_set(SOUND_MDB_STRENGTH, global_settings.mdb_strength); | 782 | sound_set(SOUND_MDB_STRENGTH, global_settings.mdb_strength); |
@@ -811,7 +811,7 @@ void settings_apply(void) | |||
811 | backlight_set_fade_out(global_settings.backlight_fade_out); | 811 | backlight_set_fade_out(global_settings.backlight_fade_out); |
812 | #endif | 812 | #endif |
813 | ata_spindown(global_settings.disk_spindown); | 813 | ata_spindown(global_settings.disk_spindown); |
814 | #if CONFIG_HWCODEC == MAS3507D | 814 | #if CONFIG_CODEC == MAS3507D |
815 | dac_line_in(global_settings.line_in); | 815 | dac_line_in(global_settings.line_in); |
816 | #endif | 816 | #endif |
817 | #ifdef HAVE_ATA_POWER_OFF | 817 | #ifdef HAVE_ATA_POWER_OFF |
@@ -872,7 +872,7 @@ void settings_apply(void) | |||
872 | talk_init(); /* use voice of same language */ | 872 | talk_init(); /* use voice of same language */ |
873 | } | 873 | } |
874 | 874 | ||
875 | #if CONFIG_HWCODEC == MASNONE | 875 | #if CONFIG_CODEC == SWCODEC |
876 | audio_set_crossfade(global_settings.crossfade); | 876 | audio_set_crossfade(global_settings.crossfade); |
877 | #endif | 877 | #endif |
878 | 878 | ||