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

Input level data order now same order as mixer inputs (previously stream and input channels reversed)

Browse Source
This commit is contained in:
Ross Owen
2014-08-29 16:30:25 +01:00
parent abd6522273
commit 08f8d4e37d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module_usb_audio/endpoint0/audiorequests.xc
View File

@@ -916,11 +916,11 @@ int AudioClassRequests_2(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c
for(int i = 0; i < (NUM_USB_CHAN_IN + NUM_USB_CHAN_OUT); i++) for(int i = 0; i < (NUM_USB_CHAN_IN + NUM_USB_CHAN_OUT); i++)
{ {
/* Get the level and truncate to 16-bit */ /* Get the level and truncate to 16-bit */
if(i < NUM_USB_CHAN_IN) if(i < NUM_USB_CHAN_OUT)
{ {
if (!isnull(c_mix_ctl)) if (!isnull(c_mix_ctl))
{ {
outuint(c_mix_ctl, GET_INPUT_LEVELS); outuint(c_mix_ctl, GET_STREAM_LEVELS);
outuint(c_mix_ctl, i); outuint(c_mix_ctl, i);
outct(c_mix_ctl, XS1_CT_END); outct(c_mix_ctl, XS1_CT_END);
storeShort(buffer, i*2, (inuint(c_mix_ctl) >> 15)); storeShort(buffer, i*2, (inuint(c_mix_ctl) >> 15));
@@ -935,8 +935,8 @@ int AudioClassRequests_2(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c
{ {
if (!isnull(c_mix_ctl)) if (!isnull(c_mix_ctl))
{ {
outuint(c_mix_ctl, GET_STREAM_LEVELS); outuint(c_mix_ctl, GET_INPUT_LEVELS);
outuint(c_mix_ctl, (i - NUM_USB_CHAN_IN)); outuint(c_mix_ctl, (i - NUM_USB_CHAN_OUT));
outct(c_mix_ctl, XS1_CT_END); outct(c_mix_ctl, XS1_CT_END);
storeShort(buffer, i*2, (inuint(c_mix_ctl) >> 15)); storeShort(buffer, i*2, (inuint(c_mix_ctl) >> 15));
chkct(c_mix_ctl, XS1_CT_END); chkct(c_mix_ctl, XS1_CT_END);