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

Deliver to/from mixer comms fixed up for new underflow protocol

Browse Source
This commit is contained in:
Ross Owen
2013-12-09 15:49:50 +00:00
parent 5c7366eec2
commit 1ce3c74ebc
1 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
module_usb_audio/audio.xc
View File

@@ -209,8 +209,8 @@ static inline void doI2SClocks(unsigned divide)
} }
else else
{ {
#ifndef MIXER // Interfaces straight to decouple()
underflow = inuint(c_out); underflow = inuint(c_out);
#ifndef MIXER // Interfaces straight to decouple()
#if NUM_USB_CHAN_IN > 0 #if NUM_USB_CHAN_IN > 0
#pragma loop unroll #pragma loop unroll
@@ -238,7 +238,18 @@ static inline void doI2SClocks(unsigned divide)
} }
} }
#endif #endif
#else #else /* ifndef MIXER */
if(underflow)
{
#pragma loop unroll
for(int i = 0; i < NUM_USB_CHAN_OUT; i++)
{
samplesOut[i] = underflowWord;
}
}
else
{
#pragma loop unroll #pragma loop unroll
for(int i = 0; i < NUM_USB_CHAN_OUT; i++) for(int i = 0; i < NUM_USB_CHAN_OUT; i++)
{ {
@@ -248,6 +259,7 @@ static inline void doI2SClocks(unsigned divide)
#endif #endif
samplesOut[i] = tmp; samplesOut[i] = tmp;
} }
}
#pragma loop unroll #pragma loop unroll
for(int i = 0; i < NUM_USB_CHAN_IN; i++) for(int i = 0; i < NUM_USB_CHAN_IN; i++)
@@ -387,8 +399,8 @@ static inline void doI2SClocks(unsigned divide)
} }
else else
{ {
#ifndef MIXER // Interfaces straight to decouple()
underflow = inuint(c_out); underflow = inuint(c_out);
#ifndef MIXER // Interfaces straight to decouple()
#if NUM_USB_CHAN_IN > 0 #if NUM_USB_CHAN_IN > 0
#pragma loop unroll #pragma loop unroll
for(int i = 0; i < NUM_USB_CHAN_IN; i++) for(int i = 0; i < NUM_USB_CHAN_IN; i++)
@@ -416,14 +428,25 @@ static inline void doI2SClocks(unsigned divide)
} }
#endif #endif
#else /* ifndef MIXER */ #else /* ifndef MIXER */
#pragma loop unroll
for(int i = 0; i < NUM_USB_CHAN_OUT; i++) if(underflow)
{
for(int i = 0; i < NUM_USB_CHAN_OUT; i++)
{
samplesOut[i] = underflowWord;
}
}
else
{ {
int tmp = inuint(c_out); #pragma loop unroll
for(int i = 0; i < NUM_USB_CHAN_OUT; i++)
{
int tmp = inuint(c_out);
#if defined(OUT_VOLUME_IN_MIXER) && defined(OUT_VOLUME_AFTER_MIX) #if defined(OUT_VOLUME_IN_MIXER) && defined(OUT_VOLUME_AFTER_MIX)
tmp<<=3; tmp<<=3;
#endif #endif
samplesOut[i] = tmp; samplesOut[i] = tmp;
}
} }
#pragma loop unroll #pragma loop unroll