commit 9c99834f24fba894c2a282e2cea337589e015cac
parent 1b1b068389662881b48efd088ca8f361f52719c4
Author: falkTX <falktx@gmail.com>
Date: Tue, 18 Nov 2014 01:49:55 +0000
Misc
Diffstat:
4 files changed, 22 insertions(+), 32 deletions(-)
diff --git a/dgl/App.hpp b/dgl/App.hpp
@@ -50,7 +50,7 @@ public:
/**
Idle function.
- This calls all this app Windows' idle functions and idle callbacks.
+ This runs the application event-loop once.
*/
void idle();
@@ -69,7 +69,7 @@ public:
/**
Check if the application is about to quit.
- Returning true means there's no event-loop running at the moment.
+ Returning true means there's no event-loop running at the moment (or it's just about to stop).
*/
bool isQuiting() const noexcept;
diff --git a/dgl/Base.hpp b/dgl/Base.hpp
@@ -127,6 +127,16 @@ enum Char {
};
/**
+ Keyboard modifier flags.
+ */
+enum Modifier {
+ MODIFIER_SHIFT = 1 << 0, /**< Shift key */
+ MODIFIER_CTRL = 1 << 1, /**< Control key */
+ MODIFIER_ALT = 1 << 2, /**< Alt/Option key */
+ MODIFIER_SUPER = 1 << 3 /**< Mod4/Command/Windows key */
+};
+
+/**
Special (non-Unicode) keyboard keys.
*/
enum Key {
@@ -157,16 +167,6 @@ enum Key {
KEY_SUPER
};
-/**
- Keyboard modifier flags.
- */
-enum Modifier {
- MODIFIER_SHIFT = 1 << 0, /**< Shift key */
- MODIFIER_CTRL = 1 << 1, /**< Control key */
- MODIFIER_ALT = 1 << 2, /**< Alt/Option key */
- MODIFIER_SUPER = 1 << 3 /**< Mod4/Command/Windows key */
-};
-
// -----------------------------------------------------------------------
// Base DGL classes
diff --git a/distrho/DistrhoUtils.hpp b/distrho/DistrhoUtils.hpp
@@ -32,17 +32,13 @@
#if defined(DISTRHO_OS_MAC) && ! defined(CARLA_OS_MAC)
namespace std {
-inline float
- fmin(float __x, float __y)
+inline float fmin(float __x, float __y)
{ return __builtin_fminf(__x, __y); }
-inline float
- fmax(float __x, float __y)
+inline float fmax(float __x, float __y)
{ return __builtin_fmaxf(__x, __y); }
-inline float
- rint(float __x)
+inline float rint(float __x)
{ return __builtin_rintf(__x); }
-inline float
- round(float __x)
+inline float round(float __x)
{ return __builtin_roundf(__x); }
}
#endif
diff --git a/distrho/src/DistrhoDefines.h b/distrho/src/DistrhoDefines.h
@@ -118,23 +118,17 @@ private: \
#endif
/* Define namespace */
-#ifndef DISTRHO_NO_NAMESPACE
-# ifndef DISTRHO_NAMESPACE
-# define DISTRHO_NAMESPACE DISTRHO
-# endif
-# define START_NAMESPACE_DISTRHO namespace DISTRHO_NAMESPACE {
-# define END_NAMESPACE_DISTRHO }
-# define USE_NAMESPACE_DISTRHO using namespace DISTRHO_NAMESPACE;
-#else
-# define START_NAMESPACE_DISTRHO
-# define END_NAMESPACE_DISTRHO
-# define USE_NAMESPACE_DISTRHO
+#ifndef DISTRHO_NAMESPACE
+# define DISTRHO_NAMESPACE DISTRHO
#endif
+#define START_NAMESPACE_DISTRHO namespace DISTRHO_NAMESPACE {
+#define END_NAMESPACE_DISTRHO }
+#define USE_NAMESPACE_DISTRHO using namespace DISTRHO_NAMESPACE;
/* Useful typedefs */
typedef unsigned char uchar;
-typedef unsigned long int ulong;
typedef unsigned short int ushort;
typedef unsigned int uint;
+typedef unsigned long int ulong;
#endif // DISTRHO_DEFINES_H_INCLUDED