w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-18 10:01:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Moved Portaudio initialization to the main function.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3165 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Edson W. R. Pereira 2013-04-13 15:22:12 +00:00
parent abc2b4bd83
commit c8f257787e
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main.cpp
View File

@ -1,5 +1,6 @@
#include <QtGui> #include <QtGui>
#include <QtGui/QApplication> #include <QtGui/QApplication>
#include <portaudio.h>
#include "mainwindow.h" #include "mainwindow.h"
QSharedMemory mem_jt9("mem_jt9"); 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 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); MainWindow w(&mem_jt9);
w.show(); w.show();
return a.exec(); return a.exec();

16
mainwindow.cpp
View File

@ -193,23 +193,7 @@ MainWindow::MainWindow(QSharedMemory *shdmem, QWidget *parent) :
} }
#endif #endif
mem_jt9 = shdmem; 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 readSettings(); //Restore user's setup params
if(m_dFreq.length()<=1) { if(m_dFreq.length()<=1) {
m_dFreq.clear(); m_dFreq.clear();