Mercurial > hg > beaglert
comparison core/RTAudio.cpp @ 373:3bed6b09223c prerelease
Updated NE10 library to the latest version; needs a corresponding update to the /usr/include/ne10 header files on the SD image. Updated examples to compile against new version, and reordered D-Box channels to account for new PRU-based DAC channel reordering.
author | andrewm |
---|---|
date | Thu, 09 Jun 2016 20:03:09 +0100 |
parents | ff5f346a293e |
children | a0698d523a6a |
comparison
equal
deleted
inserted
replaced
372:db2fe4e1b88e | 373:3bed6b09223c |
---|---|
150 return -1; | 150 return -1; |
151 } | 151 } |
152 } | 152 } |
153 | 153 |
154 // Limit the analog channels to sane values | 154 // Limit the analog channels to sane values |
155 if(settings->numAnalogChannels >= 8) | 155 if(settings->numAnalogChannels != 2 |
156 settings->numAnalogChannels = 8; | 156 && settings->numAnalogChannels != 4 |
157 else if(settings->numAnalogChannels >= 4) | 157 && settings->numAnalogChannels != 8) { |
158 settings->numAnalogChannels = 4; | 158 cout << "Invalid number of analog channels: " << settings->numAnalogChannels << ". Valid values are 2, 4, 8.\n"; |
159 else | 159 return -1; |
160 settings->numAnalogChannels = 2; | 160 } |
161 | 161 |
162 // Initialise the rendering environment: sample rates, frame counts, numbers of channels | 162 // Initialise the rendering environment: sample rates, frame counts, numbers of channels |
163 gContext.audioSampleRate = 44100.0; | 163 gContext.audioSampleRate = 44100.0; |
164 gContext.audioChannels = 2; | 164 gContext.audioChannels = 2; |
165 | 165 |