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 c6bf349a6d8a5c80bb6b23bb4306a35d3b50ddcd..8d75427eadfa1373a82b8c4a39693a8efd9c50d4 100644 (file)
--- 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 97a58fc3cb6c437395ba3574521e69baa47b3673..08120873d673b95ce01a830bf2aa677f4501c730 100644 (file)
--- 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,