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

MIXER now guarded by ifndef MIXER

Browse Source
This commit is contained in:
Ross Owen
2014-04-03 11:02:33 +01:00
parent 092569f76b
commit 7f7f71e085
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
module_usb_audio/devicedefines.h
View File

@@ -661,6 +661,11 @@ enum USBEndpointNumber_Out
#define ID_MIXER_1 60 #define ID_MIXER_1 60
/* Mixer defines */ /* Mixer defines */
#if defined(MIXER) && (MIXER == 0)
#undef MIXER
#endif
#ifndef MIX_INPUTS #ifndef MIX_INPUTS
#define MIX_INPUTS 18 #define MIX_INPUTS 18
#endif #endif
@@ -673,7 +678,6 @@ enum USBEndpointNumber_Out
#define MAX_MIX_COUNT 0 #define MAX_MIX_COUNT 0
#endif #endif
/* Volume defines */ /* Volume defines */
#ifndef MIN_VOLUME #ifndef MIN_VOLUME
@@ -780,6 +784,7 @@ enum USBEndpointNumber_Out
#undef FAST_MODE #undef FAST_MODE
#endif #endif
/* Default MIDI Rx port width */
#ifndef MIDI_RX_PORT_WIDTH #ifndef MIDI_RX_PORT_WIDTH
#define MIDI_RX_PORT_WIDTH 1 #define MIDI_RX_PORT_WIDTH 1
#endif #endif