mirror
/
dl-fldigi
kopia lustrzana https://github.com/jamescoxon/dl-fldigi
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Clean up headers

pull/2/head
Stelios Bounanos 2009-04-12 23:57:17 +01:00
rodzic b4bf47ffee
commit 9d566564c4
116 zmienionych plików z 353 dodań i 543 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
src/Makefile.am
Wyświetl plik

@ -173,8 +173,6 @@ fldigi_SOURCES += \
include/Combo_Box.h \
include/Combo_List.h \
include/confdialog.h \
include/Enumerations.h \
include/FLdigiTypes.h \
include/FTextView.h \
include/fileselect.h \
include/Fl_Text_Display_mod.H \
@ -209,7 +207,6 @@ fldigi_SOURCES += \
include/gettext.h \
include/globals.h \
include/icons.h \
include/id.h \
include/interleave.h \
include/jalocha/pj_cmpx.h \
include/jalocha/pj_fft.h \

4
src/combo/combo.cxx
Wyświetl plik

@ -1,5 +1,9 @@
#include <config.h>
#include <cstring>
#include <cstdlib>
#include <FL/Fl.H>
#include "combo.h"
#include "debug.h"

2
src/cw_rtty/morse.cxx
Wyświetl plik

@ -28,6 +28,8 @@
#include <config.h>
#include <cstring>
#include "morse.h"
/* ---------------------------------------------------------------------- */

3
src/cw_rtty/rtty.cxx
Wyświetl plik

@ -29,6 +29,9 @@
using namespace std;
#include "rtty.h"
#include "fl_digi.h"
#include "digiscope.h"
#include "misc.h"
#include "waterfall.h"
#include "confdialog.h"
#include "configuration.h"

3
src/dialogs/Viewer.cxx
Wyświetl plik

@ -3,6 +3,7 @@
#include <config.h>
#include "Viewer.h"
#include "trx.h"
#include "main.h"
#include "viewpsk.h"
#include "configuration.h"
@ -16,7 +17,7 @@
#include <FL/Enumerations.H>
#include <FL/Fl_Slider.H>
#include <FL/fl_ask.H>
#include <FL/Fl_Pack.H>
#include <string>

7
src/dialogs/confdialog.cxx
Wyświetl plik

