aboutsummaryrefslogtreecommitdiff
path: root/src/modules/systemlib/mixer/mixer.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/systemlib/mixer/mixer.h')
-rw-r--r--src/modules/systemlib/mixer/mixer.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/systemlib/mixer/mixer.h b/src/modules/systemlib/mixer/mixer.h
index 67ef521b4..119068301 100644
--- a/src/modules/systemlib/mixer/mixer.h
+++ b/src/modules/systemlib/mixer/mixer.h
@@ -174,7 +174,7 @@ public:
* @param space The number of available entries in the output array;
* @return The number of entries in the output array that were populated.
*/
- virtual unsigned mix(float *outputs, unsigned space) = 0;
+ virtual unsigned mix(float *outputs, unsigned space, uint16_t *status_reg) = 0;
/**
* Analyses the mix configuration and updates a bitmask of groups
@@ -250,7 +250,7 @@ public:
MixerGroup(ControlCallback control_cb, uintptr_t cb_handle);
~MixerGroup();
- virtual unsigned mix(float *outputs, unsigned space);
+ virtual unsigned mix(float *outputs, unsigned space, uint16_t *status_reg);
virtual void groups_required(uint32_t &groups);
/**
@@ -346,7 +346,7 @@ public:
*/
static NullMixer *from_text(const char *buf, unsigned &buflen);
- virtual unsigned mix(float *outputs, unsigned space);
+ virtual unsigned mix(float *outputs, unsigned space, uint16_t *status_reg);
virtual void groups_required(uint32_t &groups);
};
@@ -411,7 +411,7 @@ public:
uint16_t mid,
uint16_t max);
- virtual unsigned mix(float *outputs, unsigned space);
+ virtual unsigned mix(float *outputs, unsigned space, uint16_t *status_reg);
virtual void groups_required(uint32_t &groups);
/**
@@ -515,7 +515,7 @@ public:
const char *buf,
unsigned &buflen);
- virtual unsigned mix(float *outputs, unsigned space);
+ virtual unsigned mix(float *outputs, unsigned space, uint16_t *status_reg);
virtual void groups_required(uint32_t &groups);
private: