forked from PAWPAW-Mirror/lib_xua
resolve conflicts
This commit is contained in:
@@ -1255,7 +1255,7 @@
|
||||
#endif
|
||||
|
||||
#if (XUA_SYNCMODE == XUA_SYNCMODE_SYNC)
|
||||
#if (XUA_SPDIF_RX_EN|| ADAT_RX)
|
||||
#if (XUA_SPDIF_RX_EN|| XUA_ADAT_RX_EN)
|
||||
#error "Digital input streams not supported in Sync mode"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -235,7 +235,23 @@ void clockGen ( streaming chanend ?c_spdif_rx,
|
||||
unsigned tmp;
|
||||
|
||||
/* Start in no-SMUX (8-channel) mode */
|
||||
int smux = 0;
|
||||
int smux;
|
||||
// Initialise smux based based on the DEFAULT_FREQ
|
||||
if(DEFAULT_FREQ < 88200)
|
||||
{
|
||||
/* No SMUX */
|
||||
smux = 0;
|
||||
}
|
||||
else if(DEFAULT_FREQ < 176400)
|
||||
{
|
||||
/* SMUX */
|
||||
smux = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* SMUX II */
|
||||
smux = 2;
|
||||
}
|
||||
|
||||
#ifdef LEVEL_METER_LEDS
|
||||
timer t_level;
|
||||
|
||||
Reference in New Issue
Block a user