From: drowe67 Date: Mon, 26 May 2014 21:21:17 +0000 (+0000) Subject: Stephen's indep sound card selection logic and setting min size X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=b0b71ddf3f7e659ee1529575e572543ad2815f71;p=freetel-svn-tracking.git Stephen's indep sound card selection logic and setting min size git-svn-id: https://svn.code.sf.net/p/freetel/code@1596 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/fdmdv2/src/fdmdv2_main.h b/fdmdv2/src/fdmdv2_main.h index c6bf349a..8d75427e 100644 --- a/fdmdv2/src/fdmdv2_main.h +++ b/fdmdv2/src/fdmdv2_main.h @@ -336,8 +336,10 @@ class MainFrame : public TopFrame bool m_RxRunning; - PortAudioWrap *m_rxPa; - PortAudioWrap *m_txPa; + PortAudioWrap *m_rxInPa; + PortAudioWrap *m_rxOutPa; + PortAudioWrap *m_txInPa; + PortAudioWrap *m_txOutPa; PaError m_rxErr; PaError m_txErr; diff --git a/fdmdv2/src/fdmdv2_pa_wrapper.cpp b/fdmdv2/src/fdmdv2_pa_wrapper.cpp index 97a58fc3..08120873 100644 --- a/fdmdv2/src/fdmdv2_pa_wrapper.cpp +++ b/fdmdv2/src/fdmdv2_pa_wrapper.cpp @@ -52,8 +52,8 @@ PaError PortAudioWrap::streamOpen() { return Pa_OpenStream( &m_pStream, - &m_inputBuffer, - &m_outputBuffer, + m_inputBuffer.device == paNoDevice ? NULL : &m_inputBuffer, + m_outputBuffer.device == paNoDevice ? NULL : &m_outputBuffer, m_samplerate, m_framesPerBuffer, m_statusFlags,