From 03f25698ac1c756120919dc93e0e9c84eee932f0 Mon Sep 17 00:00:00 2001 From: Stelios Bounanos Date: Tue, 8 Apr 2008 16:31:54 +0100 Subject: [PATCH] Upstream version 2.11I --- ChangeLog | 1 + configure.ac | 2 +- data/win32/fldigi.ico | Bin 12862 -> 5694 bytes src/Makefile.am | 2 +- src/dominoex/dominoex.cxx | 5 +-- src/feld/feld.cxx | 6 ++- src/filters/viterbi.cxx | 4 ++ src/irrxml/CXMLReaderImpl.h | 2 + src/logger/logger.cxx | 9 +++- src/main.cxx | 4 ++ src/misc/macros.cxx | 22 ++++++---- src/misc/pskmail.cxx | 32 ++++++++------ src/rigcontrol/hamlib.cxx | 19 +++++--- src/rigcontrol/rigio.cxx | 35 +++++++++++---- src/rigcontrol/rigxml.cxx | 84 +++++++++++++++++++++++++++--------- src/soundcard/mixer.cxx | 4 +- src/trx/trx.cxx | 8 +++- 17 files changed, 173 insertions(+), 66 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d211874..511d0f34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ Change Log: 2.11 1) Added EXEC macro 2) Added mousewheel over Macro buttons to move between macro button sets. 3) Fixed bug in Olivia signal level display. + 4) Ported to Windows (win32) 2.10.3) 1) Corrected memory leak bug. diff --git a/configure.ac b/configure.ac index 49ba3982..8c5f07b9 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl major and minor must be integers; patch may dnl contain other characters or be empty m4_define(FLDIGI_MAJOR, [2]) m4_define(FLDIGI_MINOR, [11]) -m4_define(FLDIGI_PATCH, [H]) +m4_define(FLDIGI_PATCH, [I]) AC_INIT([fldigi], FLDIGI_MAJOR.FLDIGI_MINOR[FLDIGI_PATCH], [w1hkj AT w1hkj DOT com]) diff --git a/data/win32/fldigi.ico b/data/win32/fldigi.ico index be4f2d3b4ad31a28f2cbcd5800e96cd6cfc2eadf..5fdc1710fc8f2800814844d64ef4e035265a9fde 100644 GIT binary patch literal 5694 zcmeHLX;f2L68<70Dk5S)#RYLRgg81(Tt*#j)b8*I%S1#(Wk6c7MH|I-(8RDLAw0qs zLqre}1w;@P5pf4aR8Vol6%qG+??sQE`8UpeiGk1%$vOV%GiM6kyZ6BCJnPC=^7`G@Lkb0tE#Hc=+%k zh7KKy(9lo}81QdgxpD<=Zf@AScQ3SBEmo{pf!}`n4Yszn@bmM-%aSBJ@yC*#<$V-N@gIB?(qe0_bfd-rY> z6%}Fg=FJET3qxjRCL$stpjN996%_@VrV$epgF%A^!NS4OVb`u**uH%`X3w6D!oou2<>g`1rcGF|U;#F4*no_T3@lx`6dH{N%a<=l zYHBK0u3QO~N`=*{S3{{(LMoL)CX<21VxdcyF8J`_1G;wYig)kcp;TTdpvsd2>tr? z!-EG8$UY6gy?ggCaNt1PxpN1D2Mt1*50 zbR0c;6doQPsI07nr>7?lA3h8(FE1QCco055KG?s1KPoCJP+ne+nKNgitgHsI9F=VRf*h1jxX3vzRFk&}~yB}7Be8z{daPTw4(aLXShZ>u)~;QPw6rv=S+fQyDJh7Kjz&^a5@KUx zk(ii>xVShZBqTsCmm@wtp2YWmexG)Kq-Wx7dt!MRcr3Z0m!4wiwQ1em+dS$YSWFSp z5o@NQx3-06;OJVh*zhQJ{@fFT_2-$c62y4fgSE~uY@cN4nP??;x&iSwWA+QHLaUY@ zKU6(-U!Tc)H|RY~Ni=~ou*EU(AkM@$PY@}%O6914MU;xG45&Mou9JxIFbJA%Q;1AL z*y#+lNU34dY+0#;U*U==#4isY(;%Y}J1O8Y>;?&y7W7XcYK*^>ADr<+56XT}>_8skV zdwpK+a7n6e2+B%U2s4x=4qWfimiwEMJYbe}Fk&%Y7eo04Rtlk2>`v<}-}0cHL;fL! zxHU}LTW#gI69s9f<^^w7X#^Cd5GZm>3ob@%0ixNdN}8gn47N;El2;Pd ztJT1ldvS4OnG!4l=anegY>^^_tJEwmDnC8r%P6B!#!a8P;F^GZB~3?rE7*As8J8AV zM}<~etS1suGooLwNV?EJv_`1P=6>fpQkL!HX8FC@P@Mwt?omgpgbv}#5$d^|f?Gk| zb~CPTFHnRwj4cNeJnNP2a?1@d!y>Z{%_^gDjR*thiCg z>*KaEQO}omR49q!mdp?v1ms|CoE7itlVFzu*6f7O7SlRTVQ1&hTe8k(Eq z&Cl;~gVf(Rv+$C5cWKPFpB9%F<AdAi#E8@6=H!o*yzO23tqwSUE?b+!wxooy1-6x$+erP5v+H>G+b*W_S~0{v zy{#`7XK_?y^|{g2W#e-XFfZdcva+3$IDu?+`r)~bzG@jIR9JBY*4nWr8kvn}&LN$V z)QfpVyRXjNq^3BcQsGae<<{{R#JE@mX4JYIKf*wtU7WII$W(nd^D3WcIF9aAFi zT!DU%y#_>BQ@Me~H5aObdCAes|CZ#Ub3Cmj(M-=nLR3t%ty5c~{%4KQt4KSJJrNDseWoKZ$=cobVH za`3HnxYCia+?< z$jdz@9(9cE{jF3l;ni}IY$I<}|MYyZm-FiW-BUc{6Fu$h5exZe(-O`*Va=4#9bxg2F+?OBrD2V8#mbs+2ceFDntL`qOH)FekITBGQ(bSI3iQFvi5} zfaGj_sbz+u#yhaw&6^i=Fzh5FVIH1=OBV8@#urheg+l8vML~5#==Y3P^ZaKl#q6oS z=@iHf_3uNgHF-^qjoTTnS)|+bZ_b5Xs4L1%)^KQ{YSXD(x28Lr1tvne0Q4Ca>^Ryl zGgZqL<*<2q{PDW{ZLflSFX)(l80)9zW!r>iEoc())YglB(2MQ*Yg=*ho#3mey+^Ga z^8JAj`BHNG_Mck0ZF}T*v`OkhK2Y@RsZ%oCl+af>Prydru;v&&bksE#?qK|@@iRM6 YYRu})zOiga{Z8;5LH^JCA76q00zKz!wg3PC literal 12862 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 x`0km84I3u9bJrun(freqerr/numtones); freqerr = decayavg(freqerr, err, 64); - -// std::cout << currsymbol << ", " << freqerr << std::endl; - fflush(stdout); - + if (progStatus.afconoff && (metric > progStatus.sldrSquelchValue || progStatus.sqlonoff == false)) { set_freq(frequency + freqerr); } diff --git a/src/feld/feld.cxx b/src/feld/feld.cxx index 63da5975..e7fae10a 100644 --- a/src/feld/feld.cxx +++ b/src/feld/feld.cxx @@ -409,8 +409,10 @@ void feld::send_symbol(int currsymb, int nextsymb) } outbuf[outlen++] = Amp * nco(tone); - if (outlen >= OUTBUFSIZE) { -std::cout << "reset\n"; std::cout.flush(); + if (outlen >= OUTBUFSIZE) { +#ifndef __CYGWIN__ +std::cout << "reset\n"; std::cout.flush(); +#endif break; } txcounter += upsampleinc; diff --git a/src/filters/viterbi.cxx b/src/filters/viterbi.cxx index 54893431..de984d2f 100644 --- a/src/filters/viterbi.cxx +++ b/src/filters/viterbi.cxx @@ -44,9 +44,13 @@ viterbi::viterbi(int k, int poly1, int poly2) for (int i = 0; i < outsize; i++) { output[i] = parity(poly1 & i) | (parity(poly2 & i) << 1); +#ifndef __CYGWIN__ // printf("%5d", output[i]); } // printf("\n"); +#else +} +#endif for (int i = 0; i < PATHMEM; i++) { metrics[i] = new int[nstates]; diff --git a/src/irrxml/CXMLReaderImpl.h b/src/irrxml/CXMLReaderImpl.h index 771f381b..01454527 100644 --- a/src/irrxml/CXMLReaderImpl.h +++ b/src/irrxml/CXMLReaderImpl.h @@ -11,7 +11,9 @@ #include "fast_atof.h" #ifdef _DEBUG +#ifndef __CYGWIN__ #define IRR_DEBUGPRINT(x) printf((x)); +#endif #else // _DEBUG #define IRR_DEBUGPRINT(x) #endif // _DEBUG diff --git a/src/logger/logger.cxx b/src/logger/logger.cxx index 31e113e9..2656f628 100644 --- a/src/logger/logger.cxx +++ b/src/logger/logger.cxx @@ -90,9 +90,15 @@ const char *ADIFHEADER = int writeadif () { // open the adif file +#ifndef __CYGWIN__ string sfname = HomeDir; - FILE *adiFile; sfname.append("fldigi.adif"); +#else + string sfname = "C:/FL_LOGBOOK/log.adif"; +#endif + FILE *adiFile; + +#ifndef __CYGWIN__ adiFile = fopen (sfname.c_str(), "r"); if (!adiFile) { adiFile = fopen(sfname.c_str(),"w"); @@ -105,6 +111,7 @@ int writeadif () { fclose(adiFile); } else fclose(adiFile); +#endif adiFile = fopen (sfname.c_str(), "a"); if (!adiFile) return 1; diff --git a/src/main.cxx b/src/main.cxx index f3e58317..ef46325f 100644 --- a/src/main.cxx +++ b/src/main.cxx @@ -217,6 +217,10 @@ int main(int argc, char ** argv) progdefaults.initInterface(); +#ifdef __CYGWIN__ + fl_digi_main->icon((char*)LoadIcon(fl_display, MAKEINTRESOURCE(IDI_ICON))); +#endif + fl_digi_main->show(argc, argv); progStatus.initLastState(); diff --git a/src/misc/macros.cxx b/src/misc/macros.cxx index 8bd346c2..22e642ee 100644 --- a/src/misc/macros.cxx +++ b/src/misc/macros.cxx @@ -519,11 +519,11 @@ int MACROTEXT::loadMacros(string filename) ifstream mFile(filename.c_str()); if (!mFile) { - createDotFldigi(); - for (int i = 0; i < 12; i++) { - btnMacro[i]->label( name[i].c_str()); - btnMacro[i]->redraw_label(); - } + createDotFldigi(); + for (int i = 0; i < 12; i++) { + btnMacro[i]->label( name[i].c_str()); + btnMacro[i]->redraw_label(); + } return 0; // mFile.open(filename.c_str()); // if (!mFile) @@ -560,7 +560,7 @@ int MACROTEXT::loadMacros(string filename) name[mNumber] = mLine.substr(idx+1); if (mNumber < 12) { FL_LOCK_D(); - btnMacro[mNumber]->label( (name[mNumber]).c_str()); + btnMacro[mNumber]->label( (name[mNumber]).c_str()); FL_UNLOCK_D(); } continue; @@ -571,17 +571,21 @@ int MACROTEXT::loadMacros(string filename) } text[mNumber] = text[mNumber] + mLine; } - mFile.close(); + mFile.close(); return 0; } void MACROTEXT::loadDefault() -{ +{ int erc; string Filename = HomeDir; Filename.append("macros.mdf"); - if ((erc = loadMacros(Filename)) != 0) + if ((erc = loadMacros(Filename)) != 0) +#ifndef __CYGWIN__ printf("Error #%d loading %s\n", erc, Filename.c_str()); +#else + ; +#endif } void MACROTEXT::openMacroFile() diff --git a/src/misc/pskmail.cxx b/src/misc/pskmail.cxx index d544fc2e..d2be462f 100644 --- a/src/misc/pskmail.cxx +++ b/src/misc/pskmail.cxx @@ -66,8 +66,10 @@ void parse_mailtext() strCmdText = mailtext.substr(idxCmd + 5, idxCmdEnd - idxCmd - 5); if (strCmdText == "server" && mailserver == false && mailclient == false) { mailserver = true; - mailclient = false; - std::cout << "Starting pskmail server transport layer" << std::endl; std::cout.flush(); + mailclient = false; +#ifndef __CYGWIN__ + std::cout << "Starting pskmail server transport layer" << std::endl; std::cout.flush(); +#endif string PskMailLogName = PskMailDir; PskMailLogName += "gMFSK.log"; Maillogfile = new cLogfile(PskMailLogName.c_str()); @@ -75,13 +77,17 @@ void parse_mailtext() } else if (strCmdText == "client" && mailclient == false && mailserver == false) { mailclient = true; mailserver = false; - std::cout << "Starting pskmail client transport layer" << std::endl; std::cout.flush(); +#ifndef __CYGWIN__ + std::cout << "Starting pskmail client transport layer" << std::endl; std::cout.flush(); +#endif string PskMailLogName = PskMailDir; PskMailLogName += "gMFSK.log"; Maillogfile = new cLogfile(PskMailLogName.c_str()); Maillogfile->log_to_file_start(); } else if (strCmdText == "normal") { - std::cout << "Closing pskmail transport layer" << std::endl; std::cout.flush(); +#ifndef __CYGWIN__ + std::cout << "Closing pskmail transport layer" << std::endl; std::cout.flush(); +#endif mailserver = false; mailclient = false; if (Maillogfile) { @@ -147,9 +153,11 @@ void initFilePtr() fseek(infile, 0, SEEK_END); infileptr = ftell(infile); fclose(infile); - } - bInitFilePtr = true; -std::cout << "Init file pointer = " << infileptr << std::endl; std::cout.flush(); + } + bInitFilePtr = true; +#ifndef __CYGWIN__ +std::cout << "Init file pointer = " << infileptr << std::endl; std::cout.flush(); +#endif } #endif @@ -215,7 +223,7 @@ void check_formail() { } } #else -// Windows file handling for input strings +// Windows file handling for input strings FILE *infile; infile = fopen(str_infile.c_str(), "rb"); if (infile) { @@ -283,12 +291,12 @@ void send0x06() void pskmail_loop(void *) { #ifdef __CYGWIN__ - if (!bInitFilePtr) + if (bInitFilePtr == false) initFilePtr(); #endif - if (bSend0x06) - send0x06(); - check_formail(); +// if (bSend0x06) +// send0x06(); +// check_formail(); Fl::repeat_timeout(0.2, pskmail_loop);//1.0, pskmail_loop); } diff --git a/src/rigcontrol/hamlib.cxx b/src/rigcontrol/hamlib.cxx index f357037b..f2db9aa9 100644 --- a/src/rigcontrol/hamlib.cxx +++ b/src/rigcontrol/hamlib.cxx @@ -56,7 +56,9 @@ void show_error(const char * a, const char * b) msg.append(": "); msg.append(b); put_status((char*)msg.c_str()); - std::cout << msg.c_str() << std::endl; std::cout.flush(); +#ifndef __CYGWIN__ + std::cout << msg.c_str() << std::endl; std::cout.flush(); +#endif } bool hamlib_setRTSDTR() @@ -81,16 +83,19 @@ bool hamlib_setRTSDTR() ioctl_bits |= TIOCM_DTR; // set DTR bit else ioctl_bits &= ~TIOCM_DTR; // clear DTR bit +#ifndef __CYGWIN__ std::cout << "TIOCM_RTS " << TIOCM_RTS << ", RTSplus " << progdefaults.RTSplus; std::cout << std::endl; std::cout << "TIOCM_DTR " << TIOCM_DTR << ", DTRplus " << progdefaults.DTRplus; std::cout << std::endl; -std::cout << ioctl_bits; +std::cout << ioctl_bits; +#endif ioctl(hamlibfd, TIOCMSET, &ioctl_bits); close(hamlibfd); +#ifndef __CYGWIN__ std::cout << "=> setRTSDTR() => " << ioctl_bits << std::endl; std::cout.flush(); - +#endif return true; } @@ -202,7 +207,9 @@ bool hamlib_init(bool bPtt) hamlib_rmode = RIG_MODE_NONE;//RIG_MODE_USB; if (fl_create_thread(hamlib_thread, hamlib_loop, &dummy) < 0) { - std::cout << "Hamlib init: pthread_create failed\n"; std::cout.flush(); +#ifndef __CYGWIN__ + std::cout << "Hamlib init: pthread_create failed\n"; std::cout.flush(); +#endif xcvr->close(); return false; } @@ -230,7 +237,9 @@ void hamlib_close(void) MilliSleep(50); count--; if (!count) { - std::cout << "\nHamlib stuck\n"; cout.flush(); +#ifndef __CYGWIN__ + std::cout << "\nHamlib stuck\n"; cout.flush(); +#endif xcvr->close(); exit(0); } diff --git a/src/rigcontrol/rigio.cxx b/src/rigcontrol/rigio.cxx index a2e1a644..641663c8 100644 --- a/src/rigcontrol/rigio.cxx +++ b/src/rigcontrol/rigio.cxx @@ -45,7 +45,8 @@ static long long llFreq = 0; static int dummy = 0; static void *rigCAT_loop(void *args); - + +#ifndef __CYGWIN__ void printhex(string s) { for (unsigned int i = 0; i < s.length(); i++) { @@ -69,6 +70,7 @@ char * printtime() strftime(sztime, 79, "[%H:%M:%S]", now); return sztime; } +#endif bool readpending = false; int readtimeout; @@ -87,7 +89,9 @@ bool hexout( string s, int retnbr) MilliSleep(1); if (readtimeout == 0) { readpending = false; +#ifndef __CYGWIN__ std::cout << "rigio timeout!" << std::endl; fflush(stdout); +#endif return false; } @@ -114,7 +118,7 @@ bool hexout( string s, int retnbr) if (retnbr > 0) { num = rigio.ReadBuffer (replybuff, retnbr > 200 ? 200 : retnbr); // debug code - +#ifndef __CYGWIN__ // if (num) { // std::cout << printtime() << "Rsp (" << n << "): "; // printhex(replybuff, num); @@ -122,6 +126,7 @@ bool hexout( string s, int retnbr) // std::cout << printtime() << "Rsp (" << n << "): no reply" << std::endl; // std::cout.flush(); // to here +#endif } if (retnbr == 0 || num == retnbr) { @@ -792,24 +797,32 @@ unused__ static void show_error(const char * a, const char * b) string msg = a; msg.append(": "); msg.append(b); +#ifndef __CYGWIN__ std::cout << msg << std::endl; +#endif } bool rigCAT_init() { if (rigCAT_open == true) { - std::cout << "RigCAT already open file present\n"; fflush(stdout); +#ifndef __CYGWIN__ + std::cout << "RigCAT already open file present\n"; fflush(stdout); +#endif return false; } if (readRigXML() == false) { - std::cout << "No rig.xml file present\n"; std::cout.flush(); +#ifndef __CYGWIN__ + std::cout << "No rig.xml file present\n"; std::cout.flush(); +#endif return false; } if (rigio.OpenPort() == false) { +#ifndef __CYGWIN__ std::cout << "Cannot open serial port " << (char *)rigio.Device().c_str(); - std::cout << std::endl; std::cout.flush(); + std::cout << std::endl; std::cout.flush(); +#endif return false; } llFreq = 0; @@ -817,12 +830,16 @@ bool rigCAT_init() sRigWidth = ""; if (rigCAT_getfreq() <= 0) { - std::cout << "Transceiver not responding\n"; std::cout.flush(); +#ifndef __CYGWIN__ + std::cout << "Transceiver not responding\n"; std::cout.flush(); +#endif return false; } if (fl_create_thread(rigCAT_thread, rigCAT_loop, &dummy) < 0) { - std::cout << "rig init: pthread_create failed\n"; std::cout.flush(); +#ifndef __CYGWIN__ + std::cout << "rig init: pthread_create failed\n"; std::cout.flush(); +#endif rigio.ClosePort(); return false; } @@ -847,7 +864,9 @@ void rigCAT_close(void) MilliSleep(50); count--; if (!count) { - std::cout << "\nRigCAT stuck\n"; fflush(stdout); +#ifndef __CYGWIN__ + std::cout << "\nRigCAT stuck\n"; fflush(stdout); +#endif fl_lock(&rigCAT_mutex); rigio.ClosePort(); fl_unlock(&rigCAT_mutex); diff --git a/src/rigcontrol/rigxml.cxx b/src/rigcontrol/rigxml.cxx index 064711cf..af81697f 100644 --- a/src/rigcontrol/rigxml.cxx +++ b/src/rigcontrol/rigxml.cxx @@ -73,7 +73,9 @@ void parseDREV(size_t &); void parseDMAKS(size_t &); void parseDSHIFT(size_t &); +#ifndef __CYGWIN__ void print(size_t &); +#endif list commands; list reply; @@ -166,7 +168,8 @@ TAGS datatags[] = { ; //===================================================================== - + +#ifndef __CYGWIN__ void print(size_t &p0, int indent) { #ifdef DEBUGXML @@ -176,6 +179,7 @@ void print(size_t &p0, int indent) std::cout << strXML.substr(p0, tend - p0 + 1).c_str() << std::endl; #endif } +#endif size_t tagEnd(size_t p0) { @@ -331,7 +335,9 @@ void parseMODEdefs(size_t &p0, list &lmd) p0++; return; } - print(p0,0); +#ifndef __CYGWIN__ + print(p0,0); +#endif p0 = nextTag(p0); while (p0 != string::npos && p0 < pend && tagIs(p0, " &lmd) p0 = tagEnd(p0); p0 = nextTag(p0); while (p0 != string::npos && p0 < elend) { - print(p0,1); +#ifndef __CYGWIN__ + print(p0,1); +#endif if ( isBytes(p0, stemp) ) { lmd.push_back(MODE(strELEMENT,stemp)); } @@ -384,11 +392,15 @@ void parseLSBMODES(size_t &p0) { size_t pend = tagEnd(p0); string sMode; - print(p0,0); +#ifndef __CYGWIN__ + print(p0,0); +#endif p0 = nextTag(p0); while (p0 < pend && isString(p0, sMode)) { LSBmodes.push_back(sMode); - print (p0,1); +#ifndef __CYGWIN__ + print (p0,1); +#endif p0 = tagEnd(p0); p0 = nextTag(p0); } @@ -411,7 +423,9 @@ void parseBWdefs(size_t &p0, list &lbw) p0++; return; } - print(p0,0); +#ifndef __CYGWIN__ + print(p0,0); +#endif p0 = nextTag(p0); while (p0 != string::npos && p0 < pend && tagIs(p0, " &lbw) p0 = tagEnd(p0); p0 = nextTag(p0); while (p0 != string::npos && p0 < elend) { - print(p0,1); +#ifndef __CYGWIN__ + print(p0,1); +#endif if ( isBytes(p0, stemp) ) { lbw.push_back(BW(strELEMENT,stemp)); } @@ -558,7 +574,9 @@ void parsePORT(size_t &p0) size_t p1; TAGS *pv; - print(p0,0); +#ifndef __CYGWIN__ + print(p0,0); +#endif rig.clear(); p1 = nextTag(p0); @@ -566,7 +584,9 @@ void parsePORT(size_t &p0) pv = porttags; while (pv->tag) { if (strXML.find(pv->tag, p1) == p1) { - print(p1, 1); +#ifndef __CYGWIN__ + print(p1, 1); +#endif if (pv->fp) (pv->fp)(p1); break; @@ -589,6 +609,7 @@ void parsePORT(size_t &p0) } p0 = pend; #ifdef DEBUGXML +#ifndef __CYGWIN__ std::cout << "port: " << rig.port.c_str() << std::endl; std::cout << "baud: " << rig.baud << std::endl; std::cout << "retries: " << rig.retries << std::endl; @@ -598,6 +619,7 @@ void parsePORT(size_t &p0) std::cout << "initial dts: " << (rig.dtr ? "+12" : "-12") << std::endl; std::cout << "use dtr ptt: " << (rig.dtrptt ? "T" : "F") << std::endl; std::cout << "use flowcontrol: " << (rig.rtscts ? "T" : "F") << std :: endl; +#endif #endif } @@ -644,49 +666,65 @@ void parseIOSint(size_t &p0) void parseDTYPE(size_t &p1) { - print(p1,2); +#ifndef __CYGWIN__ + print(p1,2); +#endif iosTemp.data.dtype = getElement(p1); } void parseDSIZE(size_t &p1) { - print(p1,2); +#ifndef __CYGWIN__ + print(p1,2); +#endif iosTemp.data.size = getInt(p1); } void parseDMAX(size_t &p1) { - print(p1,2); +#ifndef __CYGWIN__ + print(p1,2); +#endif iosTemp.data.max = getInt(p1); } void parseDMIN(size_t &p1) { - print(p1,2); +#ifndef __CYGWIN__ + print(p1,2); +#endif iosTemp.data.min = getInt(p1); } void parseDRESOL(size_t &p1) { - print(p1,2); +#ifndef __CYGWIN__ + print(p1,2); +#endif iosTemp.data.resolution = getFloat(p1); } void parseDREV(size_t &p1) { - print(p1,2); +#ifndef __CYGWIN__ + print(p1,2); +#endif iosTemp.data.reverse = getBool(p1); } void parseDMAKS(size_t &p1) { - print(p1,2); +#ifndef __CYGWIN__ + print(p1,2); +#endif iosTemp.data.andmask = getInt(p1); } void parseDSHIFT(size_t &p1) { - print(p1,2); +#ifndef __CYGWIN__ + print(p1,2); +#endif iosTemp.data.shiftbits = getInt(p1); } @@ -701,7 +739,9 @@ void parseIOSdata(size_t &p0) pv = datatags; while (pv->tag) { if (strXML.find(pv->tag, p1) == p1) { - print(p1, 1); +#ifndef __CYGWIN__ + print(p1, 1); +#endif if (pv->fp) (pv->fp)(p1); break; @@ -757,7 +797,9 @@ bool parseIOS(size_t &p0, TAGS *valid) size_t p1; TAGS *pv; - print(p0,0); +#ifndef __CYGWIN__ + print(p0,0); +#endif iosTemp.clear(); p1 = nextTag(p0); @@ -765,7 +807,9 @@ bool parseIOS(size_t &p0, TAGS *valid) pv = valid; while (pv->tag) { if (strXML.find(pv->tag, p1) == p1) { - print(p1, 1); +#ifndef __CYGWIN__ + print(p1, 1); +#endif if (pv->fp) (pv->fp)(p1); break; diff --git a/src/soundcard/mixer.cxx b/src/soundcard/mixer.cxx index cab7f1fa..dedc321d 100644 --- a/src/soundcard/mixer.cxx +++ b/src/soundcard/mixer.cxx @@ -110,6 +110,7 @@ void MixerOSS::initValues() pcmlevel0 = PCMVolume(); vollevel0 = OutVolume(); /* +#ifndef __CYGWIN__ std::cout << "Sound card initial state:" << std::endl; std::cout << " Dev mask " << hex << devmask << std::endl; std::cout << " Rec mask " << hex << recmask << std::endl; @@ -118,7 +119,8 @@ void MixerOSS::initValues() std::cout << " Line Level = " << linelevel0 << std::endl; std::cout << " Mic Level = " << miclevel0 << std::endl; std::cout << " Pcm Level = " << pcmlevel0 << std::endl; - std::cout << " Vol Level = " << vollevel0 << std::endl; + std::cout << " Vol Level = " << vollevel0 << std::endl; +#endif */ } diff --git a/src/trx/trx.cxx b/src/trx/trx.cxx index 7cc56df1..dd0d2c6b 100644 --- a/src/trx/trx.cxx +++ b/src/trx/trx.cxx @@ -367,7 +367,9 @@ void trx_start_macro_timer() void trx_start(void) { if (trxrunning) { - std::cout<< "trx already running!\n"; fflush(stdout); +#ifndef __CYGWIN__ + std::cout<< "trx already running!\n"; fflush(stdout); +#endif return; } @@ -400,7 +402,9 @@ void trx_start(void) _trx_tune = 0; active_modem = 0; if (fl_create_thread(trx_thread, trx_loop, &dummy) < 0) { - std::cout << "trx pthread_create:" << std::endl; fflush(stdout); +#ifndef __CYGWIN__ + std::cout << "trx pthread_create:" << std::endl; fflush(stdout); +#endif trxrunning = false; exit(1); }