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

Put in some (temporary?) "#ifdef WIN32" statements, so that it will

Browse Source 
compile under Linux.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2741 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2012-11-16 15:57:42 +00:00
parent 6c8d513e32
commit 332bea90f8
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devsetup.cpp
View File

@ -31,6 +31,8 @@ void DevSetup::initDlg()
char pa_device_hostapi[128]; char pa_device_hostapi[128];
k=0; k=0;
#ifdef WIN32
// Needs work to compile for Linux
for(id=0; id<numDevices; id++ ) { for(id=0; id<numDevices; id++ ) {
pdi=Pa_GetDeviceInfo(id); pdi=Pa_GetDeviceInfo(id);
nchin=pdi->maxInputChannels; nchin=pdi->maxInputChannels;
@ -58,6 +60,7 @@ void DevSetup::initDlg()
ui.comboBoxSndIn->addItem(t); ui.comboBoxSndIn->addItem(t);
} }
} }
#endif
k=0; k=0;
for(id=0; id<numDevices; id++ ) { for(id=0; id<numDevices; id++ ) {
@ -70,8 +73,11 @@ void DevSetup::initDlg()
sprintf((char*)(pa_device_hostapi),"%s", sprintf((char*)(pa_device_hostapi),"%s",
Pa_GetHostApiInfo(pdi->hostApi)->name); Pa_GetHostApiInfo(pdi->hostApi)->name);
#ifdef WIN32
// Needs work to compile for Linux
p1=(char*)""; p1=(char*)"";
p=strstr(pa_device_hostapi,"MME"); p=strstr(pa_device_hostapi,"MME");
if(p!=NULL) p1=(char*)"MME"; if(p!=NULL) p1=(char*)"MME";
p=strstr(pa_device_hostapi,"Direct"); p=strstr(pa_device_hostapi,"Direct");
if(p!=NULL) p1=(char*)"DirectX"; if(p!=NULL) p1=(char*)"DirectX";
@ -81,10 +87,10 @@ void DevSetup::initDlg()
if(p!=NULL) p1=(char*)"ASIO"; if(p!=NULL) p1=(char*)"ASIO";
p=strstr(pa_device_hostapi,"WDM-KS"); p=strstr(pa_device_hostapi,"WDM-KS");
if(p!=NULL) p1=(char*)"WDM-KS"; if(p!=NULL) p1=(char*)"WDM-KS";
sprintf(p2,"%2d %d %-8s %-39s",id,nchout,p1,pa_device_name); sprintf(p2,"%2d %d %-8s %-39s",id,nchout,p1,pa_device_name);
QString t(p2); QString t(p2);
ui.comboBoxSndOut->addItem(t); ui.comboBoxSndOut->addItem(t);
#endif
} }
} }

5
getfile.cpp
View File

@ -3,7 +3,10 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
#ifdef WIN32
#include <windows.h> #include <windows.h>
#endif
void getfile(QString fname, int ntrperiod) void getfile(QString fname, int ntrperiod)
{ {
@ -119,6 +122,7 @@ float gran()
int ptt(int nport, int ntx, int *iptt) int ptt(int nport, int ntx, int *iptt)
{ {
#ifdef WIN32
static HANDLE hFile; static HANDLE hFile;
static int open=0; static int open=0;
char s[10]; char s[10];
@ -161,4 +165,5 @@ int ptt(int nport, int ntx, int *iptt)
if(i9==0) return -(CLRBREAK); if(i9==0) return -(CLRBREAK);
if(i00==0) return -10; if(i00==0) return -10;
return 0; return 0;
#endif
} }