Merge branch 'master' into 6V3_DEV

This commit is contained in:
Ross Owen
2013-12-04 12:31:28 +00:00
2 changed files with 11 additions and 5 deletions

View File

@@ -5,8 +5,10 @@
#include "devicedefines.h" #include "devicedefines.h"
#include "commands.h" #include "commands.h"
#include "SpdifReceive.h"
#if defined(SPDIF_RX)
#include "SpdifReceive.h"
#endif

View File

@@ -29,10 +29,14 @@
#endif #endif
#endif #endif
#if !defined (DSD_CHANS_DAC) #if defined(DSD_CHANS_DAC)
#define DSD_CHANS_DAC 0 #if defined(NATIVE_DSD) && (NATIVE_DSD == 0)
#else #undef NATIVE_DSD
#define NATIVE_DSD 1 /* Always enable Native DSD when DSD mode is enabled */ #else
#define NATIVE_DSD 1 /* Always enable Native DSD when DSD mode is enabled */
#endif
#else
#define DSD_CHANS_DAC 0
#endif #endif
/* Max supported sample freq for device */ /* Max supported sample freq for device */