Showing the changes to src/host/chuck_main.cpp (1 of 3 files). Show all
Unified · Split
| @@ -848,7 +848,7 @@ bool go( int argc, const char ** argv ) · 847 unmodified lines | |||
| 848 | if( dac_name.size() > 0 ) | 848 | if( dac_name.size() > 0 ) |
| 849 | { | 849 | { |
| 850 | // check with RtAudio | 850 | // check with RtAudio |
| 851 | int dev = ChuckAudio::device_named( dac_name, TRUE, FALSE ); | 851 | int dev = ChuckAudio::device_named( audioDriver, dac_name, TRUE, FALSE ); |
| 852 | if( dev >= 0 ) | 852 | if( dev >= 0 ) |
| 853 | { | 853 | { |
| 854 | dac = dev; | 854 | dac = dev; |
| @@ -865,7 +865,7 @@ bool go( int argc, const char ** argv ) · 10 unmodified lines | |||
| 865 | if( adc_name.size() > 0 ) | 865 | if( adc_name.size() > 0 ) |
| 866 | { | 866 | { |
| 867 | // check with RtAudio | 867 | // check with RtAudio |
| 868 | int dev = ChuckAudio::device_named( adc_name, FALSE, TRUE ); | 868 | int dev = ChuckAudio::device_named( audioDriver, adc_name, FALSE, TRUE ); |
| 869 | if( dev >= 0 ) | 869 | if( dev >= 0 ) |
| 870 | { | 870 | { |
| 871 | adc = dev; | 871 | adc = dev; |
| @@ -921,9 +921,8 @@ bool go( int argc, const char ** argv ) · 49 unmodified lines | |||
| 921 | // TODO: refactor initialize() to take in the dac and adc nums | 921 | // TODO: refactor initialize() to take in the dac and adc nums |
| 922 | ChuckAudio::m_adc_n = adc; | 922 | ChuckAudio::m_adc_n = adc; |
| 923 | ChuckAudio::m_dac_n = dac; | 923 | ChuckAudio::m_dac_n = dac; |
| 924 | t_CKBOOL retval = ChuckAudio::initialize( dac_chans, adc_chans, | 924 | t_CKBOOL retval = ChuckAudio::initialize( audioDriver, dac_chans, adc_chans, |
| 925 | srate, buffer_size, num_buffers, cb, (void *)the_chuck, force_srate, | 925 | srate, buffer_size, num_buffers, cb, (void *)the_chuck, force_srate); |
| 926 | audioDriver ); | ||
| 927 | // check | 926 | // check |
| 928 | if( !retval ) | 927 | if( !retval ) |
| 929 | { | 928 | { |