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_menu.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_menu.c')
-rw-r--r-- | apps/settings_menu.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index bbbeca3683..a614723ca5 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -54,7 +54,7 @@ | |||
54 | #include "peakmeter.h" | 54 | #include "peakmeter.h" |
55 | #endif | 55 | #endif |
56 | #include "lang.h" | 56 | #include "lang.h" |
57 | #if CONFIG_HWCODEC == MAS3507D | 57 | #if CONFIG_CODEC == MAS3507D |
58 | void dac_line_in(bool enable); | 58 | void dac_line_in(bool enable); |
59 | #endif | 59 | #endif |
60 | #ifdef HAVE_ALARM_MOD | 60 | #ifdef HAVE_ALARM_MOD |
@@ -65,7 +65,7 @@ void dac_line_in(bool enable); | |||
65 | #include "lcd-remote.h" | 65 | #include "lcd-remote.h" |
66 | #endif | 66 | #endif |
67 | 67 | ||
68 | #if CONFIG_HWCODEC == MASNONE | 68 | #if CONFIG_CODEC == SWCODEC |
69 | #include "pcmbuf.h" | 69 | #include "pcmbuf.h" |
70 | #include "pcm_playback.h" | 70 | #include "pcm_playback.h" |
71 | #include "dsp.h" | 71 | #include "dsp.h" |
@@ -879,7 +879,7 @@ static bool poweroff(void) | |||
879 | #endif /* HAVE_ATA_POWEROFF */ | 879 | #endif /* HAVE_ATA_POWEROFF */ |
880 | #endif /* !HAVE_MMC */ | 880 | #endif /* !HAVE_MMC */ |
881 | 881 | ||
882 | #if CONFIG_HWCODEC == MAS3507D | 882 | #if CONFIG_CODEC == MAS3507D |
883 | static bool line_in(void) | 883 | static bool line_in(void) |
884 | { | 884 | { |
885 | bool rc = set_bool(str(LANG_LINE_IN), &global_settings.line_in); | 885 | bool rc = set_bool(str(LANG_LINE_IN), &global_settings.line_in); |
@@ -902,7 +902,7 @@ static bool max_files_in_playlist(void) | |||
902 | NULL, 1000, 1000, 20000, NULL ); | 902 | NULL, 1000, 1000, 20000, NULL ); |
903 | } | 903 | } |
904 | 904 | ||
905 | #if CONFIG_HWCODEC == MASNONE | 905 | #if CONFIG_CODEC == SWCODEC |
906 | static bool buffer_margin(void) | 906 | static bool buffer_margin(void) |
907 | { | 907 | { |
908 | int ret; | 908 | int ret; |
@@ -1111,7 +1111,7 @@ static bool id3_order(void) | |||
1111 | mpeg_id3_options); | 1111 | mpeg_id3_options); |
1112 | } | 1112 | } |
1113 | 1113 | ||
1114 | #if CONFIG_HWCODEC == MASNONE | 1114 | #if CONFIG_CODEC == SWCODEC |
1115 | static bool crossfade(void) | 1115 | static bool crossfade(void) |
1116 | { | 1116 | { |
1117 | static const struct opt_items names[] = { | 1117 | static const struct opt_items names[] = { |
@@ -1172,7 +1172,7 @@ static bool runtimedb(void) | |||
1172 | return rc; | 1172 | return rc; |
1173 | } | 1173 | } |
1174 | 1174 | ||
1175 | #if CONFIG_HWCODEC == MASNONE | 1175 | #if CONFIG_CODEC == SWCODEC |
1176 | static bool replaygain(void) | 1176 | static bool replaygain(void) |
1177 | { | 1177 | { |
1178 | bool result = set_bool(str(LANG_REPLAYGAIN_ENABLE), | 1178 | bool result = set_bool(str(LANG_REPLAYGAIN_ENABLE), |
@@ -1270,7 +1270,7 @@ static bool playback_settings_menu(void) | |||
1270 | { ID2P(LANG_WIND_MENU), ff_rewind_settings_menu }, | 1270 | { ID2P(LANG_WIND_MENU), ff_rewind_settings_menu }, |
1271 | { ID2P(LANG_MP3BUFFER_MARGIN), buffer_margin }, | 1271 | { ID2P(LANG_MP3BUFFER_MARGIN), buffer_margin }, |
1272 | { ID2P(LANG_FADE_ON_STOP), set_fade_on_stop }, | 1272 | { ID2P(LANG_FADE_ON_STOP), set_fade_on_stop }, |
1273 | #if CONFIG_HWCODEC == MASNONE | 1273 | #if CONFIG_CODEC == SWCODEC |
1274 | { ID2P(LANG_CROSSFADE), crossfade }, | 1274 | { ID2P(LANG_CROSSFADE), crossfade }, |
1275 | { ID2P(LANG_CROSSFADE_DURATION), crossfade_duration }, | 1275 | { ID2P(LANG_CROSSFADE_DURATION), crossfade_duration }, |
1276 | { ID2P(LANG_REPLAYGAIN), replaygain_settings_menu }, | 1276 | { ID2P(LANG_REPLAYGAIN), replaygain_settings_menu }, |
@@ -1654,7 +1654,7 @@ static bool system_settings_menu(void) | |||
1654 | { ID2P(LANG_ALARM_MOD_ALARM_MENU), alarm_screen }, | 1654 | { ID2P(LANG_ALARM_MOD_ALARM_MENU), alarm_screen }, |
1655 | #endif | 1655 | #endif |
1656 | { ID2P(LANG_LIMITS_MENU), limits_settings_menu }, | 1656 | { ID2P(LANG_LIMITS_MENU), limits_settings_menu }, |
1657 | #if CONFIG_HWCODEC == MAS3507D | 1657 | #if CONFIG_CODEC == MAS3507D |
1658 | { ID2P(LANG_LINE_IN), line_in }, | 1658 | { ID2P(LANG_LINE_IN), line_in }, |
1659 | #endif | 1659 | #endif |
1660 | #ifdef HAVE_CHARGING | 1660 | #ifdef HAVE_CHARGING |