comparison include/Bela.h @ 539:b486344aa796 prerelease

merge
author Giulio Moro <giuliomoro@yahoo.it>
date Fri, 24 Jun 2016 01:43:53 +0100
parents bfcbeb437869
children ce391098f321
comparison
equal deleted inserted replaced
538:58652b93ef7e 539:b486344aa796
110 int periodSize; 110 int periodSize;
111 /// Whether to use the analog input and output 111 /// Whether to use the analog input and output
112 int useAnalog; 112 int useAnalog;
113 /// Whether to use the 16 programmable GPIOs 113 /// Whether to use the 16 programmable GPIOs
114 int useDigital; 114 int useDigital;
115 /// How many channels for the ADC and DAC 115 /// How many audio input channels
116 int numAnalogChannels; 116 int numAudioInChannels;
117 /// How many audio out channels
118 int numAudioOutChannels;
119 /// How many analog input channels
120 int numAnalogInChannels;
121 /// How many analog output channels
122 int numAnalogOutChannels;
117 /// How many channels for the GPIOs 123 /// How many channels for the GPIOs
118 int numDigitalChannels; 124 int numDigitalChannels;
119 125
120 /// Whether to begin with the speakers muted 126 /// Whether to begin with the speakers muted
121 int beginMuted; 127 int beginMuted;
204 /// \b Note: this element is available in render() only. 210 /// \b Note: this element is available in render() only.
205 uint32_t * const digital; 211 uint32_t * const digital;
206 212
207 /// Number of audio frames per period 213 /// Number of audio frames per period
208 const uint32_t audioFrames; 214 const uint32_t audioFrames;
209 /// Number of audio channels (currently always 2) 215 /// Number of input audio channels
210 const uint32_t audioChannels; 216 const uint32_t audioInChannels;
217 /// Number of output audio channels
218 const uint32_t audioOutChannels;
211 /// Audio sample rate in Hz (currently always 44100.0) 219 /// Audio sample rate in Hz (currently always 44100.0)
212 const float audioSampleRate; 220 const float audioSampleRate;
213 221
214 /// \brief Number of analog frames per period 222 /// \brief Number of analog frames per period
215 /// 223 ///
216 /// This will be 0 if analog I/O is disabled. 224 /// This will be 0 if analog I/O is disabled.
217 const uint32_t analogFrames; 225 const uint32_t analogFrames;
218 226
219 /// \brief Number of analog channels 227 /// \brief Number of input analog channels
220 /// 228 ///
221 /// This could take a value of 8, 4 or 2. This will be 0 if analog I/O is disabled. 229 /// This will be 0 if analog I/O is disabled.
222 const uint32_t analogChannels; 230 const uint32_t analogInChannels;
231
232 /// \brief Number of output analog channels
233 ///
234 /// This will be 0 if analog I/O is disabled.
235 const uint32_t analogOutChannels;
223 236
224 /// \brief Analog sample rate in Hz 237 /// \brief Analog sample rate in Hz
225 /// 238 ///
226 /// The analog sample rate depends on the number of analog channels used. If 239 /// The analog sample rate depends on the number of analog channels used. If
227 /// 8 channels are used, the sample rate is 22050. If 4 channels are used, the sample 240 /// 8 channels are used, the sample rate is 22050. If 4 channels are used, the sample