@ -2779,7 +2779,6 @@ an merging"));
cntCWdash2dot->type(1);
cntCWdash2dot->minimum(2.5);
cntCWdash2dot->maximum(4);
cntCWdash2dot->step(0.1);
cntCWdash2dot->value(3);
cntCWdash2dot->callback((Fl_Callback*)cb_cntCWdash2dot);
cntCWdash2dot->align(FL_ALIGN_RIGHT);
@ -2790,7 +2789,6 @@ an merging"));
cntCWrisetime->type(1);
cntCWrisetime->minimum(0);
cntCWrisetime->maximum(15);
cntCWrisetime->step(0.1);
cntCWrisetime->value(4);
cntCWrisetime->callback((Fl_Callback*)cb_cntCWrisetime);
cntCWrisetime->align(FL_ALIGN_RIGHT);
@ -2893,7 +2891,6 @@ an merging"));
valDominoEX_BW->type(1);
valDominoEX_BW->minimum(1);
valDominoEX_BW->maximum(2);
valDominoEX_BW->step(0.1);
valDominoEX_BW->value(1.5);
valDominoEX_BW->callback((Fl_Callback*)cb_valDominoEX_BW);
valDominoEX_BW->align(FL_ALIGN_RIGHT);
@ -2908,7 +2905,6 @@ an merging"));
{ Fl_Value_Slider* o = valDomCWI = new Fl_Value_Slider(15, 207, 260, 20, _("CWI threshold"));
valDomCWI->tooltip(_("CWI detection and suppression"));
valDomCWI->type(1);
valDomCWI->step(0.01);
valDomCWI->textsize(14);
valDomCWI->callback((Fl_Callback*)cb_valDomCWI);
valDomCWI->align(FL_ALIGN_TOP);
@ -3380,7 +3376,6 @@ an merging"));
valTHOR_BW->type(1);
valTHOR_BW->minimum(1);
valTHOR_BW->maximum(2);
valTHOR_BW->step(0.1);
valTHOR_BW->value(1.5);
valTHOR_BW->callback((Fl_Callback*)cb_valTHOR_BW);
valTHOR_BW->align(FL_ALIGN_RIGHT);
@ -3395,7 +3390,6 @@ an merging"));
{ Fl_Value_Slider* o = valThorCWI = new Fl_Value_Slider(15, 218, 260, 20, _("CWI threshold"));
valThorCWI->tooltip(_("CWI detection and suppression"));
valThorCWI->type(1);
valThorCWI->step(0.01);
valThorCWI->textsize(14);
valThorCWI->callback((Fl_Callback*)cb_valThorCWI);
valThorCWI->align(FL_ALIGN_TOP);
@ -3971,7 +3965,6 @@ l with your sound hardware."));
valPCMvolume->tooltip(_("Set the sound card PCM level"));
valPCMvolume->type(1);
valPCMvolume->selection_color(FL_SELECTION_COLOR);
valPCMvolume->step(0.01);
valPCMvolume->value(0.8);
valPCMvolume->textsize(14);
valPCMvolume->callback((Fl_Callback*)cb_valPCMvolume);

4
src/dialogs/fl_digi.cxx
Wyświetl plik

@ -49,6 +49,8 @@
#include <FL/Fl_Tooltip.H>
#include <FL/Fl_Tabs.H>
#include <FL/Fl_Multiline_Input.H>
#include <FL/Fl_Menu_Bar.H>
#include <FL/Fl_Pack.H>
#include "waterfall.h"
#include "raster.h"
@ -123,6 +125,8 @@
#include "rx_extract.h"
#include "speak.h"
using namespace std;
Fl_Double_Window *fl_digi_main=(Fl_Double_Window *)0;
Fl_Help_Dialog *help_dialog = (Fl_Help_Dialog *)0;
Fl_Double_Window *scopeview = (Fl_Double_Window *)0;

1
src/dominoex/dominoex.cxx
Wyświetl plik

@ -32,6 +32,7 @@
#include "dominoex.h"
#include "trx.h"
#include "fl_digi.h"
#include "fft.h"
#include "filters.h"
#include "misc.h"

1
src/feld/feld.cxx
Wyświetl plik

@ -39,6 +39,7 @@
using namespace std;
#include "feld.h"
#include "fl_digi.h"
#include "fontdef.h"
#include "confdialog.h"
#include "qrunner.h"

16
src/fft/fft.cxx
Wyświetl plik

@ -19,6 +19,7 @@
#include <config.h>
#include "misc.h"
#include "fft.h"
// n = size of fourier transform in complex pairs
@ -161,6 +162,21 @@ void Cfft::irdft(double *RealData)
*/
}
void Cfft::setWindow(fftPrefilter pf)
{
wintype = pf;
if (wintype == FFT_TRIANGULAR)
TriangularWindow(fftwin, fftlen*2);
else if (wintype == FFT_HAMMING)
HammingWindow(fftwin, fftlen*2);
else if (wintype == FFT_HANNING)
HanningWindow(fftwin, fftlen*2);
else if (wintype == FFT_BLACKMAN)
BlackmanWindow(fftwin, fftlen*2);
else
RectWindow(fftwin, fftlen*2);
}
/* -------- initializing routines -------- */

4
src/filters/fftfilt.cxx
Wyświetl plik

@ -12,8 +12,8 @@
#include <config.h>
#include <stdlib.h>
#include <math.h>
#include <cmath>
#include "misc.h"
#include "fftfilt.h"

2
src/include/Combo_Box.h
Wyświetl plik

@ -20,8 +20,6 @@
#include <FL/Fl_Input.H>
#include <FL/Fl_Group.H>
//#include "Enumerations.h"
//! This is a generic base class for implementing widgets with combo-box-like behavior (i.e. a pulldown menu where the "input" area is editable
class Combo_Box : public Fl_Group
{

69
src/include/Enumerations.h
Wyświetl plik

@ -1,69 +0,0 @@
// $Id: Flu_Enumerations.h,v 1.16 2004/04/03 17:35:41 jbryan Exp $
/***************************************************************
* FLU - FLTK Utility Widgets
* Copyright (C) 2002 Ohio Supercomputer Center, Ohio State University
*
* This file and its content is protected by a software license.
* You should have received a copy of this license with this file.
* If not, please contact the Ohio Supercomputer Center immediately:
* Attn: Jason Bryan Re: FLU 1224 Kinnear Rd, Columbus, Ohio 43212
*
***************************************************************/
#ifndef _FLU_ENUMERATIONS_H
#define _FLU_ENUMERATIONS_H
/* these enums are all global to conform to the fltk standard */
/*! Selection modes for FLU widgets that select stuff.
Used by:
Flu_Tree_Browser
*/
enum {
FLU_NO_SELECT,
FLU_SINGLE_SELECT,
FLU_MULTI_SELECT
};
/*! Data insertion modes for FLU widgets that insert stuff.
Used by:
Flu_Tree_Browser
*/
enum {
FLU_INSERT_FRONT,
FLU_INSERT_BACK,
FLU_INSERT_SORTED,
FLU_INSERT_SORTED_REVERSE
};
/*! Selection drag modes for FLU widgets that select stuff (used while the mouse is being dragged).
Used by:
Flu_Tree_Browser
*/
enum {
FLU_DRAG_IGNORE,
FLU_DRAG_TO_SELECT,
FLU_DRAG_TO_MOVE
};
/*! Callback reasons for FLU widgets that select stuff.
Used by:
Flu_Tree_Browser
*/
enum {
FLU_HILIGHTED,
FLU_UNHILIGHTED,
FLU_SELECTED,
FLU_UNSELECTED,
FLU_OPENED,
FLU_CLOSED,
FLU_DOUBLE_CLICK,
FLU_WIDGET_CALLBACK,
FLU_MOVED_NODE,
FLU_NEW_NODE,
FLU_NOTHING
};
#endif

16
src/include/FLdigiTypes.h
Wyświetl plik

@ -1,16 +0,0 @@
#ifndef DIGI_TYPES_H
#define DIGI_TYPES_H
typedef char CHAR; // 8 bits -127 to 127
typedef unsigned char UCHAR; // 8 bits 0 to 255
typedef int INT; // 16 or 32 bits
typedef unsigned int UINT; // 16 or 32 bits
typedef short int INT16; // 16 bits, -32767 to 32767
typedef unsigned short int UINT16; // 16 bits, 0 to 65535
typedef long int INT32; // 32 bits -2,147,483,647 to 2,147,483,647
typedef unsigned long int UINT32; // 32 bits 0 to 4,294,967,295
typedef float FLOAT; // 32 bits, 6 digits of precision
typedef double DOUBLE; // 64 bits, 10 digits of precision
typedef long double LDOUBLE;// 80 bits, 10 digits of precision
#endif

4
src/include/FreqControl.h
Wyświetl plik

@ -35,10 +35,6 @@
#ifndef _FREQCONTROL_H_
#define _FREQCONTROL_H_
#include <math.h>
#include <stdio.h>
#include <string.h>
#include <FL/Fl.H>
#include <FL/Fl_Widget.H>
#include <FL/Fl_Repeat_Button.H>

4
src/include/Viewer.h
Wyświetl plik

@ -1,11 +1,9 @@
#ifndef Viewer_h
#define Viewer_h
#include <FL/Fl.H>
#include <FL/Fl_Double_Window.H>
#include <FL/Fl_Button.H>
#include <FL/Fl_Hold_Browser.H>
#include <Fl/Fl_Group.H>
#include <Fl/Fl_Pack.H>
enum { VIEWER_LABEL_AF, VIEWER_LABEL_RF, VIEWER_LABEL_CH, VIEWER_LABEL_NTYPES };

4
src/include/adif_io.h
Wyświetl plik

@ -1,9 +1,7 @@
#ifndef ADIFIO
#define ADIFIO
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <cstdio>
#include "qso_db.h"

18
src/include/analysis.h
Wyświetl plik

@ -24,23 +24,13 @@
#ifndef _anal_H
#define _anal_H
#include <iostream>
#include <fstream>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <stdio.h>
#include <sys/time.h>
#include <string>
#include <fstream>
#include "complex.h"
#include "modem.h"
#include "trx.h"
#include "misc.h"
#include "filters.h"
#include "fftfilt.h"
#include "digiscope.h"
#include "main.h"
#include "modem.h"
#include "mbuffer.h"
#define anal_SampleRate 8000
@ -78,8 +68,8 @@ private:
double nco(double freq);
void writeFile();
ofstream analysisFile;
string analysisFilename;
std::ofstream analysisFile;
std::string analysisFilename;
public:
anal();

1
src/include/benchmark.h
Wyświetl plik

@ -3,6 +3,7 @@
#include <string>
#include <sys/types.h>
#include "globals.h"
struct benchmark_params {
trx_mode modem;

3
src/include/calendar.h
Wyświetl plik

@ -30,9 +30,8 @@
#include <FL/Fl_Group.H>
#include <FL/Fl_Button.H>
#include <FL/Fl_Box.H>
#include <FL/Fl_Pixmap.H>
#include "flinput2.h"
#include "flinput2.h"
#include "date.h"
class Fl_Calendar_Base : public Fl_Group , public Date

3
src/include/colorbox.h
Wyświetl plik

@ -1,9 +1,6 @@
#ifndef COLORBOX_H
#define COLORBOX_H
#include <FL/Fl.H>
#include <FL/fl_draw.H>
#include <FL/Fl_Widget.H>
#include <FL/Fl_Button.H>
extern void loadPalette();

8
src/include/combo.h
Wyświetl plik

@ -26,17 +26,11 @@
#ifndef _FL_COMBOBOX_H
#define _FL_COMBOBOX_H
#include <FL/Fl.H>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <memory.h>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Button.H>
#include <FL/Fl_Output.H>
#include <FL/Fl_Select_Browser.H>
#include <FL/Fl_Input.H>
#define FL_COMBO_UNIQUE 1
#define FL_COMBO_UNIQUE_NOCASE 2

2
src/include/complex.h
Wyświetl plik

@ -5,7 +5,7 @@
#ifndef _COMPLEX_H
#define _COMPLEX_H
#include <math.h>
#include <cmath>
class complex {
public:

4
src/include/configuration.h
Wyświetl plik

@ -3,8 +3,8 @@
#include <string>
#include "main.h"
#include "rtty.h"
#include "waterfall.h"
#include "lookupcall.h"
#include "Viewer.h"
@ -178,7 +178,7 @@
ELEM_(bool, autoextract, "AUTOEXTRACT", false) \
ELEM_(bool, speak, "SPEAK", false) \
/* QRZ */ \
ELEM_(int, QRZ, "QRZTYPE", 0) /* Not available */ \
ELEM_(int, QRZ, "QRZTYPE", QRZNONE) \
ELEM_(std::string, QRZpathname, "QRZPATHNAME", "") \
ELEM_(std::string, QRZusername, "QRZUSER", "") \
ELEM_(std::string, QRZuserpassword, "QRZPASSWORD", "") \

7
src/include/date.h
Wyświetl plik

@ -25,12 +25,7 @@
#ifndef DATE_H
#define DATE_H
#include <iostream>
#include <iomanip>
#include <time.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <iosfwd>
typedef enum {
SUNDAY,

8
src/include/digiscope.h
Wyświetl plik

@ -29,14 +29,8 @@
#ifndef DIGISCOPE_H
#define DIGISCOPE_H
#include <math.h>
#include <stdlib.h>
#include <string.h>
#include <FL/Fl.H>
#include <FL/Fl_Double_Window.H>
#include <FL/Fl_Widget.H>
#include <FL/fl_draw.H>
#include "complex.h"
class Digiscope : public Fl_Widget {

7
src/include/dominoex.h
Wyświetl plik

@ -29,7 +29,7 @@
#include <string>
#include "complex.h"
#include "trx.h"
#include "modem.h"
#include "fft.h"
#include "filters.h"
#include "fftfilt.h"
@ -45,9 +45,6 @@
#include "interleave.h"
#include "viterbi.h"
using namespace std;
#define NUMTONES 18
//#define MAXFFTS 4
#define MAXFFTS 8
@ -126,7 +123,7 @@ protected:
int txstate;
int txprevtone;
unsigned int bitshreg;
string strSecXmtText;
std::string strSecXmtText;
// FEC variables
viterbi *MuPskDec;

6
src/include/dsp.h
Wyświetl plik

@ -24,9 +24,9 @@
*
*/
#include <stdlib.h>
#include <string.h>
#include <math.h>
#include <cstdlib>
#include <cstring>
#include <cmath>
// ----------------------------------------------------------------------------
// double/other-complex type

17
src/include/fft.h
Wyświetl plik

@ -19,10 +19,7 @@
#ifndef FFT_H
#define FFT_H
#include <math.h>
#include <stdio.h>
#include "complex.h"
#include "misc.h"
enum fftPrefilter {FFT_NONE, FFT_HAMMING, FFT_HANNING, FFT_BLACKMAN, FFT_TRIANGULAR};
@ -61,19 +58,7 @@ public:
void irdft(double *a);
void irdft(complex *a) { irdft( (double *) a); }
void setWindow(fftPrefilter pf) {
wintype = pf;
if (wintype == FFT_TRIANGULAR)
TriangularWindow(fftwin, fftlen*2);
else if (wintype == FFT_HAMMING)
HammingWindow(fftwin, fftlen*2);
else if (wintype == FFT_HANNING)
HanningWindow(fftwin, fftlen*2);
else if (wintype == FFT_BLACKMAN)
BlackmanWindow(fftwin, fftlen*2);
else
RectWindow(fftwin, fftlen*2);
}
void setWindow(fftPrefilter pf);
};
#endif

1
src/include/fftfilt.h
Wyświetl plik

@ -7,7 +7,6 @@
#include "complex.h"
#include "fft.h"
#include "misc.h"
//----------------------------------------------------------------------

18
src/include/fl_digi.h
Wyświetl plik

@ -22,23 +22,14 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// ----------------------------------------------------------------------------
#ifndef fl_digi_h
#ifndef FL_DIGI_H
#define FL_DIGI_H
#define fl_digi_h
#include <string.h>
#include <FL/Fl.H>
#include <FL/Fl_Double_Window.H>
#include <FL/Fl_Menu_Bar.H>
#include <FL/Fl_Pack.H>
#include <FL/Fl_Text_Buffer.H>
#include <FL/Fl_Browser.H>
#include <FL/Fl_Value_Slider.H>
#include <FL/Fl_Input.H>
#include <FL/Fl_Tile.H>
#include <FL/Fl_Light_Button.H>
#include <FL/Fl_Check_Button.H>
#include <FL/Fl_Menu_Item.H>
#include "combo.h"
@ -52,7 +43,6 @@
#include "FreqControl.h"
#include <flinput2.h>
using namespace std;
extern Fl_Double_Window *fl_digi_main;
extern Fl_Double_Window *scopeview;
@ -161,8 +151,8 @@ extern void put_Status1(const char *msg, double timeout = 0.0, status_timeout ac
extern void put_Status2(const char *msg, double timeout = 0.0, status_timeout action = STATUS_CLEAR);
extern void show_frequency(long long);
extern void show_mode(const string& mode);
extern void show_bw(const string& sWidth);
extern void show_mode(const std::string& mode);
extern void show_bw(const std::string& sWidth);
extern void show_spot(bool v);
extern void showMacroSet();

4
src/include/fl_lock.h
Wyświetl plik

@ -32,6 +32,10 @@
#define FL_UNLOCK_E(x) FL_UNLOCK(x)
#define FL_AWAKE_E(x) FL_AWAKE(x)
#if !defined(NDEBUG) && !defined(NO_LOCKS)
# include <FL/Fl.H>
#endif
#ifdef NDEBUG
# define FL_LOCK(x) Fl::lock(x)
# define FL_UNLOCK(x) Fl::unlock(x)

4
src/include/font_browser.h
Wyświetl plik

@ -38,10 +38,6 @@
#include <FL/Fl_Value_Input.H>
#include <FL/Fl_Button.H>
#include <FL/Fl_Return_Button.H>
#include <FL/fl_draw.H>
#include <FL/fl_show_colormap.H>
#include <FL/Fl_Color_Chooser.H>
#include <iostream>
// Preview box for showing font
class Preview_Box : public Fl_Widget

1
src/include/globals.h
Wyświetl plik

@ -28,7 +28,6 @@
#include <stdint.h>
#include <string>
#include "fldigi-config.h"
enum state_t {
STATE_PAUSE = 0,

61
src/include/id.h
Wyświetl plik

@ -1,61 +0,0 @@
// ----------------------------------------------------------------------------
// id.h -- WATERFALL ID
//
// Copyright (C) 2006
// Dave Freese, W1HKJ
//
// This file is part of fldigi.
//
// fldigi is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// fldigi is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with fldigi; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// ----------------------------------------------------------------------------
#ifndef _ID_H
#define _ID_H
#include <string>
#include "complex.h"
using namespace std;
struct idfntchr { char c; int byte[5]; };
class id {
public:
#define NUMROWS 5
#define NUMCHARS 2
#define NUMTONES 5
#define TONESPACING 6
#define IDSYMLEN 3072
private:
static idfntchr idch[];
static int mask[];
static double w[];
static double txpulse[];
static double outbuf[];
void make_pulse(double samplerate);
void make_tones(double frequency, double samplerate);
void send(long int);
void sendchars(std::string);
public:
id();
~id();
void text(string s, double frequency, int samplerate);
};
#endif

1
src/include/locator.h
Wyświetl plik

@ -5,7 +5,6 @@
#if USE_HAMLIB
# include <hamlib/rotator.h>
#else
# ifdef __cplusplus
extern "C" {

2
src/include/logbook.h
Wyświetl plik

@ -1,10 +1,8 @@
#ifndef FL_LOGBOOK_H
#define FL_LOGBOOK_H
#include "adif_io.h"
#include "lgbook.h"
#include "logsupport.h"
#include "logbook.h"
extern void start_logbook();
extern void close_logbook();

5
src/include/logger.h
Wyświetl plik

@ -24,11 +24,6 @@
#ifndef _LOGGER_H
#define _LOGGER_H
#include <string>
using namespace std;
// IPC interface to Xlog and fl_logbook
#define LOG_MVERSION "1"

4
src/include/logsupport.h
Wyświetl plik

@ -3,9 +3,11 @@
#include <string>
#include <FL/Fl_Widget.H>
#include <FL/Fl_Menu_.H>
#include "qso_db.h"
#include "adif_io.h"
#include "date.h"
#ifdef __CYGWIN__
# define ADIF_SUFFIX "adi"

7
src/include/macroedit.h
Wyświetl plik

@ -1,9 +1,8 @@
#ifndef macroedit_h
#define macroedit_h
#ifndef MACROEDIT_H
#define MACROEDIT_H
#include <FL/Fl.H>
#include <FL/Fl_Widget.H>
#include <FL/Fl_Double_Window.H>
#include <FL/Fl_Input.H>
#include <FL/Fl_Button.H>
#include <FL/Fl_Hold_Browser.H>
#include "flinput2.h"

28
src/include/macros.h
Wyświetl plik

@ -1,16 +1,8 @@
#ifndef _MACROS_H
#define _MACROS_H
#include <stdlib.h>
#include <stdio.h>
#include <iostream>
#include <fstream>
#include <string>
#include "main.h"
using namespace std;
#define NUMMACKEYS 12
#define NUMKEYROWS 4
#define MAXMACROS (NUMKEYROWS * NUMMACKEYS)
@ -19,7 +11,7 @@ struct CONTESTCNTR {
int count;
char szCount[20];
char szDisp[40];
string fmt;
std::string fmt;
CONTESTCNTR() {
count = 0;
fmt = "%04d";
@ -36,14 +28,14 @@ struct CONTESTCNTR {
struct MACROTEXT {
bool changed;
string name[MAXMACROS];
string text[MAXMACROS];
int loadMacros(string filename);
std::string name[MAXMACROS];
std::string text[MAXMACROS];
int loadMacros(const std::string& filename);
void loadDefault();
void openMacroFile();
void saveMacroFile();
void saveMacros(string);
string expandMacro(int n);
void saveMacros(const std::string& fname);
std::string expandMacro(int n);
void execute(int n);
MACROTEXT() {
changed = false;
@ -55,14 +47,14 @@ struct MACROTEXT {
}
}
private:
string expanded;
void loadnewMACROS(string &s, size_t &i);
std::string expanded;
void loadnewMACROS(std::string& s, size_t &i);
};
extern MACROTEXT macros;
extern CONTESTCNTR contest_count;
extern string info1msg;
extern string info2msg;
extern std::string info1msg;
extern std::string info2msg;
#endif

58
src/include/main.h
Wyświetl plik

@ -1,54 +1,45 @@
#ifndef _MAIN_H
#define _MAIN_H
#ifndef MAIN_H_
#define MAIN_H_
#include <config.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <stdio.h>
#include <sys/time.h>
#include <string>
#include <glob.h>
#include <FL/Fl_Double_Window.H>
#include <FL/filename.H>
#include "trx.h"
#include "modem.h"
#include "fl_digi.h"
#include <string>
#include "ptt.h"
#include "log.h"
#if USE_HAMLIB
#include "rigclass.h"
# include "rigclass.h"
#endif
extern string appname;
extern string HomeDir;
extern string RigsDir;
extern string ScriptsDir;
extern string PalettesDir;
extern string LogsDir;
extern string PicsDir;
extern string HelpDir;
extern string MacrosDir;
extern string WrapDir;
extern string TalkDir;
extern string TempDir;
extern string PskMailDir;
extern std::string appname;
extern std::string HomeDir;
extern std::string RigsDir;
extern std::string ScriptsDir;
extern std::string PalettesDir;
extern std::string LogsDir;
extern std::string PicsDir;
extern std::string HelpDir;
extern std::string MacrosDir;
extern std::string WrapDir;
extern std::string TalkDir;
extern std::string TempDir;
extern std::string PskMailDir;
extern string xmlfname;
extern std::string xmlfname;
extern std::string scDevice[2];
extern std::string scDevice[2];
extern PTT *push2talk;
#if USE_HAMLIB
extern Rig *xcvr;
#endif
extern cLogfile *Maillogfile;
extern cLogfile *logfile;
extern cLogfile *Maillogfile;
extern cLogfile *logfile;
extern bool gmfskmail;
extern bool arqmode;
extern string ArqFilename;
extern std::string ArqFilename;
extern bool mailclient;
extern bool mailserver;
extern bool tlfio;
@ -79,4 +70,3 @@ extern TXMSGSTRUC txmsgst;
extern int txmsgid;
#endif

13
src/include/mfsk.h
Wyświetl plik

@ -4,7 +4,13 @@
#ifndef _MFSK_H
#define _MFSK_H
#include "trx.h"
#include <FL/Fl_Widget.H>
#include <FL/Fl_Double_Window.H>
#include <FL/Fl_Button.H>
#include <FL/Fl_Shared_Image.H>
#include "globals.h"
#include "modem.h"
#include "fft.h"
#include "filters.h"
#include "interleave.h"
@ -12,11 +18,8 @@
#include "complex.h"
#include "mfskvaricode.h"
#include "mbuffer.h"
//#include "fileselect.h"
#include "picture.h"
#include <FL/Fl_Shared_Image.H>
#define MFSKSampleRate 8000

4
src/include/misc.h
Wyświetl plik

@ -25,7 +25,7 @@
#ifndef _MISC_H
#define _MISC_H
#include <math.h>
#include <cmath>
extern unsigned long hweight32(unsigned long w);
extern unsigned short int hweight16(unsigned short int w);
@ -97,4 +97,6 @@ void BlackmanWindow(double *array, int n);
// Simple about effective as Hamming or Hanning
void TriangularWindow(double *array, int n);
#define fftabs(a,b) sqrt((a)*(a) + (b)*(b))
#endif

7
src/include/modem.h
Wyświetl plik

@ -7,14 +7,9 @@
#include "threads.h"
#include "misc.h"
#include "sound.h"
#include "waterfall.h"
#include "fl_digi.h"
#include "digiscope.h"
#include "globals.h"
#include "fl_digi.h"
#include "fldigi-config.h"
#include "morse.h"
#define OUTBUFSIZE 16384

5
src/include/morse.h
Wyświetl plik

@ -31,11 +31,6 @@
#ifndef _MORSE_H
#define _MORSE_H
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#define MorseTableSize 256
#define CW_ENTRY_NULL 0

6
src/include/mt63.h
Wyświetl plik

@ -28,13 +28,9 @@
#ifndef MT63_MODEM_H
#define MT63_MODEM_H
#include "sound.h"
#include "confdialog.h"
#include "dsp.h"
#include "mt63base.h"
#include "trx.h"
using namespace std;
#include "modem.h"
class mt63 : public modem {
private:

2
src/include/olivia.h
Wyświetl plik

@ -28,7 +28,7 @@
#ifndef _OLIVIA_H
#define _OLIVIA_H
#include "trx.h"
#include "modem.h"
#include "jalocha/pj_mfsk.h"
class olivia : public modem {

11
src/include/picture.h
Wyświetl plik

@ -26,18 +26,9 @@
#ifndef picture_H
#define picture_H
#include <math.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <FL/Fl.H>
#include <FL/Fl_Double_Window.H>
#include <FL/Fl_Widget.H>
#include <FL/fl_draw.H>
#include <FL/Fl_Box.H>
#include "threads.h"
#include <FL/Fl_Image.H>
class picture : public Fl_Widget {
private:

3
src/include/psk.h
Wyświetl plik

@ -26,7 +26,8 @@
#define _PSK_H
#include "complex.h"
#include "trx.h"
#include "modem.h"
#include "globals.h"
#include "viterbi.h"
#include "filters.h"
#include "pskcoeff.h"

2
src/include/pskeval.h
Wyświetl plik

@ -26,9 +26,7 @@
#define _PSKEVAL_H
#include "complex.h"
#include "trx.h"
#include "filters.h"
#include "fldigi-config.h"
#include "waterfall.h"
#define FLOWER 200

1
src/include/qrunner.h
Wyświetl plik

@ -52,7 +52,6 @@ namespace qrbind {
#include "threads.h"
#include "qrunner/fqueue.h"
#include "timeops.h"
class qexception : public std::exception
{

5
src/include/qso_db.h
Wyświetl plik

@ -1,10 +1,7 @@
#ifndef QSO_DB
#define QSO_DB
#include <iostream>
#include <stdlib.h>
#include <ctype.h>
#include <iosfwd>
#include "adif_def.h"

3
src/include/raster.h
Wyświetl plik

@ -24,10 +24,7 @@
#ifndef _RASTER_H
#define _RASTER_H
#include <FL/Fl.H>
#include <FL/Fl_Double_Window.H>
#include <FL/Fl_Widget.H>
#include <FL/fl_draw.H>
class Raster : public Fl_Widget {
public:

10
src/include/rigCAT.h
Wyświetl plik

@ -1,3 +1,10 @@
#ifndef RIGCAT_H_
#define RIGCAT_H_
#ifndef RIGCATTEST
# error FIXME: file should not have been included
#endif
#include <FL/Fl.H>
#include <FL/Fl_Double_Window.H>
#include <iostream>
@ -10,5 +17,4 @@ extern string xmlfname;
extern void MilliSleep(long msecs);
#endif

11
src/include/rigsupport.h
Wyświetl plik

@ -4,21 +4,14 @@
#include <FL/Fl_Double_Window.H>
#include <string>
#include <list>
#include <sstream>
#include <iostream>
#include <ctype.h>
#include "serial.h"
#if USE_HAMLIB
#include "hamlib.h"
#endif
using namespace std;
extern Fl_Double_Window *rigcontrol;
extern string windowTitle;
extern std::string windowTitle;
extern Cserial rigio;
extern void initOptionMenus();
@ -55,7 +48,7 @@ extern bool init_rigMEM_RigDialog();
#if USE_HAMLIB
extern bool init_Hamlib_RigDialog();
extern void selMode(rmode_t m);
extern string modeString(rmode_t m);
extern std::string modeString(rmode_t m);
#endif
extern Fl_Double_Window * createRigDialog();

4
src/include/rigxml.h
Wyświetl plik

@ -3,10 +3,6 @@
#include <string>
#include <list>
#include <map>
#include <sstream>
#include <iostream>
#include <ctype.h>
struct MODE {
std::string SYMBOL;

2
src/include/ringbuffer.h
Wyświetl plik

@ -44,7 +44,7 @@
#define RINGBUFFER_H
#include <cassert>
#include <cstdlib>
#include <cstring>
#include "util.h"
template <typename T>

10
src/include/rsid.h
Wyświetl plik

@ -40,18 +40,8 @@
#ifndef RSID_H
#define RSID_H
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <stdio.h>
#include <sys/time.h>
#include <cstring>
#include <FL/Fl.H>
#include "globals.h"
#include "modem.h"
#include "fft.h"
#include "misc.h"
#define RSID_FFT_SIZE 1024
#define RSID_ARRAY_SIZE (RSID_FFT_SIZE * 2)

6
src/include/rtty.h
Wyświetl plik

@ -29,13 +29,9 @@
#include "complex.h"
#include "modem.h"
#include "trx.h"
#include "misc.h"
#include "globals.h"
#include "filters.h"
#include "fftfilt.h"
#include "digiscope.h"
//#include "id.h"
#include "mbuffer.h"
#define RTTY_SampleRate 8000
//#define RTTY_SampleRate 11025

2
src/include/status.h
Wyświetl plik

@ -37,7 +37,7 @@ struct status {
bool scopeVisible;
int scopeW;
int scopeH;
string LastMacroFile;
std::string LastMacroFile;
bool spot_recv;
bool spot_log;
bool contest;

12
src/include/table.h
Wyświetl plik

@ -26,13 +26,11 @@
#ifndef __TABLE_HH
#define __TABLE_HH
#include <Fl/Fl.H>
#include <Fl/Fl_Widget.H>
#include <Fl/Fl_Scroll.H>
#include <Fl/Fl_Scrollbar.H>
#include <Fl/Fl_Box.H>
#include <Fl/Fl_Menu_Item.H>
#include <stdlib.h>
#include <FL/Enumerations.H>
#include <FL/Fl_Widget.H>
#include <FL/Fl_Scrollbar.H>
#include <FL/Fl_Menu_Item.H>
#include <FL/Fl_Group.H>
#include <vector>
#define TABLE_WHEN_DCLICK 16

5
src/include/textio.h
Wyświetl plik

@ -1,10 +1,6 @@
#ifndef MULTIPSK_H
#define MULTIPSK_H
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include "qso_db.h"
class cTextFile {
@ -23,4 +19,3 @@ public:
};
#endif

7
src/include/thor.h
Wyświetl plik

@ -25,7 +25,8 @@
#include <string>
#include "complex.h"
#include "trx.h"
#include "modem.h"
#include "globals.h"
#include "fft.h"
#include "filters.h"
#include "fftfilt.h"
@ -42,8 +43,6 @@
#include "viterbi.h"
using namespace std;
#define THORNUMTONES 18
#define THORMAXFFTS 8
#define THORBASEFREQ 500.0
@ -128,7 +127,7 @@ protected:
int txstate;
int txprevtone;
unsigned int bitshreg;
string strSecXmtText;
std::string strSecXmtText;
unsigned int cptr;
viterbi *Dec;

2
src/include/throb.h
Wyświetl plik

@ -24,8 +24,8 @@
#ifndef _THROB_H
#define _THROB_H
#include "trx.h"
#include "modem.h"
#include "globals.h"
#include "fft.h"
#include "fftfilt.h"
#include "filters.h"

4
src/include/trx.h
Wyświetl plik

@ -27,12 +27,8 @@
#include "threads.h"
#include "modem.h"
#include "misc.h"
#include "sound.h"
#include "waterfall.h"
#include "globals.h"
#include "fl_digi.h"
#include "rsid.h"
// ----------------------------------------------------------------------------

4
src/include/viewpsk.h
Wyświetl plik

@ -26,9 +26,9 @@
#define _VIEWPSK_H
#include "complex.h"
#include "trx.h"
#include "modem.h"
#include "globals.h"
#include "filters.h"
#include "fldigi-config.h"
#include "pskeval.h"
//=====================================================================

46
src/include/waterfall.h
Wyświetl plik

@ -22,28 +22,16 @@
#ifndef _WF_H
#define _WF_H
#include <math.h>
#include <stdio.h>
#include <string.h>
#include "complex.h"
#include "fft.h"
#include "sound.h"
#include "globals.h"
#include "fldigi-config.h"
#include <FL/Fl.H>
#include <FL/fl_draw.H>
#include <FL/Fl_Widget.H>
#include <FL/Fl_Repeat_Button.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Button.H>
#include <FL/Fl_Light_Button.H>
#include <FL/Fl_Menu_Button.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Box.H>
#include <FL/Fl_Counter.H>
#include <FL/Fl_Choice.H>
#include <FL/Enumerations.H>
#include <FL/Fl_Box.H>
#include "fft.h"
#include "fldigi-config.h"
enum {
WF_FFT_RECTANGULAR, WF_FFT_BLACKMAN, WF_FFT_HAMMING,
@ -62,8 +50,6 @@ enum {
#define FFT_LEN 4096
#define SC_SMPLRATE 8000
#define fftabs(a,b) sqrt((a)*(a) + (b)*(b))
struct RGB {
uchar R;
@ -93,7 +79,7 @@ enum WFmode {
#define MAG_4 3
//enum WFspeed {FAST = 1, NORMAL = 2, SLOW = 8};
enum WFspeed {FAST = 1, NORMAL = 2, SLOW = 4, PAUSE = INT_MAX};
enum WFspeed { PAUSE = 0, FAST = 1, NORMAL = 2, SLOW = 4 };
class WFdisp : public Fl_Widget {
public:
@ -180,23 +166,7 @@ public:
drawMarker();};
int peakFreq(int f0, int delta);
double powerDensity(double f0, double bw);
void setPrefilter(int v) {
switch (v) {
case WF_FFT_RECTANGULAR: RectWindow(fftwindow, FFT_LEN*2); break;
case WF_FFT_BLACKMAN: BlackmanWindow(fftwindow, FFT_LEN*2); break;
case WF_FFT_HAMMING: HammingWindow(fftwindow, FFT_LEN*2); break;
case WF_FFT_HANNING: HanningWindow(fftwindow, FFT_LEN*2); break;
case WF_FFT_TRIANGULAR: TriangularWindow(fftwindow, FFT_LEN*2); break;
}
prefilter = v;
// switch (v) {
// case 0: wfft->setWindow(FFT_NONE); break;
// case 1: wfft->setWindow(FFT_BLACKMAN); break;
// case 2: wfft->setWindow(FFT_HAMMING); break;
// case 3: wfft->setWindow(FFT_HANNING); break;
// case 4: wfft->setWindow(FFT_TRIANGULAR); break;
// }
}
void setPrefilter(int v);
void setcolors();
double dFreq() {return dfreq;}
void redrawCursor();

7
src/include/xmlreader.h
Wyświetl plik

@ -1,4 +1,7 @@
#include <irrXML.h>
#include <string>
#include "irrXML.h"
using namespace irr;
using namespace io;
@ -15,7 +18,7 @@ public:
p=0;
}
IIrrXMLStringReader(const string &str) {
IIrrXMLStringReader(const std::string &str) {
s=str.c_str();
len = strlen(s);
p=0;

4
src/logbook/adif_io.cxx
Wyświetl plik

@ -3,8 +3,8 @@
#include <FL/fl_ask.H>
#include <string>
#include <iostream>
#include <ctime>
#include <cstring>
#include <cstdlib>
#include "adif_io.h"
#include "config.h"

8
src/logbook/calendar.cxx
Wyświetl plik

@ -1,9 +1,11 @@
#include <config.h>
#include <cstring>
#include <cstdio>
#include <cstdlib>
#include <FL/Fl.H>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <FL/Fl_Pixmap.H>
#include "pixmaps.h"
#include "calendar.h"

4
src/logbook/date.cxx
Wyświetl plik

@ -25,6 +25,10 @@
#include <config.h>
#include <iostream>
#include <cstring>
#include <ctime>
#include "date.h"
using namespace std;

1
src/logbook/lgbook.cxx
Wyświetl plik

@ -3,6 +3,7 @@
#include "gettext.h"
#include "lgbook.h"
#include <config.h>
#include <FL/Fl_Pixmap.H>
#include "logsupport.h"
#include "pixmaps.h"

2
src/logbook/lgbook.fl
Wyświetl plik

@ -7,6 +7,8 @@ header_name {.h}
code_name {.cxx}
decl {\#include <config.h>} {}
decl {\#include <FL/Fl_Pixmap.H>} {}
decl {\#include "logsupport.h"} {}
decl {\#include "pixmaps.h"} {}

17
src/logbook/logbook.cxx
Wyświetl plik

@ -1,24 +1,15 @@
#include <config.h>
#include <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Box.H>
#include <FL/filename.H>
#include <FL/x.H>
#include <FL/fl_ask.H>
#include <FL/filename.H>
#include <string>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <stdio.h>
#include <sys/time.h>
#include <unistd.h>
#include <FL/filename.H>
#include "main.h"
#include "logbook.h"
#include "configuration.h"
using namespace std;
void start_logbook ()
{
create_logbook_dialogs();

8
src/logbook/logsupport.cxx
Wyświetl plik

@ -1,14 +1,15 @@
#include <config.h>
#include <stdlib.h>
#include <string>
#include <cstring>
#include <cstdlib>
#include "main.h"
#include "modem.h"
#include "trx.h"
#include "debug.h"
#include "macros.h"
#include "status.h"
#include "spot.h"
#include "date.h"
#include "adif_io.h"
@ -23,6 +24,7 @@
#include "main.h"
#include "locator.h"
#include <FL/filename.H>
#include <FL/fl_ask.H>
using namespace std;

1
src/logbook/table.cxx
Wyświetl plik

@ -25,6 +25,7 @@
#include <config.h>
#include <FL/Fl.H>
#include <FL/fl_draw.H>
#include <stdarg.h>

8
src/logbook/textio.cxx
Wyświetl plik

@ -1,14 +1,16 @@
// textio.cxx
#include <config.h>
#include <string>
#include <iostream>
using namespace std;
#include <string>
#include <cstdio>
#include <cstring>
#include "textio.h"
#include "lgbook.h"
using namespace std;
#ifdef __CYGWIN__
static const char *szEOL = "\r\n";
#else

5
src/logger/logger.cxx
Wyświetl plik

@ -37,6 +37,9 @@
#include "lgbook.h"
#include "main.h"
#include "modem.h"
#include "waterfall.h"
#include "fl_digi.h"
#include "trx.h"
#include "debug.h"
#include "macros.h"
#include "status.h"
@ -48,6 +51,8 @@
#include <FL/fl_ask.H>
using namespace std;
//---------------------------------------------------------------------
const char *logmode;
char logdate[32];

8
src/main.cxx
Wyświetl plik

@ -33,6 +33,7 @@
# include <sys/ipc.h>
# include <sys/msg.h>
#endif
#include <sys/stat.h>
#include <sys/utsname.h>
#include <unistd.h>
#include <dirent.h>
@ -45,19 +46,16 @@
#include <FL/Fl_Window.H>
#include <FL/Fl_Shared_Image.H>
#include <FL/x.H>
#include <FL/filename.H>
#include "gettext.h"
#include "main.h"
#include "waterfall.h"
#include "fft.h"
#include "trx.h"
#include "soundconf.h"
#include "complex.h"
#include "fl_digi.h"
#include "rigio.h"
#include "globals.h"
#include "psk.h"
#include "cw.h"
#include "mfsk.h"
#include "confdialog.h"
#include "colorsfonts.h"
#include "configuration.h"

5
src/mfsk/mfsk.cxx
Wyświetl plik

@ -30,9 +30,14 @@
#include <cstring>
#include <libgen.h>
#include <FL/Fl.H>
#include "mfsk.h"
#include "modem.h"
#include "misc.h"
#include "main.h"
#include "fl_digi.h"
#include "configuration.h"
#include "status.h"
#include "trx.h"

1
src/misc/arq_io.cxx
Wyświetl plik

@ -43,6 +43,7 @@
#include "main.h"
#include "configuration.h"
#include "fl_digi.h"
#include "trx.h"
#include "arq_io.h"
#include "threads.h"

4
src/misc/benchmark.cxx
Wyświetl plik

@ -26,6 +26,7 @@
#include <string>
#include <cstdio>
#include <cstring>
#include <cstdlib>
#include <inttypes.h>
#include <sys/time.h>
@ -36,6 +37,7 @@
# include <sndfile.h>
#endif
#include "fl_digi.h"
#include "modem.h"
#include "trx.h"
#include "timeops.h"
@ -45,6 +47,8 @@
#include "benchmark.h"
using namespace std;
struct benchmark_params benchmark = { MODE_BPSK31, 1000, false, false, 0.0, 1.0, SRC_SINC_FASTEST };

5
src/misc/configuration.cxx
Wyświetl plik

@ -4,7 +4,7 @@
#include "confdialog.h"
#include "xmlreader.h"
#include "soundconf.h"
#include "waterfall.h"
#include "fl_digi.h"
#include "main.h"
#include "gettext.h"
@ -14,16 +14,13 @@
#endif
#include "rigMEM.h"
//#include "rigio.h"
#include "debug.h"
#include <FL/Fl_Tooltip.H>
#include <unistd.h>
#include <iostream>
#include <fstream>
#include <map>
#include <sstream>

1
src/misc/icons.cxx
Wyświetl plik

@ -23,6 +23,7 @@
#include <config.h>
#include "icons.h"
#include <FL/Fl.H>
#include <FL/Fl_Menu_Item.H>
#if USE_IMAGE_LABELS

2
src/misc/lookupcall.cxx
Wyświetl plik

@ -34,8 +34,6 @@
#include <cmath>
#include <cctype>
#include <FL/fl_ask.H>
#include "threads.h"
#include "misc.h"

6
src/misc/macroedit.cxx
Wyświetl plik

@ -1,5 +1,6 @@
#include <config.h>
#include <string>
#include <glob.h>
#include <sys/types.h>
#include <sys/stat.h>
@ -11,8 +12,9 @@
#include "globals.h"
#include "status.h"
#include "fileselect.h"
#include <string>
#include "fl_lock.h"
#include "fl_digi.h"
#include "main.h"
using namespace std;

8
src/misc/macros.cxx
Wyświetl plik

@ -12,8 +12,10 @@
#include "globals.h"
#include "debug.h"
#include "status.h"
#include "trx.h"
#include <FL/Fl.H>
#include <FL/filename.H>
#include "fileselect.h"
#include <ctime>
@ -23,6 +25,8 @@
#include <string>
#include <fstream>
using namespace std;
MACROTEXT macros;
CONTESTCNTR contest_count;
static bool TransmitON = false;
@ -655,7 +659,7 @@ void pCONT(string &s, size_t &i)
expand = true;
}
int MACROTEXT::loadMacros(string filename)
int MACROTEXT::loadMacros(const string& filename)
{
string mLine;
string mName;
@ -871,7 +875,7 @@ string mtext =
//\n\
";
void MACROTEXT::saveMacros(string fname) {
void MACROTEXT::saveMacros(const string& fname) {
string work;
ofstream mfile(fname.c_str());
mfile << mtext;

6
src/misc/misc.cxx
Wyświetl plik

@ -147,12 +147,6 @@ unsigned char graydecode(unsigned char data)
// ----------------------------------------------------------------------------
void MilliSleep(long msecs)
{
struct timespec tv = {0, msecs * 1000000L};
nanosleep(&tv, NULL);
}
// Rectangular - no pre filtering of data array
void RectWindow(double *array, int n) {
for (int i = 0; i < n; i++)

6
src/misc/util.cxx
Wyświetl plik

@ -170,3 +170,9 @@ const char* uint2bin(unsigned u, size_t len)
return &(*binbuf)[0];
}
void MilliSleep(long msecs)
{
struct timespec tv = {0, msecs * 1000000L};
nanosleep(&tv, NULL);
}

10
src/mt63/mt63.cxx
Wyświetl plik

@ -25,14 +25,10 @@
#include <config.h>
#include <string>
#include <iostream>
#include <FL/Fl.H>
#include <FL/fl_ask.H>
#include "mt63.h"
#include "configuration.h"
#include "fl_digi.h"
#include "status.h"
#include "mt63.h"
using namespace std;

4
src/olivia/olivia.cxx
Wyświetl plik

@ -31,8 +31,10 @@
#include <FL/fl_ask.H>
#include "olivia.h"
#include "sound.h"
#include "modem.h"
#include "fl_digi.h"
#include "misc.h"
#include "confdialog.h"
#include "status.h"

4
src/psk/psk.cxx
Wyświetl plik

@ -33,6 +33,10 @@
#include <iomanip>
#include "psk.h"
#include "main.h"
#include "fl_digi.h"
#include "trx.h"
#include "misc.h"
#include "waterfall.h"
#include "configuration.h"
#include "status.h"

2
src/psk/pskeval.cxx
Wyświetl plik

@ -21,9 +21,9 @@
// along with fldigi; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// ----------------------------------------------------------------------------
#include <iostream>
#include <config.h>
#include "fl_digi.h"
#include "pskeval.h"
using namespace std;

2
src/psk/viewpsk.cxx
Wyświetl plik

@ -37,7 +37,7 @@
#include "pskeval.h"
#include "pskcoeff.h"
#include "pskvaricode.h"
#include "waterfall.h"
#include "misc.h"
#include "configuration.h"
#include "Viewer.h"
#include "qrunner.h"

8
src/rigcontrol/hamlib.cxx
Wyświetl plik

@ -2,18 +2,14 @@
// hamlib.cxx -- Hamlib (rig control) interface for fldigi
#include <config.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <termios.h>
#include <cstdlib>
#include <string>
#include <vector>
#include <algorithm>
#include "trx.h"
#include "configuration.h"
#include "confdialog.h"
#include <FL/fl_ask.H>
#include "rigclass.h"

1
src/rigcontrol/ptt.cxx
Wyświetl plik

@ -42,6 +42,7 @@
#include <cstring>
#include <stdint.h>
#include "trx.h"
#include "ptt.h"
#include "configuration.h"
#include "rigMEM.h"

3
src/rigcontrol/rigMEM.cxx
Wyświetl plik

@ -23,11 +23,14 @@
#include "rigMEM.h"
#include "fl_digi.h"
#include "main.h"
#include "trx.h"
#include "rigsupport.h"
#include "rigdialog.h"
#include "debug.h"
using namespace std;
LOG_SET_SOURCE(debug::LOG_RIGCONTROL);
/* ---------------------------------------------------------------------- */

1
src/rigcontrol/rigio.cxx
Wyświetl plik

@ -25,6 +25,7 @@
#include "rigsupport.h"
#include "rigdialog.h"
#include "rigxml.h"
#include "trx.h"
#include "serial.h"
#include "rigio.h"
#include "debug.h"

4
src/rigcontrol/rigsupport.cxx
Wyświetl plik

@ -11,7 +11,9 @@
#include <config.h>
#include <fstream>
#include <sstream>
#include <vector>
#include <list>
#include <map>
#include <algorithm>
#include <iterator>
@ -25,6 +27,8 @@
#include "threads.h"
#include "main.h"
#include "fl_digi.h"
#include "trx.h"
#include "configuration.h"

Some files were not shown because too many files have changed in this diff Show More