| @@ -130,6 +130,23 @@ static RtAudio::Api driverNameToApi(char const *driver) · 129 unmodified lines |
| 130 | 130 | return api; |
| 131 | 131 | } |
| 132 | 132 | |
| 133 | +static char const *apiToDriverName(RtAudio::Api api) |
| 134 | +{ |
| 135 | + static char const *drivers[] = { |
| 136 | + "unspecified", |
| 137 | + "ALSA", |
| 138 | + "Pulse", |
| 139 | + "OSS", |
| 140 | + "JACK", |
| 141 | + "MacOSXCore", |
| 142 | + "ASIO", |
| 143 | + "DS", |
| 144 | + "DUMMY", |
| 145 | + "Invalid" |
| 146 | + }; |
| 147 | + return drivers[(int) api]; |
| 148 | +} |
| 149 | + |
| 133 | 150 | //----------------------------------------------------------------------------- |
| 134 | 151 | // name: print() |
| 135 | 152 | // desc: ... |
| @@ -179,7 +196,8 @@ void print( const RtAudio::DeviceInfo & info ) · 43 unmodified lines |
| 179 | 196 | //----------------------------------------------------------------------------- |
| 180 | 197 | void ChuckAudio::probe(char const *driver) |
| 181 | 198 | { |
| 182 | | − RtAudio::Api api = driverNameToApi(driver); |
| 199 | + RtAudio::Api api = driverNameToApi(driver); // handles driver=NULL case |
| 200 | + char const *dnm = apiToDriverName(api); |
| 183 | 201 | // rtaduio pointer |
| 184 | 202 | RtAudio * audio = NULL; |
| 185 | 203 | // device info struct |
| @@ -190,13 +208,13 @@ void ChuckAudio::probe(char const *driver) · 4 unmodified lines |
| 190 | 208 | catch( RtAudioError err ) |
| 191 | 209 | { |
| 192 | 210 | // problem finding audio devices, most likely |
| 193 | | − EM_error2b( 0, "%s", err.getMessage().c_str() ); |
| 211 | + EM_error2b( 0, "%s: %s", dnm, err.getMessage().c_str() ); |
| 194 | 212 | return; |
| 195 | 213 | } |
| 196 | 214 | |
| 197 | 215 | // get count |
| 198 | 216 | int devices = audio->getDeviceCount(); |
| 199 | | − EM_error2b( 0, "found %d device(s) ...", devices ); |
| 217 | + EM_error2b( 0, "%s found %d device(s) ...", dnm, devices ); |
| 200 | 218 | |
| 201 | 219 | // reset -- what does this do |
| 202 | 220 | EM_reset_msg(); |
| @@ -235,16 +253,19 @@ void ChuckAudio::probe(char const *driver) · 32 unmodified lines |
| 235 | 253 | // desc: get device number by name; needs_dac/adc prompts further checks on |
| 236 | 254 | // requested device having > 0 channels |
| 237 | 255 | //----------------------------------------------------------------------------- |
| 238 | | −t_CKUINT ChuckAudio::device_named( const std::string & name, t_CKBOOL needs_dac, |
| 256 | +t_CKUINT ChuckAudio::device_named( char const *driver, |
| 257 | + const std::string & name, t_CKBOOL needs_dac, |
| 239 | 258 | t_CKBOOL needs_adc ) |
| 240 | 259 | { |
| 241 | 260 | // rtaudio pointer |
| 242 | 261 | RtAudio * audio = NULL; |
| 243 | 262 | // device info struct |
| 244 | 263 | RtAudio::DeviceInfo info; |
| 264 | + RtAudio::Api api = driverNameToApi(driver); // handles driver=NULL case |
| 265 | + char const *dnm = apiToDriverName(api); |
| 245 | 266 | |
| 246 | 267 | // allocate RtAudio |
| 247 | | − try { audio = new RtAudio(); } |
| 268 | + try { audio = new RtAudio(api); } |
| 248 | 269 | catch( RtAudioError err ) |
| 249 | 270 | { |
| 250 | 271 | // problem finding audio devices, most likely |
| @@ -469,15 +490,15 @@ t_CKBOOL ChuckAudio::watchdog_stop() · 218 unmodified lines |
| 469 | 490 | // name: initialize() |
| 470 | 491 | // desc: ... |
| 471 | 492 | //----------------------------------------------------------------------------- |
| 472 | | −t_CKBOOL ChuckAudio::initialize( t_CKUINT num_dac_channels, |
| 493 | +t_CKBOOL ChuckAudio::initialize( char const *driver, |
| 494 | + t_CKUINT num_dac_channels, |
| 473 | 495 | t_CKUINT num_adc_channels, |
| 474 | 496 | t_CKUINT sample_rate, |
| 475 | 497 | t_CKUINT buffer_size, |
| 476 | 498 | t_CKUINT num_buffers, |
| 477 | 499 | f_audio_cb callback, |
| 478 | 500 | void * data, |
| 479 | | − t_CKBOOL force_srate, |
| 480 | | − char const *driver ) |
| 501 | + t_CKBOOL force_srate ) |
| 481 | 502 | { |
| 482 | 503 | if( m_init ) |
| 483 | 504 | return FALSE; |
| @@ -506,11 +527,12 @@ t_CKBOOL ChuckAudio::initialize( t_CKUINT num_dac_channels, · 22 unmodified lines |
| 506 | 527 | |
| 507 | 528 | // allocate RtAudio |
| 508 | 529 | RtAudio::Api api = driverNameToApi(driver); |
| 530 | + char const *dnm = apiToDriverName(api); |
| 509 | 531 | try { m_rtaudio = new RtAudio(api); } |
| 510 | 532 | catch( RtAudioError err ) |
| 511 | 533 | { |
| 512 | 534 | // problem finding audio devices, most likely |
| 513 | | − EM_error2( 0, "%s", err.getMessage().c_str() ); |
| 535 | + EM_error2( 0, "%s: %s", dnm, err.getMessage().c_str() ); |
| 514 | 536 | // clean up |
| 515 | 537 | goto error; |
| 516 | 538 | } |
| @@ -735,8 +757,8 @@ t_CKBOOL ChuckAudio::initialize( t_CKUINT num_dac_channels, · 218 unmodified lines |
| 735 | 757 | // open device |
| 736 | 758 | try { |
| 737 | 759 | // log |
| 738 | | − EM_log( CK_LOG_FINE, "trying %d input %d output...", |
| 739 | | − m_num_channels_in, m_num_channels_out ); |
| 760 | + EM_log( CK_LOG_FINE, "%s trying %d input %d output...", |
| 761 | + dnm, m_num_channels_in, m_num_channels_out ); |
| 740 | 762 | |
| 741 | 763 | RtAudio::StreamParameters output_parameters; |
| 742 | 764 | output_parameters.deviceId = m_dac_n; |
| @@ -763,8 +785,8 @@ t_CKBOOL ChuckAudio::initialize( t_CKUINT num_dac_channels, · 20 unmodified lines |
| 763 | 785 | &stream_options ); |
| 764 | 786 | } catch( RtAudioError err ) { |
| 765 | 787 | // log |
| 766 | | − EM_log( CK_LOG_INFO, "exception caught: '%s'...", err.getMessage().c_str() ); |
| 767 | | − EM_error2( 0, "%s", err.getMessage().c_str() ); |
| 788 | + EM_log( CK_LOG_INFO, "%s exception caught: '%s'...", dnm, err.getMessage().c_str() ); |
| 789 | + EM_error2( 0, "%s: %s", dnm, err.getMessage().c_str() ); |
| 768 | 790 | SAFE_DELETE( m_rtaudio ); |
| 769 | 791 | // clean up |
| 770 | 792 | goto error; |