Re-adding back audio config channel

This commit is contained in:
Ross Owen
2014-03-25 12:26:35 +00:00
parent f582282a88
commit 93b5b47728

View File

@@ -343,6 +343,7 @@ void usb_audio_io(chanend c_aud_in, chanend ?c_adc
#ifdef MIXER #ifdef MIXER
, chanend c_mix_ctl , chanend c_mix_ctl
#endif #endif
, chanend ?c_aud_cfg
) )
{ {
#ifdef MIXER #ifdef MIXER
@@ -362,9 +363,9 @@ void usb_audio_io(chanend c_aud_in, chanend ?c_adc
{ {
thread_speed(); thread_speed();
#ifdef MIXER #ifdef MIXER
audio(c_mix_out, null, null, c_adc); audio(c_mix_out, null, c_aud_cfg, c_adc);
#else #else
audio(c_aud_in, null, null, c_adc); audio(c_aud_in, null, c_aud_cfg, c_adc);
#endif #endif
} }
} }
@@ -398,6 +399,12 @@ int main()
chan c_mix_ctl; chan c_mix_ctl;
#endif #endif
#ifdef AUDIO_CFG_CHAN
chan c_aud_cfg;
#else
#define c_aud_cfg null
#endif
USER_MAIN_DECLARATIONS USER_MAIN_DECLARATIONS
par par
@@ -418,6 +425,7 @@ int main()
#ifdef MIXER #ifdef MIXER
, c_mix_ctl , c_mix_ctl
#endif #endif
, c_aud_cfg
); );
#if defined(MIDI) && defined(IAP) && (IAP_TILE == MIDI_TILE) #if defined(MIDI) && defined(IAP) && (IAP_TILE == MIDI_TILE)