From e455bf1dfa9ae8bcb5c82c4693709fea1ad7602c Mon Sep 17 00:00:00 2001 From: gw-chuck Date: Wed, 20 Aug 2008 21:24:38 +0000 Subject: [PATCH] *** empty log message *** --- v2/chuck_def.h | 5 +++++ v2/chuck_globals.cpp | 2 ++ v2/chuck_main.cpp | 4 +++- v2/ulib_std.cpp | 13 ++++++++++++ v2/util_raw.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 81 insertions(+), 1 deletion(-) diff --git a/v2/chuck_def.h b/v2/chuck_def.h index c15408d2..3750787d 100755 --- a/v2/chuck_def.h +++ b/v2/chuck_def.h @@ -155,6 +155,11 @@ typedef struct { SAMPLE re ; SAMPLE im ; } t_CKCOMPLEX_SAMPLE; #ifdef __CHIP_MODE__ #define __DISABLE_MIDI__ #define __DISABLE_SNDBUF__ +#define __DISABLE_WATCHDOG__ +#define __DISABLE_RAW__ +#define __DISABLE_KBHIT__ +#define __DISABLE_PROMPTER__ +#define __DISABLE_RTAUDIO__ #define __ALTER_HID__ #define __ALTER_ENTRY_POINT__ #define __STK_USE_SINGLE_PRECISION__ diff --git a/v2/chuck_globals.cpp b/v2/chuck_globals.cpp index 7020ff0f..2eaecb9e 100755 --- a/v2/chuck_globals.cpp +++ b/v2/chuck_globals.cpp @@ -91,8 +91,10 @@ extern "C" void all_detach() // close midi file handles midirw_detach(); #endif // __DISABLE_MIDI__ +#ifndef __DISABLE_KBHIT__ // shutdown kb loop KBHitManager::shutdown(); +#endif // __DISABLE_KBHIT__ #ifndef __ALTER_HID__ // shutdown HID HidInManager::cleanup(); diff --git a/v2/chuck_main.cpp b/v2/chuck_main.cpp index eab09fee..fdf7dda8 100755 --- a/v2/chuck_main.cpp +++ b/v2/chuck_main.cpp @@ -300,7 +300,9 @@ static void usage() string filename = ""; vector args; -#if defined(__MACOSX_CORE__) +#if defined(__DISABLE_WATCHDOG__) + do_watchdog = FALSE; +#elif defined(__MACOSX_CORE__) do_watchdog = TRUE; #elif defined(__PLATFORM_WIN32__) && !defined(__WINDOWS_PTHREAD__) do_watchdog = TRUE; diff --git a/v2/ulib_std.cpp b/v2/ulib_std.cpp index 2794c6a2..e1767854 100755 --- a/v2/ulib_std.cpp +++ b/v2/ulib_std.cpp @@ -65,6 +65,7 @@ int setenv( const char *n, const char *v, int i ) using namespace std; +#ifndef __DISABLE_KBHIT__ // KBHit CK_DLL_CTOR( KBHit_ctor ); CK_DLL_DTOR( KBHit_dtor ); @@ -77,7 +78,9 @@ CK_DLL_MFUN( KBHit_getchar ); CK_DLL_MFUN( KBHit_can_wait ); static t_CKUINT KBHit_offset_data = 0; +#endif // __DISABLE_KBHIT__ +#ifndef __DISABLE_PROMPTER__ // Skot functions CK_DLL_CTOR( Skot_ctor ); CK_DLL_DTOR( Skot_dtor ); @@ -88,6 +91,7 @@ CK_DLL_MFUN( Skot_getLine ); CK_DLL_MFUN( Skot_can_wait ); static t_CKUINT Skot_offset_data = 0; +#endif // __DISABLE_PROMPTER__ // StrTok functions CK_DLL_CTOR( StrTok_ctor ); @@ -253,6 +257,7 @@ DLL_QUERY libstd_query( Chuck_DL_Query * QUERY ) Chuck_DL_Func * func = NULL; +#ifndef __DISABLE_KBHIT__ // KBHit // begin class (KBHit) if( !type_engine_import_class_begin( env, "KBHit", "Event", @@ -297,11 +302,13 @@ DLL_QUERY libstd_query( Chuck_DL_Query * QUERY ) // start it KBHitManager::init(); +#endif // __DISABLE_KBHIT__ // register deprecate type_engine_register_deprecate( env, "Skot", "ConsoleInput" ); +#ifndef __DISABLE_PROMPTER__ // begin class (Skot) if( !type_engine_import_class_begin( env, "ConsoleInput", "Event", env->global(), Skot_ctor, @@ -335,6 +342,7 @@ DLL_QUERY libstd_query( Chuck_DL_Query * QUERY ) // end class type_engine_import_class_end( env ); +#endif // __DISABLE_PROMPTER__ // register deprecate @@ -725,6 +733,7 @@ CK_DLL_SFUN( dbtorms_impl ) +#ifndef __DISABLE_KBHIT__ // static CBufferAdvance * KBHitManager::the_buf = NULL; t_CKINT KBHitManager::the_onoff = 0; @@ -786,6 +795,7 @@ t_CKBOOL KBHitManager::init() the_thread = new XThread; the_thread->start( kb_loop, NULL ); + return TRUE; } @@ -1000,10 +1010,12 @@ CK_DLL_MFUN( KBHit_can_wait ) KBHit * kb = (KBHit *)(OBJ_MEMBER_INT(SELF, KBHit_offset_data)); RETURN->v_int = kb->empty(); } +#endif // __DISABLE_KBHIT__ +#ifndef __DISABLE_PROMPTER__ class LineEvent : public Chuck_Event { public: @@ -1198,6 +1210,7 @@ CK_DLL_MFUN( Skot_can_wait ) LineEvent * le = (LineEvent *)OBJ_MEMBER_INT(SELF, Skot_offset_data); RETURN->v_int = le->can_wait(); } +#endif // __DISABLE_PROMPTER__ // StrTok diff --git a/v2/util_raw.c b/v2/util_raw.c index ebd99a2e..4be4db95 100755 --- a/v2/util_raw.c +++ b/v2/util_raw.c @@ -32,6 +32,7 @@ //------------------------------------------------------------------------------ #include "util_raw.h" +#ifndef __DISABLE_RAW__ // data for ahh.raw... SAMPLE ahh_data[] = { @@ -4724,3 +4725,60 @@ SAMPLE glot_pop_data[] = { 0.0f, 0 }; t_CKUINT glot_pop_size = 521; + + +#else // __DISABLE_RAW__ + +// begin the abuse of memory +SAMPLE ahh_data[] = { 0.0f }; +SAMPLE britestk_data[] = { 0.0f }; +SAMPLE dope_data[] = { 0.0f }; +SAMPLE eee_data[] = { 0.0f }; +SAMPLE fwavblnk_data[] = { 0.0f }; +SAMPLE halfwave_data[] = { 0.0f }; +SAMPLE impuls10_data[] = { 0.0f }; +SAMPLE impuls20_data[] = { 0.0f }; +SAMPLE impuls40_data[] = { 0.0f }; +SAMPLE mand1_data[] = { 0.0f }; +SAMPLE mandpluk_data[] = { 0.0f }; +SAMPLE marmstk1_data[] = { 0.0f }; +SAMPLE ooo_data[] = { 0.0f }; +SAMPLE peksblnk_data[] = { 0.0f }; +SAMPLE ppksblnk_data[] = { 0.0f }; +SAMPLE silence_data[] = { 0.0f }; +SAMPLE sineblnk_data[] = { 0.0f }; +SAMPLE sinewave_data[] = { 0.0f }; +SAMPLE snglpeak_data[] = { 0.0f }; +SAMPLE twopeaks_data[] = { 0.0f }; +SAMPLE glot_ahh_data[] = { 0.0f }; +SAMPLE glot_eee_data[] = { 0.0f }; +SAMPLE glot_ooo_data[] = { 0.0f }; +SAMPLE glot_pop_data[] = { 0.0f }; + +t_CKUINT ahh_size = 1; +t_CKUINT britestk_size = 1; +t_CKUINT dope_size = 1; +t_CKUINT eee_size = 1; +t_CKUINT fwavblnk_size = 1; +t_CKUINT halfwave_size = 1; +t_CKUINT impuls10_size = 1; +t_CKUINT impuls20_size = 1; +t_CKUINT impuls40_size = 1; +t_CKUINT mand1_size = 1; +t_CKUINT mandpluk_size = 1; +t_CKUINT marmstk1_size = 1; +t_CKUINT ooo_size = 1; +t_CKUINT peksblnk_size = 1; +t_CKUINT ppksblnk_size = 1; +t_CKUINT silence_size = 1; +t_CKUINT sineblnk_size = 1; +t_CKUINT sinewave_size = 1; +t_CKUINT snglpeak_size = 1; +t_CKUINT twopeaks_size = 1; +t_CKUINT glot_ahh_size = 1; +t_CKUINT glot_eee_size = 1; +t_CKUINT glot_ooo_size = 1; +t_CKUINT glot_pop_size = 1; + + +#endif -- 2.11.4.GIT