diff --git a/main.cpp b/main.cpp index a28f1c686..0fd573ae5 100644 --- a/main.cpp +++ b/main.cpp @@ -1,5 +1,6 @@ #include #include +#include #include "mainwindow.h" QSharedMemory mem_jt9("mem_jt9"); @@ -33,6 +34,13 @@ int main(int argc, char *argv[]) } memset(to,0,size); //Zero all decoding params in shared memory + //Initialize Portaudio + PaError paerr=Pa_Initialize(); + if(paerr!=paNoError) { + QMessageBox::critical( 0, "Error", "Unable to initialize PortAudio."); + exit(1); + } + MainWindow w(&mem_jt9); w.show(); return a.exec(); diff --git a/mainwindow.cpp b/mainwindow.cpp index 2f6793064..a0ec732ce 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -193,23 +193,7 @@ MainWindow::MainWindow(QSharedMemory *shdmem, QWidget *parent) : } #endif mem_jt9 = shdmem; - /* - if(!mem_jt9.attach()) { - if (!mem_jt9.create(sizeof(jt9com_))) { - msgBox("Unable to create shared memory segment."); - } - } - char *to = (char*)mem_jt9.data(); - int size=sizeof(jt9com_); - if(jt9com_.newdat==0) { - } - memset(to,0,size); //Zero all decoding params in shared memory -*/ - PaError paerr=Pa_Initialize(); //Initialize Portaudio - if(paerr!=paNoError) { - msgBox("Unable to initialize PortAudio."); - } readSettings(); //Restore user's setup params if(m_dFreq.length()<=1) { m_dFreq.clear();