diff include/RTAudio.h @ 34:46d87f680da5 matrix_gpio

Merged bbb_network and the so-called "matrix_gpio" branches

--- a/include/RTAudio.h	Mon May 11 18:58:47 2015 +0100
+++ b/include/RTAudio.h	Mon May 11 19:50:48 2015 +0100
@@ -13,7 +13,7 @@
 
 #ifndef RTAUDIO_H_
 #define RTAUDIO_H_
-
+#include "RTAudioSettings.h"
 #include "render.h"
 
 // Useful constants
@@ -29,33 +29,11 @@
 #define DEFAULT_DAC_LEVEL	0.0
 #define DEFAULT_ADC_LEVEL	-6.0
 #define DEFAULT_HP_LEVEL	-6.0
-#define MAX_PRU_FILENAME_LENGTH 256
 
 enum {
 	kAmplifierMutePin = 61	// P8-26 controls amplifier mute
 };
 
-// Structure which contains initialisation parameters for the
-// real-time audio system
-typedef struct {
-	// These items might be adjusted by the user:
-	int periodSize;			// Number of (analog) frames per period; audio is twice this
-	int beginMuted;			// Whether to begin with the speakers muted
-	float dacLevel;			// Level for the audio DAC output
-	float adcLevel;			// Level for the audio ADC input
-	float headphoneLevel;	// Level for the headphone output
-	int useAnalog;			// Whether to use the analog
-	int useDigital;		// Whether to use the 16 programmable GPIOs
-	int numAnalogChannels;	// How many channels for the ADC and DAC
-	int numDigitalChannels;	// How many channels for the GPIOs
-	int verbose;			// Whether to use verbose logging
-	char pruFilename[MAX_PRU_FILENAME_LENGTH]; //the external .bin file to load. If empty will use PRU code from pru_rtaudio_bin.h
-	// These items are hardware-dependent and should only be changed
-	// to run on different hardware
-	int codecI2CAddress;	// Where the codec can be found on the I2C bus
-	int ampMutePin;			// Pin where amplifier mute can be found
-} RTAudioSettings;
-
 typedef void* AuxiliaryTask;	// Opaque data type to keep track of aux tasks
 
 // Flag that indicates when the audio will stop; can be read or