--- libgig/trunk/src/gig.h	2017/05/10 21:17:10	3169
+++ libgig/trunk/src/gig.h	2017/05/14 17:08:42	3181
@@ -39,6 +39,8 @@
 #endif
 #if HAVE_RTTI
 # include <typeinfo>
+#else
+# warning No RTTI available!
 #endif
 
 #if WORDS_BIGENDIAN
@@ -113,7 +115,7 @@
 
     /** Standard types of sample loops.
      *
-     * @see countEnum(), enumKey(), enumKeys(), enumValue()
+     * @see enumCount(), enumKey(), enumKeys(), enumValue()
      */
     GIG_DECLARE_ENUM(loop_type_t,
         loop_type_normal        = 0x00000000,  ///< Loop forward (normal)
@@ -123,7 +125,7 @@
 
     /** Society of Motion Pictures and Television E time format.
      *
-     * @see countEnum(), enumKey(), enumKeys(), enumValue()
+     * @see enumCount(), enumKey(), enumKeys(), enumValue()
      */
     GIG_DECLARE_ENUM(smpte_format_t,
         smpte_format_no_offset          = 0x00000000,  ///< no SMPTE offset
@@ -135,7 +137,7 @@
 
     /** Defines the shape of a function graph.
      *
-     * @see countEnum(), enumKey(), enumKeys(), enumValue()
+     * @see enumCount(), enumKey(), enumKeys(), enumValue()
      */
     GIG_DECLARE_ENUM(curve_type_t,
         curve_type_nonlinear = 0,
@@ -146,7 +148,7 @@
 
     /** Dimensions allow to bypass one of the following controllers.
      *
-     * @see countEnum(), enumKey(), enumKeys(), enumValue()
+     * @see enumCount(), enumKey(), enumKeys(), enumValue()
      */
     GIG_DECLARE_ENUM(dim_bypass_ctrl_t,
         dim_bypass_ctrl_none,
@@ -156,7 +158,7 @@
 
     /** Defines how LFO3 is controlled by.
      *
-     * @see countEnum(), enumKey(), enumKeys(), enumValue()
+     * @see enumCount(), enumKey(), enumKeys(), enumValue()
      */
     GIG_DECLARE_ENUM(lfo3_ctrl_t,
         lfo3_ctrl_internal            = 0x00, ///< Only internally controlled.
@@ -168,7 +170,7 @@
 
     /** Defines how LFO2 is controlled by.
      *
-     * @see countEnum(), enumKey(), enumKeys(), enumValue()
+     * @see enumCount(), enumKey(), enumKeys(), enumValue()
      */
     GIG_DECLARE_ENUM(lfo2_ctrl_t,
         lfo2_ctrl_internal            = 0x00, ///< Only internally controlled.
@@ -180,7 +182,7 @@
 
     /** Defines how LFO1 is controlled by.
      *
-     * @see countEnum(), enumKey(), enumKeys(), enumValue()
+     * @see enumCount(), enumKey(), enumKeys(), enumValue()
      */
     GIG_DECLARE_ENUM(lfo1_ctrl_t,
         lfo1_ctrl_internal            = 0x00, ///< Only internally controlled.
@@ -192,7 +194,7 @@
 
     /** Defines how the filter cutoff frequency is controlled by.
      *
-     * @see countEnum(), enumKey(), enumKeys(), enumValue()
+     * @see enumCount(), enumKey(), enumKeys(), enumValue()
      */
     GIG_DECLARE_ENUM(vcf_cutoff_ctrl_t,
         vcf_cutoff_ctrl_none         = 0x00,
@@ -211,7 +213,7 @@
 
     /** Defines how the filter resonance is controlled by.
      *
-     * @see countEnum(), enumKey(), enumKeys(), enumValue()
+     * @see enumCount(), enumKey(), enumKeys(), enumValue()
      */
     GIG_DECLARE_ENUM(vcf_res_ctrl_t,
         vcf_res_ctrl_none        = 0xffffffff,
@@ -232,7 +234,7 @@
     struct leverage_ctrl_t {
         /** Defines possible controllers.
          *
-         * @see countEnum(), enumKey(), enumKeys(), enumValue()
+         * @see enumCount(), enumKey(), enumKeys(), enumValue()
          */
         GIG_DECLARE_ENUM(type_t,
             type_none              = 0x00, ///< No controller defined
@@ -275,7 +277,7 @@
      * to 32 zones (except the layer dimension with only up to 8 zones and
      * the samplechannel dimension which currently allows only 2 zones).
      *
-     * @see countEnum(), enumKey(), enumKeys(), enumValue()
+     * @see enumCount(), enumKey(), enumKeys(), enumValue()
      */
     GIG_DECLARE_ENUM(dimension_t,
         dimension_none              = 0x00, ///< Dimension not in use.
@@ -318,7 +320,7 @@
      * Intended for internal usage: will be used to convert a dimension value
      * into the corresponding dimension bit number.
      *
-     * @see countEnum(), enumKey(), enumKeys(), enumValue()
+     * @see enumCount(), enumKey(), enumKeys(), enumValue()
      */
     GIG_DECLARE_ENUM(split_type_t,
         split_type_normal,         ///< dimension value between 0-127
@@ -336,7 +338,7 @@
 
     /** Defines which frequencies are filtered by the VCF.
      *
-     * @see countEnum(), enumKey(), enumKeys(), enumValue()
+     * @see enumCount(), enumKey(), enumKeys(), enumValue()
      */
     GIG_DECLARE_ENUM(vcf_type_t,
         vcf_type_lowpass      = 0x00,
@@ -1368,16 +1370,16 @@
     };
 
 #if HAVE_RTTI
-    size_t countEnum(const std::type_info& type);
-    size_t countEnum(String typeName);
+    size_t enumCount(const std::type_info& type);
     const char* enumKey(const std::type_info& type, size_t value);
-    const char* enumKey(String typeName, size_t value);
     bool        enumKey(const std::type_info& type, String key);
-    bool        enumKey(String typeName, String key);
     const char** enumKeys(const std::type_info& type);
+#endif // HAVE_RTTI
+    size_t enumCount(String typeName);
+    const char* enumKey(String typeName, size_t value);
+    bool        enumKey(String typeName, String key);
     const char** enumKeys(String typeName);
     size_t enumValue(String key);
-#endif // HAVE_RTTI
 
     String libraryName();
     String libraryVersion();