diff options
| author | inmarket <andrewh@inmarket.com.au> | 2018-02-27 17:44:21 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2018-02-27 17:44:21 +1000 |
| commit | f265924396167729e8d9fb36a0383263f36c1270 (patch) | |
| tree | 28843eb24b18999cf0217ecb0fe935f133901066 /src/gaudio | |
| parent | 14786e97b618b8bc2a0ff1c732d45288fe550e33 (diff) | |
| download | uGFX-f265924396167729e8d9fb36a0383263f36c1270.tar.gz uGFX-f265924396167729e8d9fb36a0383263f36c1270.tar.bz2 uGFX-f265924396167729e8d9fb36a0383263f36c1270.zip | |
First set of V3 macro changes
Diffstat (limited to 'src/gaudio')
| -rw-r--r-- | src/gaudio/gaudio_options.h | 4 | ||||
| -rw-r--r-- | src/gaudio/gaudio_rules.h | 28 |
2 files changed, 16 insertions, 16 deletions
diff --git a/src/gaudio/gaudio_options.h b/src/gaudio/gaudio_options.h index d6dfb105..41373c8f 100644 --- a/src/gaudio/gaudio_options.h +++ b/src/gaudio/gaudio_options.h @@ -24,13 +24,13 @@ * @brief Audio Play capability is needed */ #ifndef GAUDIO_NEED_PLAY - #define GAUDIO_NEED_PLAY FALSE + #define GAUDIO_NEED_PLAY GFXOFF #endif /** * @brief Audio Recording capability is needed */ #ifndef GAUDIO_NEED_RECORD - #define GAUDIO_NEED_RECORD FALSE + #define GAUDIO_NEED_RECORD GFXOFF #endif /** * @} diff --git a/src/gaudio/gaudio_rules.h b/src/gaudio/gaudio_rules.h index 7ab587da..71b732b3 100644 --- a/src/gaudio/gaudio_rules.h +++ b/src/gaudio/gaudio_rules.h @@ -18,53 +18,53 @@ #if GFX_USE_GAUDIO #if !GAUDIO_NEED_PLAY && !GAUDIO_NEED_RECORD - #error "GAUDIO: GAUDIO_NEED_PLAY and/or GAUDIO_NEED_RECORD is required if GFX_USE_GAUDIO is TRUE" + #error "GAUDIO: GAUDIO_NEED_PLAY and/or GAUDIO_NEED_RECORD is required if GFX_USE_GAUDIO is GFXON" #endif #if !GFX_USE_GQUEUE #if GFX_DISPLAY_RULE_WARNINGS #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "GAUDIO: GFX_USE_GQUEUE is required if GFX_USE_GAUDIO is TRUE. It has been turned on for you." + #warning "GAUDIO: GFX_USE_GQUEUE is required if GFX_USE_GAUDIO is GFXON. It has been turned on for you." #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("GAUDIO: GFX_USE_GQUEUE is required if GFX_USE_GAUDIO is TRUE. It has been turned on for you.") + COMPILER_WARNING("GAUDIO: GFX_USE_GQUEUE is required if GFX_USE_GAUDIO is GFXON. It has been turned on for you.") #endif #endif #undef GFX_USE_GQUEUE - #define GFX_USE_GQUEUE TRUE + #define GFX_USE_GQUEUE GFXON #endif #if GAUDIO_NEED_PLAY && !GQUEUE_NEED_ASYNC #if GFX_DISPLAY_RULE_WARNINGS #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "GAUDIO: GQUEUE_NEED_ASYNC is required if GAUDIO_NEED_PLAY is TRUE. It has been turned on for you." + #warning "GAUDIO: GQUEUE_NEED_ASYNC is required if GAUDIO_NEED_PLAY is GFXON. It has been turned on for you." #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("GAUDIO: GQUEUE_NEED_ASYNC is required if GAUDIO_NEED_PLAY is TRUE. It has been turned on for you.") + COMPILER_WARNING("GAUDIO: GQUEUE_NEED_ASYNC is required if GAUDIO_NEED_PLAY is GFXON. It has been turned on for you.") #endif #endif #undef GQUEUE_NEED_ASYNC - #define GQUEUE_NEED_ASYNC TRUE + #define GQUEUE_NEED_ASYNC GFXON #endif #if !GQUEUE_NEED_GSYNC || !GQUEUE_NEED_BUFFERS #if GFX_DISPLAY_RULE_WARNINGS #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "GAUDIO: GQUEUE_NEED_BUFFERS and GQUEUE_NEED_GSYNC are required if GFX_USE_GAUDIO is TRUE. They have been turned on for you." + #warning "GAUDIO: GQUEUE_NEED_BUFFERS and GQUEUE_NEED_GSYNC are required if GFX_USE_GAUDIO is GFXON. They have been turned on for you." #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("GAUDIO: GQUEUE_NEED_BUFFERS and GQUEUE_NEED_GSYNC are required if GFX_USE_GAUDIO is TRUE. They have been turned on for you.") + COMPILER_WARNING("GAUDIO: GQUEUE_NEED_BUFFERS and GQUEUE_NEED_GSYNC are required if GFX_USE_GAUDIO is GFXON. They have been turned on for you.") #endif #endif #undef GQUEUE_NEED_BUFFERS - #define GQUEUE_NEED_BUFFERS TRUE + #define GQUEUE_NEED_BUFFERS GFXON #undef GQUEUE_NEED_GSYNC - #define GQUEUE_NEED_GSYNC TRUE + #define GQUEUE_NEED_GSYNC GFXON #endif #if GFX_USE_GEVENT && !GFX_USE_GTIMER #if GFX_DISPLAY_RULE_WARNINGS #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "GAUDIO: GFX_USE_GTIMER is required if GFX_USE_GAUDIO and GFX_USE_GEVENT are TRUE. It has been turned on for you." + #warning "GAUDIO: GFX_USE_GTIMER is required if GFX_USE_GAUDIO and GFX_USE_GEVENT are GFXON. It has been turned on for you." #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("GAUDIO: GFX_USE_GTIMER is required if GFX_USE_GAUDIO and GFX_USE_GEVENT are TRUE. It has been turned on for you.") + COMPILER_WARNING("GAUDIO: GFX_USE_GTIMER is required if GFX_USE_GAUDIO and GFX_USE_GEVENT are GFXON. It has been turned on for you.") #endif #endif #undef GFX_USE_GTIMER - #define GFX_USE_GTIMER TRUE + #define GFX_USE_GTIMER GFXON #endif #endif |