laiyp/lib_xua
1
0
Fork 0
forked from PAWPAW-Mirror/lib_xua
Code Pull Requests Activity

Fixed build issue where OUT_VOLUME_IN_MIXER set to 0 (BUG #10692)

Browse Source
This commit is contained in:
Ross Owen
2014-01-22 11:39:43 +00:00
parent e82bae44ad
commit 61b857d5d4
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
module_usb_audio/mixer/mixer.xc
View File

@@ -10,12 +10,12 @@
#define FAST_MIXER 1 #define FAST_MIXER 1
#warning USING FAST MIXER #warning USING FAST MIXER
#ifdef OUT_VOLUME_IN_MIXER //#ifdef OUT_VOLUME_IN_MIXER
static unsigned int multOut_array[NUM_USB_CHAN_OUT + 1]; static unsigned int multOut_array[NUM_USB_CHAN_OUT + 1];
static xc_ptr multOut; static xc_ptr multOut;
#endif //#endif
#ifdef IN_VOLUME_IN_MIXER #ifdef IN_VOLUME_IN_MIXER
unsigned int multIn_array[NUM_USB_CHAN_IN + 1]; static unsigned int multIn_array[NUM_USB_CHAN_IN + 1];
static xc_ptr multIn; static xc_ptr multIn;
#endif #endif
@@ -636,11 +636,9 @@ void mixer(chanend c_mix_in, chanend c_mix_out, chanend c_mix_ctl)
multOut = array_to_xc_ptr((multOut_array,unsigned[])); multOut = array_to_xc_ptr((multOut_array,unsigned[]));
multIn = array_to_xc_ptr((multIn_array,unsigned[])); multIn = array_to_xc_ptr((multIn_array,unsigned[]));
samples = array_to_xc_ptr((samples_array,unsigned[])); samples = array_to_xc_ptr((samples_array,unsigned[]));
samples_to_host_map = samples_to_host_map = array_to_xc_ptr((samples_to_host_map_array,unsigned[]));
array_to_xc_ptr((samples_to_host_map_array,unsigned[]));
samples_to_device_map = samples_to_device_map = array_to_xc_ptr((samples_to_device_map_array,unsigned[]));
array_to_xc_ptr((samples_to_device_map_array,unsigned[]));
#if MAX_MIX_COUNT >0 #if MAX_MIX_COUNT >0
mix_mult = array_to_xc_ptr((mix_mult_array,unsigned[])); mix_mult = array_to_xc_ptr((mix_mult_array,unsigned[]));