Stephen's patch reversed for now, so we csn tst Win32 registery/resize issues separately

git-svn-id: https://svn.code.sf.net/p/freetel/code@1597 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/fdmdv2/src/fdmdv2_main.cpp b/fdmdv2/src/fdmdv2_main.cpp
index 74e76957f7d264a4c09b41b4c26744d923ae3356..c69ca678490f2d45ff422f69790e81fa358e4611 100644 (file)
--- a/fdmdv2/src/fdmdv2_main.cpp
+++ b/fdmdv2/src/fdmdv2_main.cpp
@@ -1987,26 +1987,16 @@ void MainFrame::stopRxStream()
         m_txRxThread->Wait();
         wxLogDebug("thread stopped");
 
-        m_rxInPa->stop();
-        m_rxInPa->streamClose();
-        delete m_rxInPa;
-        if(m_rxOutPa != m_rxInPa) {
-                       m_rxOutPa->stop();
-                       m_rxOutPa->streamClose();
-                       delete m_rxOutPa;
-               }
+        m_rxPa->stop();
+        m_rxPa->streamClose();
 
         if (g_nSoundCards == 2) {
-            m_txInPa->stop();
-            m_txInPa->streamClose();
-            delete m_txInPa;
-            if(m_txInPa != m_txOutPa) {
-                               m_txOutPa->stop();
-                               m_txOutPa->streamClose();
-                               delete m_txOutPa;
-                       }
+            m_txPa->stop();
+            m_txPa->streamClose();
+            delete m_txPa;
         }
 
+        delete m_rxPa;
         destroy_fifos();
         destroy_src();
         deleteEQFilters(g_rxUserdata);
