--- linuxsampler/trunk/src/common/global.h 2007/10/11 18:53:29 1399 +++ linuxsampler/trunk/src/common/global.h 2007/10/14 22:00:17 1424 @@ -21,7 +21,8 @@ * MA 02111-1307 USA * ***************************************************************************/ -// All application global declarations are defined here. +// All application global declarations that HAVE to be exposed to the C++ +// API are defined here. #ifndef __LS_GLOBAL_H__ #define __LS_GLOBAL_H__ @@ -31,62 +32,7 @@ #include #include -#include - -#if HAVE_CONFIG_H -# include -#endif - -#if CONFIG_DEBUG_LEVEL > 0 -# define dmsg(debuglevel,x) if (CONFIG_DEBUG_LEVEL >= debuglevel) {printf x; fflush(stdout);} -#else -# define dmsg(debuglevel,x) -#endif // CONFIG_DEBUG_LEVEL > 0 - -#define EMMS __asm__ __volatile__ ("emms" ::: "st", "st(1)", "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)", "mm0", "mm1", "mm2", "mm3", "mm4", "mm5", "mm6", "mm7") - -/// defines globally the bit depth of used samples -typedef int16_t sample_t; typedef std::string String; -/** - * Whether a function / method call was successful, or if warnings or even an - * error occured. - */ -enum result_type_t { - result_type_success, - result_type_warning, - result_type_error -}; - -/** - * Used whenever a detailed description of the result of a function / method - * call is needed. - */ -struct result_t { - result_type_t type; ///< success, warning or error - int code; ///< warning or error code - String message; ///< detailed warning or error message -}; - -template inline String ToString(T o) { - std::stringstream ss; - ss << o; - return ss.str(); -} - -class Runnable { - public: - virtual ~Runnable() { } - virtual void Run() = 0; -}; - -extern double GLOBAL_VOLUME; - -// I read with some Linux kernel versions (between 2.4.18 and 2.4.21) -// sscanf() might be buggy regarding parsing of hex characters, so ... -int hexToNumber(char hex_digit); -int hexsToNumber(char hex_digit0, char hex_digit1 = '0'); - #endif // __LS_GLOBAL_H__