comparison include/Utilities.h @ 539:b486344aa796 prerelease

merge

 #endif /* OUTPUT */
 
 /** @} */
 
 /**
- * \ingroup wiring
+ * \cond BIT_FUNCTIONS
  *
  * @{
  */
 
 /// Set the given bit in \c word to 1.

 #define getBit(word,bit) 			(((word) >> (bit)) & 1)
 
 /// Set/clear the given bit in \c word to \c value.
 #define changeBit(word,bit,value) 	((clearBit((word),(bit))) | ((value) << (bit)))
 
-/** @} */
+/** @}
+ * \endcond
+ * */
 
 /**
  * \ingroup iofunctions
  *
  * @{

  * \param max_val Maximum possible value.
  * \return Constrained value.
  */
 static inline float constrain(float x, float min_val, float max_val);
 
+/**
+ * \brief Returns the maximum of two numbers
+ *
+ * Returns the maximum of two numbers
+ */
+static inline float min(float x, float y);
+
+/**
+ * \brief Returns the minimum of two numbers
+ *
+ * Returns the minimum of two numbers
+ */
+static inline float max(float x, float y);
+
 /** @} */
 // audioRead()
 //
 // Returns the value of the given audio input at the given frame number.
 static inline float audioRead(BelaContext *context, int frame, int channel) {
-	return context->audioIn[frame * context->audioChannels + channel];
+	return context->audioIn[frame * context->audioInChannels + channel];
 }
 
 // audioWrite()
 //
 // Sets a given audio output channel to a value for the current frame
 static inline void audioWrite(BelaContext *context, int frame, int channel, float value) {
-	context->audioOut[frame * context->audioChannels + channel] = value;
+	context->audioOut[frame * context->audioOutChannels + channel] = value;
 }
 
 // analogRead()
 //
 // Returns the value of the given analog input at the given frame number.
 static inline float analogRead(BelaContext *context, int frame, int channel) {
-	return context->analogIn[frame * context->analogChannels + channel];
+	return context->analogIn[frame * context->analogInChannels + channel];
 }
 
 // analogWrite()
 //
 // Sets a given analog output channel to a value for the current frame and, if persistent outputs are
 // enabled, for all subsequent frames
 static inline void analogWrite(BelaContext *context, int frame, int channel, float value) {
 	if(context->flags & BELA_FLAG_ANALOG_OUTPUTS_PERSIST) {
 		for(unsigned int f = frame; f < context->analogFrames; f++)
-			context->analogOut[frame * context->analogChannels + channel] = value;
+			context->analogOut[frame * context->analogOutChannels + channel] = value;
 	}
 	else
-		context->analogOut[frame * context->analogChannels + channel] = value;
+		context->analogOut[frame * context->analogOutChannels + channel] = value;
 }
 
 // analogWriteOnce()
 //
 // Sets a given channel to a value for only the current frame
 static inline void analogWriteOnce(BelaContext *context, int frame, int channel, float value) {
-	context->analogOut[frame * context->analogChannels + channel] = value;
+	context->analogOut[frame * context->analogOutChannels + channel] = value;
 }
 
 // digitalRead()
 //
 // Returns the value of a given digital input at the given frame number

 	if(x < min_val) return min_val;
 	if(x > max_val) return max_val;
 	return x;
 }
 
+static inline float max(float x, float y){
+	return x > y ? x : y;
+}
+
+static inline float min(float x, float y){
+	return x < y ? x : y;
+}
+
 #endif /* UTILITIES_H_ */