@@ -2042,22 +2032,18 @@ void  MainFrame::initPortAudioDevice(PortAudioWrap *pa, int inDevice, int outDev
     // init input params
 
     pa->setInputDevice(inDevice);
-    if(inDevice != paNoDevice) {
-               pa->setInputChannelCount(inputChannels);           // stereo input
-               pa->setInputSampleFormat(PA_SAMPLE_TYPE);
-               pa->setInputLatency(pa->getInputDefaultLowLatency());
-               pa->setInputHostApiStreamInfo(NULL);
-       }
+    pa->setInputChannelCount(inputChannels);           // stereo input
+    pa->setInputSampleFormat(PA_SAMPLE_TYPE);
+    pa->setInputLatency(pa->getInputDefaultLowLatency());
+    pa->setInputHostApiStreamInfo(NULL);
 
     // init output params
 
-       pa->setOutputDevice(outDevice);
-       if(outDevice != paNoDevice) {
-               pa->setOutputChannelCount(2);                      // stereo output
-               pa->setOutputSampleFormat(PA_SAMPLE_TYPE);
-               pa->setOutputLatency(pa->getOutputDefaultLowLatency());
-               pa->setOutputHostApiStreamInfo(NULL);
-       }
+    pa->setOutputDevice(outDevice);
+    pa->setOutputChannelCount(2);                      // stereo output
+    pa->setOutputSampleFormat(PA_SAMPLE_TYPE);
+    pa->setOutputLatency(pa->getOutputDefaultLowLatency());
+    pa->setOutputHostApiStreamInfo(NULL);
 
     // init params that affect input and output
 
@@ -2080,8 +2066,6 @@ void MainFrame::startRxStream()
     int   src_error;
     const PaDeviceInfo *deviceInfo1 = NULL, *deviceInfo2 = NULL;
     int   inputChannels1, inputChannels2;
-    bool  two_rx=false;
-    bool  two_tx=false;
 
     if(!m_RxRunning) {
         m_RxRunning = true;
@@ -2091,22 +2075,11 @@ void MainFrame::startRxStream()
             wxMessageBox(wxT("Port Audio failed to initialize"), wxT("Pa_Initialize"), wxOK);
         }
 
-        m_rxInPa = new PortAudioWrap();
-        if(g_soundCard1InDeviceNum != g_soundCard1OutDeviceNum)
-                       two_rx=true;
-        if(g_soundCard2InDeviceNum != g_soundCard2OutDeviceNum)
-                       two_tx=true;
-        
-        if(two_rx)
-                       m_rxOutPa = new PortAudioWrap();
-               else
-                       m_rxOutPa = m_rxInPa;
+        m_rxPa = new PortAudioWrap();
 
         if (g_nSoundCards == 0) {
             wxMessageBox(wxT("No Sound Cards configured, use Tools - Audio Config to configure"), wxT("Error"), wxOK);
-            delete m_rxInPa;
-            if(two_rx)
-                               delete m_rxOutPa;
+            delete m_rxPa;
             m_RxRunning = false;
             return;
         }
@@ -2114,12 +2087,10 @@ void MainFrame::startRxStream()
         // Init Sound card 1 ----------------------------------------------
         // sanity check on sound card device numbers
 
-        if ((m_rxInPa->getDeviceCount() <= g_soundCard1InDeviceNum) ||
-            (m_rxOutPa->getDeviceCount() <= g_soundCard1OutDeviceNum)) {
+        if ((m_rxPa->getDeviceCount() <= g_soundCard1InDeviceNum) ||
+            (m_rxPa->getDeviceCount() <= g_soundCard1OutDeviceNum)) {
             wxMessageBox(wxT("Sound Card 1 not present"), wxT("Error"), wxOK);
-            delete m_rxInPa;
-            if(two_rx)
-                               delete m_rxOutPa;
+            delete m_rxPa;
             m_RxRunning = false;
             return;
         }
@@ -2129,9 +2100,7 @@ void MainFrame::startRxStream()
         deviceInfo1 = Pa_GetDeviceInfo(g_soundCard1InDeviceNum);
         if (deviceInfo1 == NULL) {
             wxMessageBox(wxT("Couldn't get device info from Port Audio for Sound Card 1"), wxT("Error"), wxOK);
-            delete m_rxInPa;
-            if(two_rx)
-                               delete m_rxOutPa;
+            delete m_rxPa;
             m_RxRunning = false;
             return;
         }
@@ -2140,41 +2109,26 @@ void MainFrame::startRxStream()
         else
             inputChannels1 = 2;
 
-        if(two_rx) {
-            initPortAudioDevice(m_rxInPa, g_soundCard1InDeviceNum, paNoDevice, 1,
-                            g_soundCard1SampleRate, inputChannels1);
-            initPortAudioDevice(m_rxOutPa, paNoDevice, g_soundCard1OutDeviceNum, 1,
-                            g_soundCard1SampleRate, inputChannels1);
-               }
-        else
-            initPortAudioDevice(m_rxInPa, g_soundCard1InDeviceNum, g_soundCard1OutDeviceNum, 1,
+        initPortAudioDevice(m_rxPa, g_soundCard1InDeviceNum, g_soundCard1OutDeviceNum, 1,
                             g_soundCard1SampleRate, inputChannels1);
 
         // Init Sound Card 2 ------------------------------------------------
 
         if (g_nSoundCards == 2) {
 
-            m_txInPa = new PortAudioWrap();
-            if(two_tx)
-                               m_txOutPa = new PortAudioWrap();
-                       else
-                               m_txOutPa = m_txInPa;
+            m_txPa = new PortAudioWrap();
 
             // sanity check on sound card device numbers
 
-            //printf("m_txInPa->getDeviceCount(): %d\n", m_txInPa->getDeviceCount());
+            //printf("m_txPa->getDeviceCount(): %d\n", m_txPa->getDeviceCount());
             //printf("g_soundCard2InDeviceNum: %d\n", g_soundCard2InDeviceNum);
             //printf("g_soundCard2OutDeviceNum: %d\n", g_soundCard2OutDeviceNum);
 
-            if ((m_txInPa->getDeviceCount() <= g_soundCard2InDeviceNum) ||
-                (m_txOutPa->getDeviceCount() <= g_soundCard2OutDeviceNum)) {
+            if ((m_txPa->getDeviceCount() <= g_soundCard2InDeviceNum) ||
+                (m_txPa->getDeviceCount() <= g_soundCard2OutDeviceNum)) {
                 wxMessageBox(wxT("Sound Card 2 not present"), wxT("Error"), wxOK);
-                delete m_rxInPa;
-                if(two_rx)
-                                       delete m_rxOutPa;
-                delete m_txInPa;
-                if(two_tx)
-                                       delete m_txOutPa;
+                delete m_rxPa;
+                delete m_txPa;
                 m_RxRunning = false;
                 return;
             }
@@ -2182,12 +2136,7 @@ void MainFrame::startRxStream()
             deviceInfo2 = Pa_GetDeviceInfo(g_soundCard2InDeviceNum);
             if (deviceInfo2 == NULL) {
                 wxMessageBox(wxT("Couldn't get device info from Port Audio for Sound Card 1"), wxT("Error"), wxOK);
-                delete m_rxInPa;
-                if(two_rx)
-                                       delete m_rxOutPa;
-                delete m_txInPa;
-                if(two_tx)
-                                       delete m_txOutPa;
+                delete m_rxPa;
                 m_RxRunning = false;
                 return;
             }
@@ -2196,14 +2145,7 @@ void MainFrame::startRxStream()
             else
                 inputChannels2 = 2;
 
-            if(two_tx) {
-                               initPortAudioDevice(m_txInPa, g_soundCard2InDeviceNum, paNoDevice, 2,
-                                g_soundCard2SampleRate, inputChannels2);
-                               initPortAudioDevice(m_txOutPa, paNoDevice, g_soundCard2OutDeviceNum, 2,
-                                g_soundCard2SampleRate, inputChannels2);
-                       }
-                       else
-                               initPortAudioDevice(m_txInPa, g_soundCard2InDeviceNum, g_soundCard2OutDeviceNum, 2,
+            initPortAudioDevice(m_txPa, g_soundCard2InDeviceNum, g_soundCard2OutDeviceNum, 2,
                                 g_soundCard2SampleRate, inputChannels2);
         }
 
@@ -2244,19 +2186,15 @@ void MainFrame::startRxStream()
 
         // Start sound card 1 ----------------------------------------------------------
 
-        m_rxInPa->setUserData(g_rxUserdata);
-        m_rxErr = m_rxInPa->setCallback(rxCallback);
+        m_rxPa->setUserData(g_rxUserdata);
+        m_rxErr = m_rxPa->setCallback(rxCallback);
 
-        m_rxErr = m_rxInPa->streamOpen();
+        m_rxErr = m_rxPa->streamOpen();
 
         if(m_rxErr != paNoError) {
             wxMessageBox(wxT("Sound Card 1 Open/Setup error."), wxT("Error"), wxOK);
-                       delete m_rxInPa;
-                       if(two_rx)
-                               delete m_rxOutPa;
-                       delete m_txInPa;
-                       if(two_tx)
-                               delete m_txOutPa;
+            delete m_rxPa;
+            delete m_txPa;
             destroy_fifos();
             destroy_src();
             deleteEQFilters(g_rxUserdata);
@@ -2265,15 +2203,11 @@ void MainFrame::startRxStream()
             return;
         }
 
-        m_rxErr = m_rxInPa->streamStart();
+        m_rxErr = m_rxPa->streamStart();
         if(m_rxErr != paNoError) {
             wxMessageBox(wxT("Sound Card 1 Stream Start Error."), wxT("Error"), wxOK);
-                       delete m_rxInPa;
-                       if(two_rx)
-                               delete m_rxOutPa;
-                       delete m_txInPa;
-                       if(two_tx)
-                               delete m_txOutPa;
+            delete m_rxPa;
+            delete m_txPa;
             destroy_fifos();
             destroy_src();
             deleteEQFilters(g_rxUserdata);
@@ -2282,48 +2216,6 @@ void MainFrame::startRxStream()
             return;
         }
 
-               // Start separate output stream if needed
-
-               if(two_rx) {
-                       m_rxOutPa->setUserData(g_rxUserdata);
-                       m_rxErr = m_rxOutPa->setCallback(rxCallback);
-
-                       m_rxErr = m_rxOutPa->streamOpen();
-
-                       if(m_rxErr != paNoError) {
-                               wxMessageBox(wxT("Sound Card 1 Second Stream Open/Setup error."), wxT("Error"), wxOK);
-                               delete m_rxInPa;
-                               delete m_rxOutPa;
-                               delete m_txOutPa;
-                               if(two_tx)
-                                       delete m_txOutPa;
-                               destroy_fifos();
-                               destroy_src();
-                               deleteEQFilters(g_rxUserdata);
-                               delete g_rxUserdata;
-                               m_RxRunning = false;
-                               return;
-                       }
-
-                       m_rxErr = m_rxOutPa->streamStart();
-                       if(m_rxErr != paNoError) {
-                               wxMessageBox(wxT("Sound Card 1 Second Stream Start Error."), wxT("Error"), wxOK);
-                               m_rxInPa->stop();
-                               m_rxInPa->streamClose();
-                               delete m_rxInPa;
-                               delete m_rxOutPa;
-                               delete m_txOutPa;
-                               if(two_tx)
-                                       delete m_txOutPa;
-                               destroy_fifos();
-                               destroy_src();
-                               deleteEQFilters(g_rxUserdata);
-                               delete g_rxUserdata;
-                               m_RxRunning = false;
-                               return;
-                       }
-               }
-
         // Start sound card 2 ----------------------------------------------------------
 
         if (g_nSoundCards == 2) {
@@ -2333,24 +2225,16 @@ void MainFrame::startRxStream()
             // chance of them both being called at the same time?  We
             // could need a mutex ...
 
-            m_txInPa->setUserData(g_rxUserdata);
-            m_txErr = m_txInPa->setCallback(txCallback);
-            m_txErr = m_txInPa->streamOpen();
+            m_txPa->setUserData(g_rxUserdata);
+            m_txErr = m_txPa->setCallback(txCallback);
+            m_txErr = m_txPa->streamOpen();
 
             if(m_txErr != paNoError) {
-fprintf(stderr, "Err: %d\n", m_txErr);
                 wxMessageBox(wxT("Sound Card 2 Open/Setup error."), wxT("Error"), wxOK);
-                m_rxInPa->stop();
-                m_rxInPa->streamClose();
-                delete m_rxInPa;
-                if(two_rx) {
-                                       m_rxOutPa->stop();
-                                       m_rxOutPa->streamClose();
-                                       delete m_rxOutPa;
-                               }
-                delete m_txInPa;
-                if(two_tx)
-                                       delete m_txOutPa;
+                m_rxPa->stop();
+                m_rxPa->streamClose();
+                delete m_rxPa;
+                delete m_txPa;
                 destroy_fifos();
                 destroy_src();
                 deleteEQFilters(g_rxUserdata);
@@ -2358,20 +2242,13 @@ fprintf(stderr, "Err: %d\n", m_txErr);
                 m_RxRunning = false;
                 return;
             }
-            m_txErr = m_txInPa->streamStart();
+            m_txErr = m_txPa->streamStart();
             if(m_txErr != paNoError) {
                 wxMessageBox(wxT("Sound Card 2 Start Error."), wxT("Error"), wxOK);
-                m_rxInPa->stop();
-                m_rxInPa->streamClose();
-                delete m_rxInPa;
-                if(two_rx) {
-                                       m_rxOutPa->stop();
-                                       m_rxOutPa->streamClose();
-                                       delete m_rxOutPa;
-                               }
-                delete m_txInPa;
-                if(two_tx)
-                                       delete m_txOutPa;
+                m_rxPa->stop();
+                m_rxPa->streamClose();
+                delete m_rxPa;
+                delete m_txPa;
                 destroy_fifos();
                 destroy_src();
                 deleteEQFilters(g_rxUserdata);
@@ -2379,63 +2256,6 @@ fprintf(stderr, "Err: %d\n", m_txErr);
                 m_RxRunning = false;
                 return;
             }
-               // Start separate output stream if needed
-
-                       if (two_tx) {
-
-                               // question: can we use same callback data
-                               // (g_rxUserdata)or both sound card callbacks?  Is there a
-                               // chance of them both being called at the same time?  We
-                               // could need a mutex ...
-
-                               m_txOutPa->setUserData(g_rxUserdata);
-                               m_txErr = m_txOutPa->setCallback(txCallback);
-                               m_txErr = m_txOutPa->streamOpen();
-
-                               if(m_txErr != paNoError) {
-                                       wxMessageBox(wxT("Sound Card 2 Second Stream Open/Setup error."), wxT("Error"), wxOK);
-                                       m_rxInPa->stop();
-                                       m_rxInPa->streamClose();
-                                       delete m_rxInPa;
-                                       if(two_rx) {
-                                               m_rxOutPa->stop();
-                                               m_rxOutPa->streamClose();
-                                               delete m_rxOutPa;
-                                       }
-                                       m_txInPa->stop();
-                                       m_txInPa->streamClose();
-                                       delete m_txInPa;
-                                       delete m_txOutPa;
-                                       destroy_fifos();
-                                       destroy_src();
-                                       deleteEQFilters(g_rxUserdata);
-                                       delete g_rxUserdata;
-                                       m_RxRunning = false;
-                                       return;
-                               }
-                               m_txErr = m_txOutPa->streamStart();
-                               if(m_txErr != paNoError) {
-                                       wxMessageBox(wxT("Sound Card 2 Second Stream Start Error."), wxT("Error"), wxOK);
-                                       m_rxInPa->stop();
-                                       m_rxInPa->streamClose();
-                                       m_txInPa->stop();
-                                       m_txInPa->streamClose();
-                                       delete m_txInPa;
-                                       if(two_rx) {
-                                               m_rxOutPa->stop();
-                                               m_rxOutPa->streamClose();
-                                               delete m_rxOutPa;
-                                       }
-                                       delete m_txInPa;
-                                       delete m_txOutPa;
-                                       destroy_fifos();
-                                       destroy_src();
-                                       deleteEQFilters(g_rxUserdata);
-                                       delete g_rxUserdata;
-                                       m_RxRunning = false;
-                                       return;
-                               }
-                       }
         }
 
         // start tx/rx processing thread
@@ -2851,39 +2671,35 @@ int MainFrame::rxCallback(
 
     assert(framesPerBuffer < MAX_FPB);
 
-       if(rptr) {
-               for(i = 0; i < framesPerBuffer; i++, rptr += cbData->inputChannels1)
-               {
-                       indata[i] = *rptr;
-               }
-               if (fifo_write(cbData->infifo1, indata, framesPerBuffer)) {
-                       //wxLogDebug("infifo1 full\n");
-               }
-       }
+    for(i = 0; i < framesPerBuffer; i++, rptr += cbData->inputChannels1)
+    {
+        indata[i] = *rptr;
+    }
+    if (fifo_write(cbData->infifo1, indata, framesPerBuffer)) {
+        //wxLogDebug("infifo1 full\n");
+    }
 
     // OK now set up output samples for this callback
 
-       if(wptr) {
-               if (fifo_read(cbData->outfifo1, outdata, framesPerBuffer) == 0)
-               {
-                       // write signal to both channels */
-                       for(i = 0; i < framesPerBuffer; i++, wptr += 2)
-                       {
-                               wptr[0] = outdata[i];
-                               wptr[1] = outdata[i];
-                       }
-               }
-               else
-               {
-                       //wxLogDebug("outfifo1 empty\n");
-                       // zero output if no data available
-                       for(i = 0; i < framesPerBuffer; i++, wptr += 2)
-                       {
-                               wptr[0] = 0;
-                               wptr[1] = 0;
-                       }
-               }
-       }
+    if (fifo_read(cbData->outfifo1, outdata, framesPerBuffer) == 0)
+    {
+        // write signal to both channels */
+        for(i = 0; i < framesPerBuffer; i++, wptr += 2)
+        {
+            wptr[0] = outdata[i];
+            wptr[1] = outdata[i];
+        }
+    }
+    else
+    {
+        //wxLogDebug("outfifo1 empty\n");
+        // zero output if no data available
+        for(i = 0; i < framesPerBuffer; i++, wptr += 2)
+        {
+            wptr[0] = 0;
+            wptr[1] = 0;
+        }
+    }
 
     return paContinue;
 }
@@ -3398,51 +3214,43 @@ int MainFrame::txCallback(
 
     assert(framesPerBuffer < MAX_FPB);
 
-       if(rptr) {
-               for(i = 0; i < framesPerBuffer; i++, rptr += cbData->inputChannels2)
-               {
-                       indata[i] = *rptr;
-               }
-       }
+    for(i = 0; i < framesPerBuffer; i++, rptr += cbData->inputChannels2)
+    {
+        indata[i] = *rptr;
+    }
 
     //#define SC2_LOOPBACK
 #ifdef SC2_LOOPBACK
-       //TODO: This doesn't work unless using the same soundcard!
 
-       if(wptr) {
-               for(i = 0; i < framesPerBuffer; i++, wptr += 2)
-               {
-                       wptr[0] = indata[i];
-                       wptr[1] = indata[i];
-               }
-       }
+    for(i = 0; i < framesPerBuffer; i++, wptr += 2)
+    {
+        wptr[0] = indata[i];
+        wptr[1] = indata[i];
+    }
 
 #else
-       if(rptr)
-               fifo_write(cbData->infifo2, indata, framesPerBuffer);
+    fifo_write(cbData->infifo2, indata, framesPerBuffer);
 
     // OK now set up output samples for this callback
 
-       if(wptr) {
-               if (fifo_read(cbData->outfifo2, outdata, framesPerBuffer) == 0)
-               {
-                       // write signal to both channels */
-                       for(i = 0; i < framesPerBuffer; i++, wptr += 2)
-                       {
-                               wptr[0] = outdata[i];
-                               wptr[1] = outdata[i];
-                       }
-               }
-               else
-               {
-                       // zero output if no data available
-                       for(i = 0; i < framesPerBuffer; i++, wptr += 2)
-                       {
-                               wptr[0] = 0;
-                               wptr[1] = 0;
-                       }
-               }
-       }
+    if (fifo_read(cbData->outfifo2, outdata, framesPerBuffer) == 0)
+    {
+        // write signal to both channels */
+        for(i = 0; i < framesPerBuffer; i++, wptr += 2)
+        {
+            wptr[0] = outdata[i];
+            wptr[1] = outdata[i];
+        }
+    }
+    else
+    {
+        // zero output if no data available
+        for(i = 0; i < framesPerBuffer; i++, wptr += 2)
+        {
+            wptr[0] = 0;
+            wptr[1] = 0;
+        }
+    }
 #endif
     return paContinue;
 }

diff --git a/fdmdv2/src/fdmdv2_main.h b/fdmdv2/src/fdmdv2_main.h
index 8d75427eadfa1373a82b8c4a39693a8efd9c50d4..c6bf349a6d8a5c80bb6b23bb4306a35d3b50ddcd 100644 (file)
--- a/fdmdv2/src/fdmdv2_main.h
+++ b/fdmdv2/src/fdmdv2_main.h
@@ -336,10 +336,8 @@ class MainFrame : public TopFrame
 
         bool                    m_RxRunning;
 
-        PortAudioWrap           *m_rxInPa;
-        PortAudioWrap           *m_rxOutPa;
-        PortAudioWrap           *m_txInPa;
-        PortAudioWrap           *m_txOutPa;
+        PortAudioWrap           *m_rxPa;
+        PortAudioWrap           *m_txPa;
 
         PaError                 m_rxErr;
         PaError                 m_txErr;

diff --git a/fdmdv2/src/fdmdv2_pa_wrapper.cpp b/fdmdv2/src/fdmdv2_pa_wrapper.cpp
index 08120873d673b95ce01a830bf2aa677f4501c730..97a58fc3cb6c437395ba3574521e69baa47b3673 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.device == paNoDevice ? NULL : &m_inputBuffer,
-                            m_outputBuffer.device == paNoDevice ? NULL : &m_outputBuffer,
+                            &m_inputBuffer,
+                            &m_outputBuffer,
                             m_samplerate,
                             m_framesPerBuffer,
                             m_statusFlags,