summaryrefslogtreecommitdiff
path: root/apps/main.c
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2005-08-29 21:15:27 +0000
committerJens Arnold <amiconn@rockbox.org>2005-08-29 21:15:27 +0000
commitd6c054575b4561b4c657565ecb4ff82565fa6c78 (patch)
treec05a7f619a2580a8ae3ee29e863f076d1065c398 /apps/main.c
parent99a0598c284471342fcda1fdcba90d4b666bfbb3 (diff)
downloadrockbox-d6c054575b4561b4c657565ecb4ff82565fa6c78.zip
rockbox-d6c054575b4561b4c657565ecb4ff82565fa6c78.tar.gz
rockbox-d6c054575b4561b4c657565ecb4ff82565fa6c78.tar.bz2
rockbox-d6c054575b4561b4c657565ecb4ff82565fa6c78.tar.xz
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/main.c')
-rw-r--r--apps/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/main.c b/apps/main.c
index 55897de..6373920 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -61,7 +61,7 @@
#include "misc.h"
#include "database.h"
-#if (CONFIG_HWCODEC == MASNONE)
+#if (CONFIG_CODEC == SWCODEC)
#include "pcmbuf.h"
#else
#define pcmbuf_init()
@@ -129,7 +129,7 @@ void init(void)
global_settings.mdb_enable,
global_settings.superbass);
button_clear_queue(); /* Empty the keyboard buffer */
-#if CONFIG_HWCODEC == MASNONE
+#if CONFIG_CODEC == SWCODEC
talk_init();
#endif
}
@@ -264,7 +264,7 @@ void init(void)
/* On software codec platforms we have to init audio before
calling audio_set_buffer_margin(). */
-#if (CONFIG_HWCODEC == MASNONE)
+#if (CONFIG_CODEC == SWCODEC)
audio_init();
#endif
settings_calc_config_sector();
@@ -291,7 +291,7 @@ void init(void)
global_settings.mdb_shape,
global_settings.mdb_enable,
global_settings.superbass);
-#if (CONFIG_HWCODEC == MASNONE)
+#if (CONFIG_CODEC == SWCODEC)
sound_settings_apply();
#else
audio_init();