From da2713fb8a687a13d7ef66ddb5407d10d5f892bd Mon Sep 17 00:00:00 2001
From: Marek Blok <Marek.Blok@pg.edu.pl>
Date: Fri, 14 Apr 2023 20:48:17 +0200
Subject: [PATCH] removed using namespace std
---
.vscode/settings.json | 8 +-
CHANGELOG | 2 +
examples/DSPElib_examples.cpp | 244 +++++------
examples/asynchronous.cpp | 10 +-
examples/callbacks.cpp | 6 +-
examples/echo.cpp | 10 +-
examples/hello.cpp | 10 +-
examples/macro_example.cpp | 6 +-
examples/multirate.cpp | 6 +-
examples/socket_client.cpp | 6 +-
examples/socket_client_2.cpp | 8 +-
examples/socket_server.cpp | 6 +-
examples/socket_server_2.cpp | 8 +-
examples/sound_input.cpp | 10 +-
examples/source_block_example.cpp | 18 +-
src/Main.cpp | 242 +++++-----
src/cpp/ALSA_support.cpp | 170 ++++----
src/cpp/DSP_AudioMixer.cpp | 282 ++++++------
src/cpp/DSP_DOT.cpp | 174 ++++----
src/cpp/DSP_Fourier.cpp | 6 +-
src/cpp/DSP_IO.cpp | 300 ++++++-------
src/cpp/DSP_clocks.cpp | 68 +--
src/cpp/DSP_logstream.cpp | 53 ++-
src/cpp/DSP_misc.cpp | 70 +--
src/cpp/DSP_modules.cpp | 704 +++++++++++++++---------------
src/cpp/DSP_modules2.cpp | 114 ++---
src/cpp/DSP_modules_misc.cpp | 36 +-
src/cpp/DSP_sockets.cpp | 146 +++----
src/cpp/WMM_support.cpp | 80 ++--
src/include/DSP_AudioMixer.h | 33 +-
src/include/DSP_IO.h | 32 +-
src/include/DSP_clocks.h | 12 +-
src/include/DSP_lib.h | 16 +-
src/include/DSP_logstream.h | 8 +-
src/include/DSP_misc.h | 18 +-
src/include/DSP_modules.h | 164 ++++---
src/include/DSP_modules2.h | 12 +-
src/include/DSP_modules_misc.h | 38 +-
src/include/DSP_sockets.h | 16 +-
src/include/DSP_types.h | 1 -
40 files changed, 1576 insertions(+), 1577 deletions(-)
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 420a4e7..28fcf05 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,6 @@
{
"files.associations": {
+ "Makefile": "makefile",
"optional": "cpp",
"istream": "cpp",
"ostream": "cpp",
@@ -52,7 +53,12 @@
"iterator": "cpp",
"bit": "cpp",
"numeric": "cpp",
- "random": "cpp"
+ "random": "cpp",
+ "compare": "cpp",
+ "concepts": "cpp",
+ "numbers": "cpp",
+ "semaphore": "cpp",
+ "stop_token": "cpp"
},
"C_Cpp.errorSquiggles": "Disabled"
}
\ No newline at end of file
diff --git a/CHANGELOG b/CHANGELOG
index 16dfb6f..a920d23 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,8 @@ TODO::
LAST DONE:
CHANGES:
+- ver. 0.20.024 - <b>2022.04.14</b> Changed:
+ - removed "using namespace std"
- ver. 0.20.023 - <b>2022.04.14</b> Added:
- added static methods TAudioMixer::GetNoOfWaveInDevices and TAudioMixer::GetNoOfWaveOutDevices
- ver. 0.20.022 - <b>2022.04.04</b> Added:
diff --git a/examples/DSPElib_examples.cpp b/examples/DSPElib_examples.cpp
index cc8164f..adedb93 100644
--- a/examples/DSPElib_examples.cpp
+++ b/examples/DSPElib_examples.cpp
@@ -343,8 +343,8 @@ int test_1(int argc, char* argv[])
DSP::Clock_ptr MasterClock, Fp1Zegar;
MasterClock = NULL;
- string InputName = "DSPElib.wav";
- string OutputName = "output.flt";
+ std::string InputName = "DSPElib.wav";
+ std::string OutputName = "output.flt";
// DSP::u::WaveInput WaveInput(InputName, ".", 1);
DSP::u::FileInput WaveInput(MasterClock, InputName, 1, DSP::e::SampleType::ST_float);
DSP::u::FileOutput FileOutput(OutputName, DSP::e::SampleType::ST_float, 2);
@@ -479,7 +479,7 @@ int test_1(int argc, char* argv[])
-long int CheckFs(const string &WaveName, const string &Dir)
+long int CheckFs(const std::string &WaveName, const std::string &Dir)
{
DSP::T_WAVEchunk WaveParams;
@@ -488,7 +488,7 @@ long int CheckFs(const string &WaveName, const string &Dir)
return 0;
}
-int ReadResamplerCoef(const string &name, const string &dir)
+int ReadResamplerCoef(const std::string &name, const std::string &dir)
{ //reads impulse response length
DSP::Float_vector temp;
int FilterOffset;
@@ -520,7 +520,7 @@ int ReadResamplerCoef(const string &name, const string &dir)
return N_LPF;
}
-long int ReadResamplerCoef(const string &name, const string &dir,
+long int ReadResamplerCoef(const std::string &name, const std::string &dir,
long int N_LPF_in, DSP::Float_vector &h_LPF)
{
long int Fs;
@@ -557,7 +557,7 @@ long int ReadResamplerCoef(const string &name, const string &dir,
return Fs;
}
-int ReadIIRCoef(const string &name, const string &dir)
+int ReadIIRCoef(const std::string &name, const std::string &dir)
{ //Read IIR filter order
DSP::Float_vector temp;
DWORD ile;
@@ -569,7 +569,7 @@ int ReadIIRCoef(const string &name, const string &dir)
return (int)temp[0];
}
-int ReadIIRCoef(const string &name, const string &dir, unsigned long Order,
+int ReadIIRCoef(const std::string &name, const std::string &dir, unsigned long Order,
DSP::Complex_vector &A, DSP::Complex_vector &B)
{ //returns mean bandpass group delay (int)
DSP::Float_vector temp;
@@ -585,7 +585,7 @@ int ReadIIRCoef(const string &name, const string &dir, unsigned long Order,
return (int)temp[0];
}
-void Process(long int Fs, const string &WaveName, const string &Dir, char* tekst = NULL)
+void Process(long int Fs, const std::string &WaveName, const std::string &Dir, char* tekst = NULL)
{
int ind;
@@ -598,7 +598,7 @@ void Process(long int Fs, const string &WaveName, const string &Dir, char* tekst
int IIR_order[5], IIR_delay[5];
DSP::Complex_vector IIR_A[5], IIR_B[5];
- string IIR_name = "IIR_1.flt";
+ std::string IIR_name = "IIR_1.flt";
long czas0, czas1, czas2;
@@ -856,7 +856,7 @@ void Process(long int Fs, const string &WaveName, const string &Dir, char* tekst
DSP::Clock::FreeClocks();
- DSP::log << "MAIN" << DSP::e::LogMode::second << "(" << czas1 - czas0 << " ms + " << czas2 - czas1 << " ms)" << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << "(" << czas1 - czas0 << " ms + " << czas2 - czas1 << " ms)" << std::endl;
/*! \todo DSP::u::CCPC instead of DSP::u::ABS + DSP::u::Angle
*/
}
@@ -1168,8 +1168,8 @@ int test_4()
char tekst[1024];
// char filename[]="03-pcz.wav";
- string filename = "S2.wav";
- string dir_name = "c:/Meduza_2004/Input";
+ std::string filename = "S2.wav";
+ std::string dir_name = "c:/Meduza_2004/Input";
// char dir_name[]="e:/Meduza2004";
// char filename[]="test.wav";
// char dir_name[]=".";
@@ -1236,7 +1236,7 @@ int test_4()
/*************************************************************/
L1 = (int)(Fp1 / Fb);
sprintf(tekst, "L1=%i (Fp1=%.1fHz)", L1, Fp1);
- DSP::log << "MAIN" << DSP::e::LogMode::second << tekst << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << tekst << std::endl;
int M2 = 5;
@@ -1280,7 +1280,7 @@ int test_4()
/*************************************************************/
L2 = (int)(Fp2 / Fb);
sprintf(tekst, "L2=%i (Fp2=%.1fHz)", L2, Fp2);
- DSP::log << "MAIN" << DSP::e::LogMode::second << tekst << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << tekst << std::endl;
/*************************************************************/
// automatic gain control
@@ -1339,14 +1339,14 @@ int test_4()
for (ind_ = 0; ind_ < N_matched; ind_++)
h_matched[ind_] = 1.0f / DSP::Float(N_matched);
- vector <DSP::u::FIR*>MatchedFilters(NoOfChannels, nullptr);
- vector <DSP::u::RawDecimator*> MatchedDecimators(NoOfChannels);
- vector <DSP::u::AGC*> MatchedAGC(NoOfChannels);
- vector <DSP::u::Multiplication*> MatchedDDS_Muls(NoOfChannels - 1);
+ std::vector <DSP::u::FIR*>MatchedFilters(NoOfChannels, nullptr);
+ std::vector <DSP::u::RawDecimator*> MatchedDecimators(NoOfChannels);
+ std::vector <DSP::u::AGC*> MatchedAGC(NoOfChannels);
+ std::vector <DSP::u::Multiplication*> MatchedDDS_Muls(NoOfChannels - 1);
DSP::u::DDScos channels_Heter(FirstStageClock, true, 1.0, DSP::M_PIx2 * (dF_channel) / Fp1, 0.0);
// DSP::u::GardnerSampling GardnerSampling(L2, 0.0005, NoOfChannels);
DSP::u::GardnerSampling GardnerSampling(DSP::Float(L2), 0.01f, 1.0f, NoOfChannels);
- vector <DSP::u::CMPO*> OutputDiff(NoOfChannels);
+ std::vector <DSP::u::CMPO*> OutputDiff(NoOfChannels);
for (channel_ind = 0; channel_ind < NoOfChannels; channel_ind++)
{
MatchedFilters[channel_ind] = new DSP::u::FIR(true, h_matched);
@@ -1414,9 +1414,9 @@ int test_4()
DSP::u::FileOutput freq_errOut("outputs/freq_err.out", DSP::e::SampleType::ST_float, 1);
DSP::u::FileOutput Freq_error_zeroinsOut("outputs/Freq_error_zeroins.out", DSP::e::SampleType::ST_float, 1);
- vector <DSP::u::FileOutput*> SubchannelsOut(NoOfChannels);
- vector <DSP::u::FileOutput*> SubchannelsGardnerOut(NoOfChannels);
- vector <DSP::u::FileOutput*> SubchannelsDifferatorOut(NoOfChannels);
+ std::vector <DSP::u::FileOutput*> SubchannelsOut(NoOfChannels);
+ std::vector <DSP::u::FileOutput*> SubchannelsGardnerOut(NoOfChannels);
+ std::vector <DSP::u::FileOutput*> SubchannelsDifferatorOut(NoOfChannels);
for (channel_ind = 0; channel_ind < NoOfChannels; channel_ind++)
{
sprintf(tekst, "outputs/subchannels_%02i.out", channel_ind);
@@ -1475,7 +1475,7 @@ int test_4()
elapsed_time, 500 * (ind + 1) / elapsed_time / 1000, Fp1 / 1000,
GardnerSampling.GetSamplingPeriod());
// PilotAGC.GetPower(), (Fo-Band/2)-pilot_DCO.GetFrequency(Fp1));
- DSP::log << "MAIN" << DSP::e::LogMode::second << tekst << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << tekst << std::endl;
#ifdef WIN32
MSG temp_msg;
@@ -1504,7 +1504,7 @@ int test_4()
}
DSP::Clock::FreeClocks();
- DSP::log << DSP::e::LogMode::Error << "MAIN" << DSP::e::LogMode::second << "Finished" << endl;
+ DSP::log << DSP::e::LogMode::Error << "MAIN" << DSP::e::LogMode::second << "Finished" << std::endl;
return 0;
}
@@ -1558,10 +1558,10 @@ int test_5()
for (int temp = 0; temp < 40; temp++)
{
DSP::Clock::Execute(MasterClock, Fp / 8);
- DSP::log << "MAIN" << DSP::e::LogMode::second << temp << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << temp << std::endl;
}
- DSP::log << DSP::e::LogMode::pause << "MAIN" << DSP::e::LogMode::second << "end" << endl;
+ DSP::log << DSP::e::LogMode::pause << "MAIN" << DSP::e::LogMode::second << "end" << std::endl;
DSP::Clock::FreeClocks();
return 0;
@@ -1606,7 +1606,7 @@ int test_6()
delete tester;
delete const_;
- DSP::log << DSP::e::LogMode::Error << "MAIN" << DSP::e::LogMode::second << "end" << endl;
+ DSP::log << DSP::e::LogMode::Error << "MAIN" << DSP::e::LogMode::second << "end" << std::endl;
DSP::Clock::FreeClocks();
return 0;
@@ -1676,7 +1676,7 @@ int test_7()
DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
DSP::log.SetLogFileName("log_file.log");
- DSP::log << DSP::lib_version_string() << endl << endl;
+ DSP::log << DSP::lib_version_string() << std::endl << std::endl;
MasterClock = DSP::Clock::CreateMasterClock();
@@ -1714,7 +1714,7 @@ int test_7()
{
DSP::Clock::Execute(MasterClock, Fp / 8);
- DSP::log << "MAIN" << DSP::e::LogMode::second << temp << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << temp << std::endl;
temp++;
} while (AudioIn->GetBytesRead() != 0);
@@ -1727,7 +1727,7 @@ int test_7()
DSP::Clock::ListOfAllComponents();
DSP::Clock::FreeClocks();
- DSP::log << "MAIN" << DSP::e::LogMode::second << "end" << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << "end" << std::endl;
return 0;
}
@@ -1834,7 +1834,7 @@ void FFTout_clbk(unsigned int NoOfInputs, unsigned int NoOfOutputs, DSP::Float_v
DSP::e::SampleType::ST_float); // write to read_buffer in float format
if (counter < NoOfOutputs) {
- DSP::log << "FFTout_clbk" << DSP::e::LogMode::second << "counter(" << counter << ") < NoOfOutputs(" << NoOfOutputs << ")" << endl;
+ DSP::log << "FFTout_clbk" << DSP::e::LogMode::second << "counter(" << counter << ") < NoOfOutputs(" << NoOfOutputs << ")" << std::endl;
}
// output real samples
@@ -1852,7 +1852,7 @@ int test_9()
DSP::log.SetLogFileName("log_file.txt");
DSP::log.SetLogState(DSP::e::LogState::file | DSP::e::LogState::console);
- DSP::log << DSP::lib_version_string() << endl << endl;
+ DSP::log << DSP::lib_version_string() << std::endl << std::endl;
/*************************************************************/
/*
@@ -1906,9 +1906,9 @@ int test_9()
DSP::u::FileOutput FileOut_a("matlab/cw3_zad2.wav", DSP::e::SampleType::ST_short, 1, DSP::e::FileType::FT_wav, Fp1);
DSP::u::FileOutput FileOut_b("matlab/cw3_zad2.flt", DSP::e::SampleType::ST_float, 1, DSP::e::FileType::FT_flt, Fp1);
- stringstream tekst;
+ std::stringstream tekst;
tekst << "Fp1 = " << Fp1 << ", L_IFIR = " << L_IFIR;
- DSP::log << tekst.str() << endl;
+ DSP::log << tekst.str() << std::endl;
/*************************************************************/
@@ -1975,7 +1975,7 @@ int test_10(int argn, char* args[])
N_C = coef_info.GetSize(0);
if (N_C < 1)
{
- DSP::log << DSP::e::LogMode::Error << "No test.coef: aboarding" << endl;
+ DSP::log << DSP::e::LogMode::Error << "No test.coef: aboarding" << std::endl;
return -1;
}
else
@@ -2031,7 +2031,7 @@ int test_11(int argn, char* args[])
//DSP::log.SetLogState(DSP::e::LogState::file | DSP::e::LogState::console);
DSP::log.SetLogState(DSP::e::LogState::file);
- DSP::log << DSP::lib_version_string() << endl << endl;
+ DSP::log << DSP::lib_version_string() << std::endl << std::endl;
/*************************************************************/
long int Fp2, F_symb;
@@ -2045,7 +2045,7 @@ int test_11(int argn, char* args[])
N_rc = coef_info.GetSize(0);
if (N_rc < 1)
{
- DSP::log << DSP::e::LogMode::Error << "No cw5_zad1_h_rc.coef: aboarding" << endl;
+ DSP::log << DSP::e::LogMode::Error << "No cw5_zad1_h_rc.coef: aboarding" << std::endl;
return -1;
}
else
@@ -2068,9 +2068,9 @@ int test_11(int argn, char* args[])
unsigned int K = 32;
Fp2 = K * F_symb;
- stringstream tekst;
+ std::stringstream tekst;
tekst << "Fsymb = " << F_symb << ", Fp2 = " << Fp2 << ", L = " << K;
- DSP::log << tekst.str() << endl;
+ DSP::log << tekst.str() << std::endl;
SymbolClock = DSP::Clock::GetClock(InputClock, 1, K);
@@ -2098,20 +2098,20 @@ int test_11(int argn, char* args[])
DSP::u::FFT* fft = new DSP::u::FFT(K, false);
// filtry polifazowe
- vector <DSP::u::FIR*> H_g(K);
+ std::vector <DSP::u::FIR*> H_g(K);
for (unsigned int ind = 0; ind < K; ind++)
{
H_g[ind] = new DSP::u::FIR(h_rc, (K - 1) - ind, K);
- string name, name2;
- name = "out"; name += to_string(ind + 1);
- name2 = "in"; name2 += to_string(ind + 1);
+ std::string name, name2;
+ name = "out"; name += std::to_string(ind + 1);
+ name2 = "in"; name2 += std::to_string(ind + 1);
OutputBuffer.Output(name), H_g[ind]->Input("in");
H_g[ind]->Output("out") >> fft->Input(name2);
}
- vector<DSP::u::Vacuum*>Discard(K - 3);
+ std::vector<DSP::u::Vacuum*>Discard(K - 3);
unsigned int channel1, channel2, channel3;
channel1 = 8; channel2 = 10; channel3 = 13;
// channel1 = 1; channel2 = 31; channel3 = 32;
@@ -2147,15 +2147,15 @@ int test_11(int argn, char* args[])
// podĹÄ
cz kanaĹy wÄ
skopasmowe ST
// kanaĹ nr 8
- string name;
- name = "out"; name += to_string(channel1);
+ std::string name;
+ name = "out"; name += std::to_string(channel1);
fft->Output(name) >> PSKdecoder1.Input("in");
// kanaĹ nr 10
- name = "out"; name += to_string(channel2);
+ name = "out"; name += std::to_string(channel2);
fft->Output(name) >> PSKdecoder2.Input("in");
fft->Output(name) >> SymbData1.Input("in");
// kanaĹ nr 13
- name = "out"; name += to_string(channel3);
+ name = "out"; name += std::to_string(channel3);
fft->Output(name) >> PSKdecoder3.Input("in");
PSKdecoder1.Output("out") >> BinData1.Input("in");
@@ -2285,7 +2285,7 @@ int test_12(void)
DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
DSP::log.SetLogFileName("log_file.log");
- DSP::log << DSP::lib_version_string() << endl << endl;
+ DSP::log << DSP::lib_version_string() << std::endl << std::endl;
MasterClock = DSP::Clock::CreateMasterClock();
@@ -2335,7 +2335,7 @@ int test_12(void)
{
DSP::Clock::Execute(MasterClock, Fp / 8);
- DSP::log << "MAIN" << DSP::e::LogMode::second << temp << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << temp << std::endl;
temp++;
} while (AudioIn->GetBytesRead() != 0);
@@ -2349,13 +2349,13 @@ int test_12(void)
DSP::Clock::ListOfAllComponents();
DSP::Clock::FreeClocks();
- DSP::log << "MAIN" << DSP::e::LogMode::second << "end" << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << "end" << std::endl;
return 0;
}
int test_SolveMatrix(int mode) {
- vector<DSP::Float_vector> A_in =
+ std::vector<DSP::Float_vector> A_in =
{ {3.0, 1.0, 1.0},
{0.5, 1.0, 1.5}, // {0.5, 2.0, 1.5},
{0.1, 1.0, 0.1} }; // matrix coefficients (table of rows)
@@ -2363,10 +2363,10 @@ int test_SolveMatrix(int mode) {
DSP::Float_vector X; // vector reserved for solution
{
- DSP::log << "A=[" << endl;
+ DSP::log << "A=[" << std::endl;
for (const auto& row : A_in) {
unsigned int ind = 0;
- stringstream ss;
+ std::stringstream ss;
ss << " [";
for (const auto& val : row) {
ss << val;
@@ -2376,13 +2376,13 @@ int test_SolveMatrix(int mode) {
}
}
ss << "]";
- DSP::log << ss.str() << endl;
+ DSP::log << ss.str() << std::endl;
}
- DSP::log << " ]" << endl;
+ DSP::log << " ]" << std::endl;
}
{
unsigned int ind = 0;
- stringstream ss;
+ std::stringstream ss;
ss << "B_in = [";
for (const auto& val : B_in) {
ss << val;
@@ -2392,26 +2392,26 @@ int test_SolveMatrix(int mode) {
}
}
ss << "]";
- DSP::log << ss.str() << endl;
+ DSP::log << ss.str() << std::endl;
}
switch (mode) {
case 0:
- DSP::log << "DSP::f::SolveMatrixEqu(A_in, X, B_in);" << endl;
+ DSP::log << "DSP::f::SolveMatrixEqu(A_in, X, B_in);" << std::endl;
DSP::f::SolveMatrixEqu(A_in, X, B_in);
break;
case 1:
- DSP::log << "DSP::f::SolveMatrixEqu_prec(A_in, X, B_in);" << endl;
+ DSP::log << "DSP::f::SolveMatrixEqu_prec(A_in, X, B_in);" << std::endl;
DSP::f::SolveMatrixEqu_prec(A_in, X, B_in);
break;
default:
- DSP::log << "test_SolveMatrix" << DSP::e::LogMode::second << "unsupported mode" << endl;
+ DSP::log << "test_SolveMatrix" << DSP::e::LogMode::second << "unsupported mode" << std::endl;
break;
}
{
unsigned int ind = 0;
- stringstream ss;
+ std::stringstream ss;
ss << "X = [";
for (const auto& val : X) {
ss << val;
@@ -2421,7 +2421,7 @@ int test_SolveMatrix(int mode) {
}
}
ss << "]";
- DSP::log << ss.str() << endl;
+ DSP::log << ss.str() << std::endl;
}
// \TODO test also DSP::f::LPF_LS();
@@ -2437,7 +2437,7 @@ int test_SolveMatrix(int mode) {
}
int test_SolveMatrix_prec(int mode) {
- vector<DSP::Prec_Float_vector> A_in =
+ std::vector<DSP::Prec_Float_vector> A_in =
{ {3.0, 1.0, 1.0},
{0.5, 1.0, 1.5}, // {0.5, 2.0, 1.5},
{0.1, 1.0, 0.1} }; // matrix coefficients (table of rows)
@@ -2445,10 +2445,10 @@ int test_SolveMatrix_prec(int mode) {
DSP::Prec_Float_vector X; // vector reserved for solution
{
- DSP::log << "A=[" << endl;
+ DSP::log << "A=[" << std::endl;
for (const auto& row : A_in) {
unsigned int ind = 0;
- stringstream ss;
+ std::stringstream ss;
ss << " [";
for (const auto& val : row) {
ss << val;
@@ -2458,13 +2458,13 @@ int test_SolveMatrix_prec(int mode) {
}
}
ss << "]";
- DSP::log << ss.str() << endl;
+ DSP::log << ss.str() << std::endl;
}
- DSP::log << " ]" << endl;
+ DSP::log << " ]" << std::endl;
}
{
unsigned int ind = 0;
- stringstream ss;
+ std::stringstream ss;
ss << "B_in = [";
for (const auto& val : B_in) {
ss << val;
@@ -2474,31 +2474,31 @@ int test_SolveMatrix_prec(int mode) {
}
}
ss << "]";
- DSP::log << ss.str() << endl;
+ DSP::log << ss.str() << std::endl;
}
switch (mode) {
case 0:
- DSP::log << "DSP::f::SolveMatrixEqu_prec(A_in, X, B_in, 0);" << endl;
+ DSP::log << "DSP::f::SolveMatrixEqu_prec(A_in, X, B_in, 0);" << std::endl;
DSP::f::SolveMatrixEqu_prec(A_in, X, B_in, 0);
break;
case 1:
- DSP::log << "DSP::f::SolveMatrixEqu_prec(A_in, X, B_in, 1);" << endl;
+ DSP::log << "DSP::f::SolveMatrixEqu_prec(A_in, X, B_in, 1);" << std::endl;
DSP::f::SolveMatrixEqu_prec(A_in, X, B_in, 1);
break;
case 2:
- DSP::log << "DSP::f::SolveMatrixEqu_prec(A_in, X, B_in, 2);" << endl;
+ DSP::log << "DSP::f::SolveMatrixEqu_prec(A_in, X, B_in, 2);" << std::endl;
DSP::f::SolveMatrixEqu_prec(A_in, X, B_in, 2);
break;
default:
- DSP::log << "test_SolveMatrix_prec" << DSP::e::LogMode::second << "unsupported mode" << endl;
+ DSP::log << "test_SolveMatrix_prec" << DSP::e::LogMode::second << "unsupported mode" << std::endl;
break;
}
{
unsigned int ind = 0;
- stringstream ss;
+ std::stringstream ss;
ss << "X = [";
for (const auto& val : X) {
ss << val;
@@ -2508,7 +2508,7 @@ int test_SolveMatrix_prec(int mode) {
}
}
ss << "]";
- DSP::log << ss.str() << endl;
+ DSP::log << ss.str() << std::endl;
}
// \TODO test also DSP::f::LPF_LS();
@@ -2526,19 +2526,19 @@ int test_SolveMatrix_prec(int mode) {
int test_SymbolMapper() {
//! \TODO Need fixing: fails in release mode
DSP::Clock_ptr BitClock, SymbolClock;
- map<string, shared_ptr<DSP::Component> > blocks;
+ std::map<std::string, std::shared_ptr<DSP::Component> > blocks;
int bits_per_symbol = 3;
BitClock = DSP::Clock::CreateMasterClock();
- blocks["binary_stream"] = shared_ptr<DSP::Source>(new DSP::u::BinRand(BitClock));
+ blocks["binary_stream"] = std::shared_ptr<DSP::Source>(new DSP::u::BinRand(BitClock));
- blocks["file_bin"] = shared_ptr<DSP::Block>(new DSP::u::FileOutput("bin_input.txt", DSP::e::SampleType::ST_bit_text, 1, DSP::e::FileType::FT_raw));
+ blocks["file_bin"] = std::shared_ptr<DSP::Block>(new DSP::u::FileOutput("bin_input.txt", DSP::e::SampleType::ST_bit_text, 1, DSP::e::FileType::FT_raw));
// sources["binary_stream"]->Output("out"),blocks["file_bin"]->Input("in"));
blocks["binary_stream"]->Output("out") >> blocks["file_bin"]->Input("in");
- blocks["SPconv"] = make_shared<DSP::u::Serial2Parallel>(BitClock, bits_per_symbol);
- blocks["mapper"] = make_shared<DSP::u::SymbolMapper>(DSP::e::ModulationType::ASK, bits_per_symbol);
+ blocks["SPconv"] = std::make_shared<DSP::u::Serial2Parallel>(BitClock, bits_per_symbol);
+ blocks["mapper"] = std::make_shared<DSP::u::SymbolMapper>(DSP::e::ModulationType::ASK, bits_per_symbol);
blocks["binary_stream"]->Output("out") >> blocks["SPconv"]->Input("in");
blocks["SPconv"]->Output("out") >> blocks["mapper"]->Input("in");
@@ -2549,17 +2549,17 @@ int test_SymbolMapper() {
if (dynamic_cast<DSP::u::SymbolMapper*>(blocks["mapper"].get())->isOutputReal() == false)
noChannels = 2;
- blocks["file_symb"] = shared_ptr<DSP::Block>(new DSP::u::FileOutput("symb_output.flt", DSP::e::SampleType::ST_float, noChannels, DSP::e::FileType::FT_flt));
+ blocks["file_symb"] = std::shared_ptr<DSP::Block>(new DSP::u::FileOutput("symb_output.flt", DSP::e::SampleType::ST_float, noChannels, DSP::e::FileType::FT_flt));
blocks["mapper"]->Output("out") >> blocks["file_symb"]->Input("in");
- blocks["demapper"] = make_shared<DSP::u::SymbolDemapper>(DSP::e::ModulationType::ASK, bits_per_symbol);
+ blocks["demapper"] = std::make_shared<DSP::u::SymbolDemapper>(DSP::e::ModulationType::ASK, bits_per_symbol);
blocks["mapper"]->Output("out") >> blocks["demapper"]->Input("in");
- blocks["PSconv"] = make_shared<DSP::u::Parallel2Serial>(SymbolClock, bits_per_symbol);
+ blocks["PSconv"] = std::make_shared<DSP::u::Parallel2Serial>(SymbolClock, bits_per_symbol);
blocks["demapper"]->Output("out") >> blocks["PSconv"]->Input("in");
- blocks["file_bin_recovered"] = shared_ptr<DSP::Block>(new DSP::u::FileOutput("bin_output.flt", DSP::e::SampleType::ST_float, 1, DSP::e::FileType::FT_flt));
- blocks["file_bin_recovered2"] = shared_ptr<DSP::Block>(new DSP::u::FileOutput("bin_output.txt", DSP::e::SampleType::ST_bit_text, 1, DSP::e::FileType::FT_raw));
+ blocks["file_bin_recovered"] = std::shared_ptr<DSP::Block>(new DSP::u::FileOutput("bin_output.flt", DSP::e::SampleType::ST_float, 1, DSP::e::FileType::FT_flt));
+ blocks["file_bin_recovered2"] = std::shared_ptr<DSP::Block>(new DSP::u::FileOutput("bin_output.txt", DSP::e::SampleType::ST_bit_text, 1, DSP::e::FileType::FT_raw));
blocks["PSconv"]->Output("out") >> blocks["file_bin_recovered"]->Input("in");
blocks["PSconv"]->Output("out") >> blocks["file_bin_recovered2"]->Input("in");
@@ -2596,7 +2596,7 @@ int test_ZPSTC_cw_3()
N_rc = coef_info.GetSize(0);
if (N_rc < 1)
{
- DSP::log << DSP::e::LogMode::Error << "No cw3_zad3_h_rc.coef: aboarding" << endl;
+ DSP::log << DSP::e::LogMode::Error << "No cw3_zad3_h_rc.coef: aboarding" << std::endl;
return -1;
}
else
@@ -2610,7 +2610,7 @@ int test_ZPSTC_cw_3()
N2 = coef_info.GetSize(0);
if (N2 < 1)
{
- DSP::log << DSP::e::LogMode::Error << "No cw3_zad3_h2.coef: aboarding" << endl;
+ DSP::log << DSP::e::LogMode::Error << "No cw3_zad3_h2.coef: aboarding" << std::endl;
return -1;
}
else
@@ -2634,7 +2634,7 @@ int test_ZPSTC_cw_3()
L1 = Fp1 / F_symb;
L2 = Fp2 / Fp1;
- DSP::log << "Fsymb = " << F_symb << ", Fp1 = " << Fp1 << ", Fp2 = " << Fp2 << ", L1 = " << L1 << ", L2 = " << L2 << endl;
+ DSP::log << "Fsymb = " << F_symb << ", Fp1 = " << Fp1 << ", Fp2 = " << Fp2 << ", L1 = " << L1 << ", L2 = " << L2 << std::endl;
SecondClock = DSP::Clock::GetClock(SymbolClock, L2, 1);
@@ -2701,7 +2701,7 @@ int test_ZPSTC_cw_3()
// ********************************************************** //
int bytes_read = BinData.GetBytesRead();
- DSP::log << "BinData.GetBytesRead() = " << bytes_read << endl;
+ DSP::log << "BinData.GetBytesRead() = " << bytes_read << std::endl;
if (bytes_read > 0)
{
NoOfSamplesProcessed = 0; // Play the whole file
@@ -2728,7 +2728,7 @@ int main(int argc, char* argv[])
DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
DSP::log.SetLogFileName("DSPElib_test_log.txt");
- DSP::log << "Starting SolveMatrix test" << endl;
+ DSP::log << "Starting SolveMatrix test" << std::endl;
for (auto i = 0; i < 3; i++) {
test_SolveMatrix(i);
}
@@ -2736,71 +2736,71 @@ int main(int argc, char* argv[])
test_SolveMatrix_prec(i);
}
//! \TODO test DSP::f::LPF_LS
- DSP::log << DSP::e::LogMode::pause << "Finished SolveMatrix test" << endl << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished SolveMatrix test" << std::endl << std::endl;
- DSP::log << "Starting SymbolMapper test" << endl;
+ DSP::log << "Starting SymbolMapper test" << std::endl;
test_SymbolMapper();
- DSP::log << DSP::e::LogMode::pause << "Finished SymbolMapper test" << endl << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished SymbolMapper test" << std::endl << std::endl;
- DSP::log << "Starting test_ZPSTC_cw_3" << endl;
+ DSP::log << "Starting test_ZPSTC_cw_3" << std::endl;
if (test_ZPSTC_cw_3() < 0) {
- DSP::log << DSP::e::LogMode::Error << "Failed test_ZPSTC_cw_3" << endl << endl;
+ DSP::log << DSP::e::LogMode::Error << "Failed test_ZPSTC_cw_3" << std::endl << std::endl;
}
else {
- DSP::log << DSP::e::LogMode::pause << "Finished test_ZPSTC_cw_3" << endl << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished test_ZPSTC_cw_3" << std::endl << std::endl;
}
//DSP::log << "Starting test_hello");
//test_hello();
- //DSP::log << DSP::e::LogMode::Error << "Finished test_hello" << endl;
+ //DSP::log << DSP::e::LogMode::Error << "Finished test_hello" << std::endl;
- DSP::log << "Starting test_1" << endl;
+ DSP::log << "Starting test_1" << std::endl;
test_1(argc, argv);
- DSP::log << DSP::e::LogMode::pause << "Finished test_1" << endl << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished test_1" << std::endl << std::endl;
- DSP::log << "Starting test_2" << endl;
+ DSP::log << "Starting test_2" << std::endl;
test_2();
- DSP::log << DSP::e::LogMode::pause << "Finished test_2" << endl << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished test_2" << std::endl << std::endl;
- DSP::log << "Starting test_3" << endl;
+ DSP::log << "Starting test_3" << std::endl;
test_3();
- DSP::log << DSP::e::LogMode::pause << "Finished test_3" << endl << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished test_3" << std::endl << std::endl;
- DSP::log << "Starting test_4" << endl;
+ DSP::log << "Starting test_4" << std::endl;
test_4();
- DSP::log << DSP::e::LogMode::pause << "Finished test_4" << endl << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished test_4" << std::endl << std::endl;
- DSP::log << "Starting test_5" << endl;
+ DSP::log << "Starting test_5" << std::endl;
test_5();
- DSP::log << DSP::e::LogMode::pause << "Finished test_5" << endl << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished test_5" << std::endl << std::endl;
- DSP::log << "Starting test_6" << endl;
+ DSP::log << "Starting test_6" << std::endl;
test_6();
- DSP::log << DSP::e::LogMode::pause << "Finished test_6" << endl << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished test_6" << std::endl << std::endl;
- DSP::log << "Starting test_7" << endl;
+ DSP::log << "Starting test_7" << std::endl;
test_7();
- DSP::log << DSP::e::LogMode::pause << "Finished test_7" << endl << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished test_7" << std::endl << std::endl;
- DSP::log << "Starting test_8" << endl;
+ DSP::log << "Starting test_8" << std::endl;
test_8();
- DSP::log << DSP::e::LogMode::pause << "Finished test_8" << endl << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished test_8" << std::endl << std::endl;
- DSP::log << "Starting test_9" << endl;
+ DSP::log << "Starting test_9" << std::endl;
test_9();
- DSP::log << DSP::e::LogMode::pause << "Finished test_9" << endl << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished test_9" << std::endl << std::endl;
- DSP::log << "Starting test_10" << endl;
+ DSP::log << "Starting test_10" << std::endl;
test_10(argc, argv);
- DSP::log << DSP::e::LogMode::pause << "Finished test_10" << endl << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished test_10" << std::endl << std::endl;
- DSP::log << "Starting test_11" << endl;
+ DSP::log << "Starting test_11" << std::endl;
test_11(argc, argv);
- DSP::log << DSP::e::LogMode::pause << "Finished test_11" << endl << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished test_11" << std::endl << std::endl;
- DSP::log << "Starting test_12" << endl;
+ DSP::log << "Starting test_12" << std::endl;
test_12();
- DSP::log << DSP::e::LogMode::pause << "Finished test_12" << endl << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished test_12" << std::endl << std::endl;
}
diff --git a/examples/asynchronous.cpp b/examples/asynchronous.cpp
index 5d655d5..06128fe 100644
--- a/examples/asynchronous.cpp
+++ b/examples/asynchronous.cpp
@@ -16,7 +16,7 @@ int main(void)
DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
DSP::log.SetLogFileName("log_file.log");
- DSP::log << DSP::lib_version_string() << endl << endl;
+ DSP::log << DSP::lib_version_string() << std::endl << std::endl;
MasterClock=DSP::Clock::CreateMasterClock();
SignalActivatedClock=DSP::Clock::CreateMasterClock();
@@ -39,14 +39,14 @@ int main(void)
gain.Output("out") >> sum.Input("in1");
#ifdef use_clock_trigger
- DSP::log << endl << "Using clock trigger for clock activation" << endl << endl;
+ DSP::log << std::endl << "Using clock trigger for clock activation" << std::endl << std::endl;
DSP::u::ClockTrigger CT(MasterClock, SignalActivatedClock);
DSP::u::SampleSelector sampler(MasterClock, SignalActivatedClock, false);
sum.Output("out") >> CT.Input("act");
sampler.Output("out") >> hold.Input("in");
#else
- DSP::log << endl << "Directly using SampleSelector for clock activation" << endl << endl;
+ DSP::log << std::endl << "Directly using SampleSelector for clock activation" << std::endl << std::endl;
DSP::u::SampleSelector sampler(MasterClock, SignalActivatedClock, true);
sum.Output("out") >> sampler.Input("act");
@@ -71,7 +71,7 @@ int main(void)
{
DSP::Clock::Execute(MasterClock, Fp/8);
- DSP::log << "MAIN" << DSP::e::LogMode::second << temp << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << temp << std::endl;
temp++;
}
while (AudioIn.GetBytesRead() != 0);
@@ -79,7 +79,7 @@ int main(void)
DSP::Clock::Execute(MasterClock, Fp/8);
DSP::Clock::FreeClocks();
- DSP::log << "MAIN" << DSP::e::LogMode::second << "end" << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << "end" << std::endl;
return 0;
}
diff --git a/examples/callbacks.cpp b/examples/callbacks.cpp
index 25aa5f7..bd83267 100644
--- a/examples/callbacks.cpp
+++ b/examples/callbacks.cpp
@@ -69,7 +69,7 @@ int main(void)
DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
DSP::log.SetLogFileName("log_file.log");
- DSP::log << DSP::lib_version_string() << endl;
+ DSP::log << DSP::lib_version_string() << std::endl;
MasterClock=DSP::Clock::CreateMasterClock();
@@ -119,7 +119,7 @@ int main(void)
{
DSP::Clock::Execute(MasterClock, Fp/8);
- DSP::log << "MAIN" << DSP::e::LogMode::second << temp << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << temp << std::endl;
temp++;
}
while (AudioIn->GetBytesRead() != 0);
@@ -136,7 +136,7 @@ int main(void)
DSP::Clock::ListOfAllComponents();
DSP::Clock::FreeClocks();
- DSP::log << "MAIN" << DSP::e::LogMode::second << "end" << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << "end" << std::endl;
return 0;
}
diff --git a/examples/echo.cpp b/examples/echo.cpp
index 05f8b17..f4c6342 100644
--- a/examples/echo.cpp
+++ b/examples/echo.cpp
@@ -14,9 +14,9 @@ int main(void)
DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
DSP::log.SetLogFileName("log_file.log");
- DSP::log << DSP::lib_version_string() << endl;
- DSP::log << endl;
- DSP::log << "Hello" << DSP::e::LogMode::second << "This is echo !!!" << endl;
+ DSP::log << DSP::lib_version_string() << std::endl;
+ DSP::log << std::endl;
+ DSP::log << "Hello" << DSP::e::LogMode::second << "This is echo !!!" << std::endl;
MasterClock=DSP::Clock::CreateMasterClock();
@@ -47,7 +47,7 @@ int main(void)
{
DSP::Clock::Execute(MasterClock, Fp/8);
- DSP::log << "MAIN" << DSP::e::LogMode::second << temp << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << temp << std::endl;
if (AudioIn.GetBytesRead() == 0)
temp++;
@@ -55,7 +55,7 @@ int main(void)
while (temp < 30);
DSP::Clock::FreeClocks();
- DSP::log << "MAIN" << DSP::e::LogMode::second << "end" << endl << DSP::e::LogMode::Error << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << "end" << std::endl << DSP::e::LogMode::Error << std::endl;
return 0;
}
diff --git a/examples/hello.cpp b/examples/hello.cpp
index 2f9b40f..de411e3 100644
--- a/examples/hello.cpp
+++ b/examples/hello.cpp
@@ -13,15 +13,15 @@ int test_hello(void)
#endif // INCLUDE_DSPE_EXAMPLES
{
DSP::Clock_ptr MasterClock;
- string tekst;
+ std::string tekst;
int temp;
long int Fp;
DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
DSP::log.SetLogFileName("log_file.log");
- DSP::log << DSP::lib_version_string() << endl << endl;
- DSP::log << "Hello" << DSP::e::LogMode::second << "World !!!" << endl;
+ DSP::log << DSP::lib_version_string() << std::endl << std::endl;
+ DSP::log << "Hello" << DSP::e::LogMode::second << "World !!!" << std::endl;
MasterClock=DSP::Clock::CreateMasterClock();
@@ -44,13 +44,13 @@ int test_hello(void)
{
DSP::Clock::Execute(MasterClock, Fp/8);
- DSP::log << "MAIN" << DSP::e::LogMode::second << temp << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << temp << std::endl;
temp++;
}
while (AudioIn.GetBytesRead() != 0);
DSP::Clock::FreeClocks();
- DSP::log << DSP::e::LogMode::Error << "MAIN" << DSP::e::LogMode::second << "end" << endl;
+ DSP::log << DSP::e::LogMode::Error << "MAIN" << DSP::e::LogMode::second << "end" << std::endl;
return 0;
}
diff --git a/examples/macro_example.cpp b/examples/macro_example.cpp
index 26125e8..71df46e 100644
--- a/examples/macro_example.cpp
+++ b/examples/macro_example.cpp
@@ -61,7 +61,7 @@ int main(void)
DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
DSP::log.SetLogFileName("log_file.log");
- DSP::log << DSP::lib_version_string() << endl << endl;
+ DSP::log << DSP::lib_version_string() << std::endl << std::endl;
MasterClock=DSP::Clock::CreateMasterClock();
@@ -91,13 +91,13 @@ int main(void)
{
DSP::Clock::Execute(MasterClock, Fp/8);
- DSP::log << "MAIN" << DSP::e::LogMode::second << temp << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << temp << std::endl;
temp++;
}
while (AudioIn.GetBytesRead() != 0);
DSP::Clock::FreeClocks();
- DSP::log << "MAIN" << DSP::e::LogMode::second << "end" << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << "end" << std::endl;
return 0;
}
diff --git a/examples/multirate.cpp b/examples/multirate.cpp
index 91638e3..d11da91 100644
--- a/examples/multirate.cpp
+++ b/examples/multirate.cpp
@@ -51,7 +51,7 @@ int main(int argn, char *args[])
DSP::log.SetLogFileName("log_file.log");
DSP::log.SetLogState(DSP::e::LogState::file | DSP::e::LogState::console);
- DSP::log << DSP::lib_version_string() << endl << endl;
+ DSP::log << DSP::lib_version_string() << std::endl << std::endl;
/*************************************************************/
DSP::Clock_ptr MasterClock, OutputClock;
MasterClock=DSP::Clock::CreateMasterClock();
@@ -86,7 +86,7 @@ int main(int argn, char *args[])
if (Fp1 != 22050)
{
- DSP::log << DSP::e::LogMode::Error << "Input wave file's sampling rate must be 22050 Sa/s" << endl;
+ DSP::log << DSP::e::LogMode::Error << "Input wave file's sampling rate must be 22050 Sa/s" << std::endl;
blocks["SoundIn"].reset();
return 1;
@@ -117,7 +117,7 @@ int main(int argn, char *args[])
h_LPF_resample[n] *= L;
}
- DSP::log << "Filter coeficients files should be generated beforehand using >>multirate_filters.m<<" << endl;
+ DSP::log << "Filter coeficients files should be generated beforehand using >>multirate_filters.m<<" << std::endl;
}
else
{
diff --git a/examples/socket_client.cpp b/examples/socket_client.cpp
index 15a8e69..b269add 100644
--- a/examples/socket_client.cpp
+++ b/examples/socket_client.cpp
@@ -16,7 +16,7 @@ int main(void)
DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
DSP::log.SetLogFileName("log_file_client.log");
- DSP::log << DSP::lib_version_string() << endl << endl;
+ DSP::log << DSP::lib_version_string() << std::endl << std::endl;
MasterClock=DSP::Clock::CreateMasterClock();
@@ -41,13 +41,13 @@ int main(void)
{
DSP::Clock::Execute(MasterClock, Fp/8);
- DSP::log << "MAIN" << DSP::e::LogMode::second << temp << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << temp << std::endl;
temp++;
}
while (in_socket.GetBytesRead() != 0);
DSP::Clock::FreeClocks();
- DSP::log << DSP::e::LogMode::Error << "MAIN" << DSP::e::LogMode::second << "end" << endl;
+ DSP::log << DSP::e::LogMode::Error << "MAIN" << DSP::e::LogMode::second << "end" << std::endl;
return 0;
}
diff --git a/examples/socket_client_2.cpp b/examples/socket_client_2.cpp
index cf1095e..62f0d8e 100644
--- a/examples/socket_client_2.cpp
+++ b/examples/socket_client_2.cpp
@@ -18,13 +18,13 @@ int main(void)
DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
DSP::log.SetLogFileName("log_file_client.log");
- DSP::log << DSP::lib_version_string() << endl << endl;
+ DSP::log << DSP::lib_version_string() << std::endl << std::endl;
coef_info.Open("LPF_8000_11025.coef", "matlab");
N_SRC = coef_info.GetSize(0);
if (N_SRC < 1)
{
- DSP::log << "Filter coefficients files should be generated using >>socket_filters.m<<" << endl;
+ DSP::log << "Filter coefficients files should be generated using >>socket_filters.m<<" << std::endl;
return 1;
}
else
@@ -36,7 +36,7 @@ int main(void)
// use client socket
// DSP::u::SocketInput in_socket(MasterClock, "127.0.0.1", true, 0x00000003);
- string server_address = "127.0.0.1:10000";
+ std::string server_address = "127.0.0.1:10000";
DSP::u::SocketInput in_socket(MasterClock, server_address, true, 0x00000003);
in_socket.SetName(server_address);
Fp1 = 8000; Fp2 = 11025;
@@ -60,7 +60,7 @@ int main(void)
DSP::Clock::Execute(MasterClock, Fp1/4);
DSP::log << "MAIN" << DSP::e::LogMode::second << temp
- << " (" << in_socket.GetBytesRead() << ")" << endl;
+ << " (" << in_socket.GetBytesRead() << ")" << std::endl;
temp++;
}
while (in_socket.GetBytesRead() != 0);
diff --git a/examples/socket_server.cpp b/examples/socket_server.cpp
index 6e6a067..323ad28 100644
--- a/examples/socket_server.cpp
+++ b/examples/socket_server.cpp
@@ -17,7 +17,7 @@ int main(void)
DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
DSP::log.SetLogFileName("log_file.log");
- DSP::log << DSP::lib_version_string() << endl << endl;
+ DSP::log << DSP::lib_version_string() << std::endl << std::endl;
MasterClock=DSP::Clock::CreateMasterClock();
@@ -53,13 +53,13 @@ int main(void)
{
DSP::Clock::Execute(MasterClock, Fp/8);
- DSP::log << "MAIN" << DSP::e::LogMode::second << temp << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << temp << std::endl;
temp++;
}
while (temp < 100); //(AudioIn.GetBytesRead() != 0);
DSP::Clock::FreeClocks();
- DSP::log << DSP::e::LogMode::Error << "MAIN" << DSP::e::LogMode::second << "end" << endl;
+ DSP::log << DSP::e::LogMode::Error << "MAIN" << DSP::e::LogMode::second << "end" << std::endl;
//! \bug socket will be closed at application finish not at processing end
return 0;
diff --git a/examples/socket_server_2.cpp b/examples/socket_server_2.cpp
index 857fd79..9fc21c6 100644
--- a/examples/socket_server_2.cpp
+++ b/examples/socket_server_2.cpp
@@ -17,7 +17,7 @@ int main(void)
DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
DSP::log.SetLogFileName("log_file.log");
- DSP::log << DSP::lib_version_string() << endl << endl;
+ DSP::log << DSP::lib_version_string() << std::endl << std::endl;
MasterClock = DSP::Clock::CreateMasterClock();
@@ -40,7 +40,7 @@ int main(void)
// use server socket
// DSP::u::SocketOutput out_socket("0.0.0.0", false, 0x00000003);
- string bind_address = "0.0.0.0:10000";
+ std::string bind_address = "0.0.0.0:10000";
DSP::u::SocketOutput out_socket(bind_address, false, 0x00000003);
out_socket.SetName(bind_address);
Mul.Output("out") >> out_socket.Input("in");
@@ -62,14 +62,14 @@ int main(void)
{
DSP::Clock::Execute(MasterClock, Fp/8);
- DSP::log << "MAIN" << DSP::e::LogMode::second << temp << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << temp << std::endl;
temp++;
}
while (temp < 200); //(AudioIn.GetBytesRead() != 0);
DSP::Clock::FreeClocks();
- DSP::log << DSP::e::LogMode::Error << "MAIN" << DSP::e::LogMode::second << "end" << endl;
+ DSP::log << DSP::e::LogMode::Error << "MAIN" << DSP::e::LogMode::second << "end" << std::endl;
//! \bug socket will be closed at application finish not at processing end
return 0;
diff --git a/examples/sound_input.cpp b/examples/sound_input.cpp
index 99daf24..802a4cf 100644
--- a/examples/sound_input.cpp
+++ b/examples/sound_input.cpp
@@ -17,15 +17,15 @@ int test_sound_input(bool use_audio_output)
#endif // INCLUDE_DSPE_EXAMPLES
DSP::Clock_ptr MasterClock, AudioInClock;
- string tekst;
+ std::string tekst;
int temp;
long int Fp, Fp2;
DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
DSP::log.SetLogFileName("log_file.log");
- DSP::log << DSP::lib_version_string() << endl << endl;
- DSP::log << "Sound input example" << endl;
+ DSP::log << DSP::lib_version_string() << std::endl << std::endl;
+ DSP::log << "Sound input example" << std::endl;
MasterClock=DSP::Clock::CreateMasterClock();
@@ -61,14 +61,14 @@ int test_sound_input(bool use_audio_output)
{
DSP::Clock::Execute(MasterClock, Fp/8);
- DSP::log << "MAIN" << DSP::e::LogMode::second << temp << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << temp << std::endl;
temp++;
}
while ((temp <= 8) || (WaveIn.GetBytesRead() != 0));
AudioOut.reset();
DSP::Clock::FreeClocks();
- DSP::log << DSP::e::LogMode::Error << "MAIN" << DSP::e::LogMode::second << "end" << endl;
+ DSP::log << DSP::e::LogMode::Error << "MAIN" << DSP::e::LogMode::second << "end" << std::endl;
return 0;
}
diff --git a/examples/source_block_example.cpp b/examples/source_block_example.cpp
index e7c565b..e1d1973 100644
--- a/examples/source_block_example.cpp
+++ b/examples/source_block_example.cpp
@@ -113,9 +113,9 @@ DSP::u::Const::Const(DSP::Clock_ptr ParentClock,
int NoOfOutputs_in, DSP::Float_ptr values)
: DSP::Source(ParentClock)
{
- string tekst;
+ std::string tekst;
int ind;
- vector<int> temp_int;
+ std::vector<int> temp_int;
SetName("Const", false);
@@ -123,9 +123,9 @@ DSP::u::Const::Const(DSP::Clock_ptr ParentClock,
temp_int = new int[NoOfOutputs_in];
for (ind = 0; ind < NoOfOutputs_in; ind++)
{
- tekst = "out" + to_string(ind+1);
+ tekst = "out" + std::to_string(ind+1);
DefineOutput(tekst, ind);
- tekst = "out" + to_string(ind+1) + ".re";
+ tekst = "out" + std::to_string(ind+1) + ".re";
DefineOutput(tekst, ind);
temp_int.push_back(ind);
@@ -148,9 +148,9 @@ DSP::u::Const::Const(DSP::Clock_ptr ParentClock,
int NoOfOutputs_in, DSP::Complex_ptr values)
: DSP::Source(ParentClock)
{
- string tekst;
+ std::string tekst;
int ind;
- vector<int> temp_int;
+ std::vector<int> temp_int;
SetName("Const", false);
@@ -158,11 +158,11 @@ DSP::u::Const::Const(DSP::Clock_ptr ParentClock,
temp_int = new int[2*NoOfOutputs_in];
for (ind = 0; ind < NoOfOutputs_in; ind++)
{
- tekst = "out" + to_string(ind+1);
+ tekst = "out" + std::to_string(ind+1);
DefineOutput(tekst, 2*ind, 2*ind+1);
- tekst = "out" + to_string(ind+1) + ".re";
+ tekst = "out" + std::to_string(ind+1) + ".re";
DefineOutput(tekst, 2*ind);
- tekst = "out" + to_string(ind+1) + ".im";
+ tekst = "out" + std::to_string(ind+1) + ".im";
DefineOutput(tekst, 2*ind+1);
temp_int.push_back(ind);
diff --git a/src/Main.cpp b/src/Main.cpp
index 3ec2569..58c7c56 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -335,8 +335,8 @@ int test_1(int argc, char*argv[])
DSP::Clock_ptr MasterClock, Fp1Zegar;
MasterClock=NULL;
- string InputName="DSPElib.wav";
- string OutputName="output.flt";
+ std::string InputName="DSPElib.wav";
+ std::string OutputName="output.flt";
// DSP::u::WaveInput WaveInput(InputName, ".", 1);
DSP::u::FileInput WaveInput(MasterClock, InputName, 1, DSP::e::SampleType::ST_float);
DSP::u::FileOutput FileOutput(OutputName, DSP::e::SampleType::ST_float, 2);
@@ -360,9 +360,9 @@ int test_1(int argc, char*argv[])
return 0;
/*
- string InputName="input.flt";
- string CoefficientsName="hI_coef.flt";
- string OutputName="output.flt";
+ std::string InputName="input.flt";
+ std::string CoefficientsName="hI_coef.flt";
+ std::string OutputName="output.flt";
DSP::Clock_ptr Fp1Zegar, Fp2Zegar;
int N_hI;
@@ -391,8 +391,8 @@ int test_1(int argc, char*argv[])
// real input + complex coefficients // OK
// complex input + real coefficients // OK
// complex input + complex coefficients // OK
- string InputName="delta.flt";
- string InputName2="delta_im.flt";
+ std::string InputName="delta.flt";
+ std::string InputName2="delta_im.flt";
DSP::Clock_ptr MainZegar;
DSP::u::FileInput FileInput(InputName);
@@ -471,7 +471,7 @@ int test_1(int argc, char*argv[])
-long int CheckFs(const string &WaveName, const string &Dir)
+long int CheckFs(const std::string &WaveName, const std::string &Dir)
{
DSP::T_WAVEchunk WaveParams;
@@ -480,7 +480,7 @@ long int CheckFs(const string &WaveName, const string &Dir)
return 0;
}
-int ReadResamplerCoef(const string &name, const string &dir)
+int ReadResamplerCoef(const std::string &name, const std::string &dir)
{ //reads impulse response length
DSP::Float_vector temp;
int FilterOffset;
@@ -500,7 +500,7 @@ int ReadResamplerCoef(const string &name, const string &dir)
return N_LPF;
}
-long int ReadResamplerCoef(const string &name, const string &dir, DSP::Float_vector h_LPF)
+long int ReadResamplerCoef(const std::string &name, const std::string &dir, DSP::Float_vector h_LPF)
{
long int Fs;
DSP::Float_vector temp;
@@ -530,7 +530,7 @@ long int ReadResamplerCoef(const string &name, const string &dir, DSP::Float_vec
return Fs;
}
-int ReadIIRCoef(const string &name, const string &dir)
+int ReadIIRCoef(const std::string &name, const std::string &dir)
{ //Read IIR filter order
DSP::Float_vector temp(1);
unsigned long ile;
@@ -542,7 +542,7 @@ int ReadIIRCoef(const string &name, const string &dir)
return int(temp[0]);
}
-int ReadIIRCoef(const string &name, const string &dir, int Order,
+int ReadIIRCoef(const std::string &name, const std::string &dir, int Order,
DSP::Complex_vector &A, DSP::Complex_vector &B)
{ //returns mean bandpass group delay (int)
DSP::Float_vector temp;
@@ -557,7 +557,7 @@ int ReadIIRCoef(const string &name, const string &dir, int Order,
return int(temp[0]);
}
-void Process(long int Fs, const string &WaveName, const string &Dir)
+void Process(long int Fs, const std::string &WaveName, const std::string &Dir)
{
int ind;
@@ -570,7 +570,7 @@ void Process(long int Fs, const string &WaveName, const string &Dir)
int IIR_order[5], IIR_delay[5];
DSP::Complex_vector IIR_A[5], IIR_B[5];
- string IIR_name="IIR_1.flt";
+ std::string IIR_name="IIR_1.flt";
long czas0, czas1, czas2;
@@ -838,7 +838,7 @@ void Process(long int Fs, const string &WaveName, const string &Dir)
DSP::Clock::FreeClocks();
DSP::log << "MAIN" << DSP::e::LogMode::second << "(" << czas1-czas0 << " ms"
- << " + " << czas2-czas1 << " ms)" << endl;
+ << " + " << czas2-czas1 << " ms)" << std::endl;
// todo: DSP::u::CCPC instead of DSP::u::ABS + DSP::u::Angle
}
@@ -1213,7 +1213,7 @@ int test_4()
/*************************************************************/
L1=(int)(Fp1/Fb);
- DSP::log << "MAIN" << DSP::e::LogMode::second << "L1=" << L1 << " (Fp1=" << std::setprecision(1) << Fp1 << "Hz)" << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << "L1=" << L1 << " (Fp1=" << std::setprecision(1) << Fp1 << "Hz)" << std::endl;
int M2=5;
@@ -1257,7 +1257,7 @@ int test_4()
/*************************************************************/
L2=(int)(Fp2/Fb);
sprintf(tekst, "L2=%i (Fp2=%.1fHz)", L2, Fp2);
- DSP::log << "MAIN" << DSP::e::LogMode::second << tekst << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << tekst << std::endl;
/*************************************************************/
// automatic gain control
@@ -1462,7 +1462,7 @@ int test_4()
elapsed_time, float(500.0*(ind+1)/elapsed_time/1000), Fp1/1000,
GardnerSampling.GetSamplingPeriod());
// PilotAGC.GetPower(), (Fo-Band/2)-pilot_DCO.GetFrequency(Fp1));
- DSP::log << "MAIN" << DSP::e::LogMode::second << tekst << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << tekst << std::endl;
#ifdef WIN32
MSG temp_msg;
@@ -1491,7 +1491,7 @@ int test_4()
}
DSP::Clock::FreeClocks();
- DSP::log << DSP::e::LogMode::Error << "MAIN" << DSP::e::LogMode::second << "Finished" << endl;
+ DSP::log << DSP::e::LogMode::Error << "MAIN" << DSP::e::LogMode::second << "Finished" << std::endl;
return 0;
}
@@ -1545,10 +1545,10 @@ DSP::u::Addition Sum;
for (int temp=0; temp<40; temp++)
{
DSP::Clock::Execute(MasterClock, Fp/8);
- DSP::log << "MAIN" << DSP::e::LogMode::second << temp << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << temp << std::endl;
}
- DSP::log << DSP::e::LogMode::Error << "MAIN" << DSP::e::LogMode::second << "end" << endl;
+ DSP::log << DSP::e::LogMode::Error << "MAIN" << DSP::e::LogMode::second << "end" << std::endl;
DSP::Clock::FreeClocks();
return 0;
@@ -1593,7 +1593,7 @@ int test_6()
delete tester;
delete const_;
- DSP::log << DSP::e::LogMode::Error << "MAIN" << DSP::e::LogMode::second << "end" << endl;
+ DSP::log << DSP::e::LogMode::Error << "MAIN" << DSP::e::LogMode::second << "end" << std::endl;
DSP::Clock::FreeClocks();
return 0;
@@ -1663,7 +1663,7 @@ int test_7()
DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
DSP::log.SetLogFileName("log_file.log");
- DSP::log << DSP::lib_version_string() << endl << endl;
+ DSP::log << DSP::lib_version_string() << std::endl << std::endl;
MasterClock=DSP::Clock::CreateMasterClock();
@@ -1701,7 +1701,7 @@ int test_7()
{
DSP::Clock::Execute(MasterClock, Fp/8);
- DSP::log << "MAIN" << DSP::e::LogMode::second << temp << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << temp << std::endl;
temp++;
}
while (AudioIn->GetBytesRead() != 0);
@@ -1715,7 +1715,7 @@ int test_7()
DSP::Clock::ListOfAllComponents();
DSP::Clock::FreeClocks();
- DSP::log << "MAIN" << DSP::e::LogMode::second << "end" << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << "end" << std::endl;
return 0;
}
@@ -1840,7 +1840,7 @@ int test_9()
DSP::log.SetLogFileName("log_file.txt");
DSP::log.SetLogState(DSP::e::LogState::file | DSP::e::LogState::console);
- DSP::log << DSP::lib_version_string() << endl << endl;
+ DSP::log << DSP::lib_version_string() << std::endl << std::endl;
/*************************************************************/
/*
@@ -1894,7 +1894,7 @@ int test_9()
DSP::u::FileOutput FileOut_a("matlab/cw3_zad2.wav", DSP::e::SampleType::ST_short, 1, DSP::e::FileType::FT_wav, Fp1);
DSP::u::FileOutput FileOut_b("matlab/cw3_zad2.flt", DSP::e::SampleType::ST_float, 1, DSP::e::FileType::FT_flt, Fp1);
- DSP::log << "Fp1 = " << Fp1 << ", L_IFIR = " << L_IFIR << endl;
+ DSP::log << "Fp1 = " << Fp1 << ", L_IFIR = " << L_IFIR << std::endl;
/*************************************************************/
// Connections definitions
@@ -1960,7 +1960,7 @@ int test_10()
N_C = coef_info.GetSize(0);
if (N_C < 1)
{
- DSP::log << DSP::e::LogMode::Error << "No test.coef: aborting" << endl;
+ DSP::log << DSP::e::LogMode::Error << "No test.coef: aborting" << std::endl;
return -1;
}
else
@@ -2016,7 +2016,7 @@ int test_11()
//DSP::f::SetLogState(DSP_LS_file | DSP_LS_console);
DSP::log.SetLogState(DSP::e::LogState::file);
- DSP::log << DSP::lib_version_string() << endl << endl;
+ DSP::log << DSP::lib_version_string() << std::endl << std::endl;
/*************************************************************/
long int Fp2, F_symb;
@@ -2030,7 +2030,7 @@ int test_11()
N_rc = coef_info.GetSize(0);
if (N_rc < 1)
{
- DSP::log << DSP::e::LogMode::Error << "No cw5_zad1_h_rc.coef: aborting" << endl;
+ DSP::log << DSP::e::LogMode::Error << "No cw5_zad1_h_rc.coef: aborting" << std::endl;
return -1;
}
else
@@ -2053,7 +2053,7 @@ int test_11()
int K = 32;
Fp2 = K*F_symb;
- DSP::log << "Fsymb = " << F_symb << ", Fp2 = " << Fp2 << ", L = " << K << endl;
+ DSP::log << "Fsymb = " << F_symb << ", Fp2 = " << Fp2 << ", L = " << K << std::endl;
SymbolClock=DSP::Clock::GetClock(InputClock, 1, K);
@@ -2087,9 +2087,9 @@ int test_11()
{
H_g[ind] = new DSP::u::FIR(h_rc, (K-1)-ind, K);
- string name, name2;
- name = "out"; name += to_string(ind+1);
- name2 = "in"; name2 += to_string(ind+1);
+ std::string name, name2;
+ name = "out"; name += std::to_string(ind+1);
+ name2 = "in"; name2 += std::to_string(ind+1);
OutputBuffer.Output(name), H_g[ind]->Input("in");
H_g[ind]->Output("out") >> fft->Input(name2);
}
@@ -2130,15 +2130,15 @@ int test_11()
// pod��cz kana�y w�skopasmowe ST
// kanaďż˝ nr 8
- string name;
- name = "out"; name += to_string(channel1);
+ std::string name;
+ name = "out"; name += std::to_string(channel1);
fft->Output(name), PSKdecoder1.Input("in");
// kanaďż˝ nr 10
- name = "out"; name += to_string(channel2);
+ name = "out"; name += std::to_string(channel2);
fft->Output(name), PSKdecoder2.Input("in");
fft->Output(name), SymbData1.Input("in");
// kanaďż˝ nr 13
- name = "out"; name += to_string(channel3);
+ name = "out"; name += std::to_string(channel3);
fft->Output(name), PSKdecoder3.Input("in");
PSKdecoder1.Output("out") >> BinData1.Input("in");
@@ -2271,7 +2271,7 @@ int test_12(void)
DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
DSP::log.SetLogFileName("log_file.log");
- DSP::log << DSP::lib_version_string() << endl;
+ DSP::log << DSP::lib_version_string() << std::endl;
MasterClock=DSP::Clock::CreateMasterClock();
@@ -2321,7 +2321,7 @@ int test_12(void)
{
DSP::Clock::Execute(MasterClock, Fp/8);
- DSP::log << "MAIN"<< DSP::e::LogMode::second << temp << endl;
+ DSP::log << "MAIN"<< DSP::e::LogMode::second << temp << std::endl;
temp++;
}
while (AudioIn->GetBytesRead() != 0);
@@ -2336,13 +2336,13 @@ int test_12(void)
DSP::Clock::ListOfAllComponents();
DSP::Clock::FreeClocks();
- DSP::log << "MAIN" << DSP::e::LogMode::second << "end" << endl;
+ DSP::log << "MAIN" << DSP::e::LogMode::second << "end" << std::endl;
return 0;
}
int test_SolveMatrix(int mode) {
- vector<DSP::Float_vector> A_in =
+ std::vector<DSP::Float_vector> A_in =
{{3.0, 1.0, 1.0},
{0.5, 1.0, 1.5}, // {0.5, 2.0, 1.5},
{0.1, 1.0, 0.1}}; // matrix coefficients (table of rows)
@@ -2350,10 +2350,10 @@ int test_SolveMatrix(int mode) {
DSP::Float_vector X; // vector reserved for solution
{
- DSP::log << "A=[" << endl;
+ DSP::log << "A=[" << std::endl;
for (const auto &row: A_in) {
unsigned int ind = 0;
- stringstream ss;
+ std::stringstream ss;
ss << " [";
for (const auto &val: row) {
ss << val;
@@ -2363,13 +2363,13 @@ int test_SolveMatrix(int mode) {
}
}
ss << "]";
- DSP::log << ss.str() << endl;
+ DSP::log << ss.str() << std::endl;
}
- DSP::log << " ]" << endl;
+ DSP::log << " ]" << std::endl;
}
{
unsigned int ind = 0;
- stringstream ss;
+ std::stringstream ss;
ss << "B_in = [";
for (const auto &val: B_in) {
ss << val;
@@ -2379,26 +2379,26 @@ int test_SolveMatrix(int mode) {
}
}
ss << "]";
- DSP::log << ss.str() << endl;
+ DSP::log << ss.str() << std::endl;
}
switch (mode) {
case 0:
- DSP::log << "DSP::f::SolveMatrixEqu(A_in, X, B_in);" << endl;
+ DSP::log << "DSP::f::SolveMatrixEqu(A_in, X, B_in);" << std::endl;
DSP::f::SolveMatrixEqu(A_in, X, B_in);
break;
case 1:
- DSP::log << "DSP::f::SolveMatrixEqu_prec(A_in, X, B_in);" << endl;
+ DSP::log << "DSP::f::SolveMatrixEqu_prec(A_in, X, B_in);" << std::endl;
DSP::f::SolveMatrixEqu_prec(A_in, X, B_in);
break;
default:
- DSP::log << "test_SolveMatrix" << DSP::e::LogMode::second << "unsupported mode" << endl;
+ DSP::log << "test_SolveMatrix" << DSP::e::LogMode::second << "unsupported mode" << std::endl;
break;
}
{
unsigned int ind = 0;
- stringstream ss;
+ std::stringstream ss;
ss << "X = [";
for (const auto &val: X) {
ss << val;
@@ -2408,7 +2408,7 @@ int test_SolveMatrix(int mode) {
}
}
ss << "]";
- DSP::log << ss.str() << endl;
+ DSP::log << ss.str() << std::endl;
}
// \test Test also DSP::f::LPF_LS();
@@ -2424,7 +2424,7 @@ int test_SolveMatrix(int mode) {
}
int test_SolveMatrix_prec(int mode) {
- vector<DSP::Prec_Float_vector> A_in =
+ std::vector<DSP::Prec_Float_vector> A_in =
{{3.0, 1.0, 1.0},
{0.5, 1.0, 1.5}, // {0.5, 2.0, 1.5},
{0.1, 1.0, 0.1}}; // matrix coefficients (table of rows)
@@ -2432,10 +2432,10 @@ int test_SolveMatrix_prec(int mode) {
DSP::Prec_Float_vector X; // vector reserved for solution
{
- DSP::log << "A=[" << endl;
+ DSP::log << "A=[" << std::endl;
for (const auto &row: A_in) {
unsigned int ind = 0;
- stringstream ss;
+ std::stringstream ss;
ss << " [";
for (const auto &val: row) {
ss << val;
@@ -2445,13 +2445,13 @@ int test_SolveMatrix_prec(int mode) {
}
}
ss << "]";
- DSP::log << ss.str() << endl;
+ DSP::log << ss.str() << std::endl;
}
- DSP::log << " ]" << endl;
+ DSP::log << " ]" << std::endl;
}
{
unsigned int ind = 0;
- stringstream ss;
+ std::stringstream ss;
ss << "B_in = [";
for (const auto &val: B_in) {
ss << val;
@@ -2461,31 +2461,31 @@ int test_SolveMatrix_prec(int mode) {
}
}
ss << "]";
- DSP::log << ss.str() << endl;
+ DSP::log << ss.str() << std::endl;
}
switch (mode) {
case 0:
- DSP::log << "DSP::f::SolveMatrixEqu_prec(A_in, X, B_in, 0);" << endl;
+ DSP::log << "DSP::f::SolveMatrixEqu_prec(A_in, X, B_in, 0);" << std::endl;
DSP::f::SolveMatrixEqu_prec(A_in, X, B_in, 0);
break;
case 1:
- DSP::log << "DSP::f::SolveMatrixEqu_prec(A_in, X, B_in, 1);" << endl;
+ DSP::log << "DSP::f::SolveMatrixEqu_prec(A_in, X, B_in, 1);" << std::endl;
DSP::f::SolveMatrixEqu_prec(A_in, X, B_in, 1);
break;
case 2:
- DSP::log << "DSP::f::SolveMatrixEqu_prec(A_in, X, B_in, 2);" << endl;
+ DSP::log << "DSP::f::SolveMatrixEqu_prec(A_in, X, B_in, 2);" << std::endl;
DSP::f::SolveMatrixEqu_prec(A_in, X, B_in, 2);
break;
default:
- DSP::log << "test_SolveMatrix_prec" << DSP::e::LogMode::second << "unsupported mode" << endl;
+ DSP::log << "test_SolveMatrix_prec" << DSP::e::LogMode::second << "unsupported mode" << std::endl;
break;
}
{
unsigned int ind = 0;
- stringstream ss;
+ std::stringstream ss;
ss << "X = [";
for (const auto &val: X) {
ss << val;
@@ -2495,7 +2495,7 @@ int test_SolveMatrix_prec(int mode) {
}
}
ss << "]";
- DSP::log << ss.str() << endl;
+ DSP::log << ss.str() << std::endl;
}
// \TODO test also DSP::f::LPF_LS();
@@ -2512,19 +2512,19 @@ int test_SolveMatrix_prec(int mode) {
int test_SymbolMapper() {
DSP::Clock_ptr BitClock, SymbolClock;
- map<string,shared_ptr<DSP::Component> > blocks;
+ std::map<std::string,std::shared_ptr<DSP::Component> > blocks;
int bits_per_symbol = 3;
BitClock = DSP::Clock::CreateMasterClock();
- blocks["binary_stream"] = shared_ptr<DSP::Source>(new DSP::u::BinRand(BitClock));
+ blocks["binary_stream"] = std::shared_ptr<DSP::Source>(new DSP::u::BinRand(BitClock));
- blocks["file_bin"] = shared_ptr<DSP::Block>(new DSP::u::FileOutput("bin_input.txt", DSP::e::SampleType::ST_bit_text, 1, DSP::e::FileType::FT_raw));
+ blocks["file_bin"] = std::shared_ptr<DSP::Block>(new DSP::u::FileOutput("bin_input.txt", DSP::e::SampleType::ST_bit_text, 1, DSP::e::FileType::FT_raw));
// sources["binary_stream"]->Output("out"),blocks["file_bin"]->Input("in");
blocks["binary_stream"]->Output("out") >> blocks["file_bin"]->Input("in");
- blocks["SPconv"] = make_shared<DSP::u::Serial2Parallel>(BitClock, bits_per_symbol);
- blocks["mapper"] = make_shared<DSP::u::SymbolMapper>(DSP::e::ModulationType::ASK, bits_per_symbol);
+ blocks["SPconv"] = std::make_shared<DSP::u::Serial2Parallel>(BitClock, bits_per_symbol);
+ blocks["mapper"] = std::make_shared<DSP::u::SymbolMapper>(DSP::e::ModulationType::ASK, bits_per_symbol);
blocks["binary_stream"]->Output("out") >> blocks["SPconv"]->Input("in");
blocks["SPconv"]->Output("out") >> blocks["mapper"]->Input("in");
SymbolClock = blocks["mapper"]->GetOutputClock();
@@ -2535,17 +2535,17 @@ int test_SymbolMapper() {
if (dynamic_cast<DSP::u::SymbolMapper *>(blocks["mapper"].get())->isOutputReal() == false)
noChannels = 2;
- blocks["file_symb"] = shared_ptr<DSP::Block>(new DSP::u::FileOutput("symb_output.flt", DSP::e::SampleType::ST_float, noChannels, DSP::e::FileType::FT_flt));
+ blocks["file_symb"] = std::shared_ptr<DSP::Block>(new DSP::u::FileOutput("symb_output.flt", DSP::e::SampleType::ST_float, noChannels, DSP::e::FileType::FT_flt));
blocks["mapper"]->Output("out"),blocks["file_symb"]->Input("in");
- blocks["demapper"] = make_shared<DSP::u::SymbolDemapper>(DSP::e::ModulationType::ASK, bits_per_symbol);
+ blocks["demapper"] = std::make_shared<DSP::u::SymbolDemapper>(DSP::e::ModulationType::ASK, bits_per_symbol);
blocks["mapper"]->Output("out") >> blocks["demapper"]->Input("in");
- blocks["PSconv"] = make_shared<DSP::u::Parallel2Serial>(SymbolClock, bits_per_symbol);
+ blocks["PSconv"] = std::make_shared<DSP::u::Parallel2Serial>(SymbolClock, bits_per_symbol);
blocks["demapper"]->Output("out") >> blocks["PSconv"]->Input("in");
- blocks["file_bin_recovered"] = shared_ptr<DSP::Block>(new DSP::u::FileOutput("bin_output.flt", DSP::e::SampleType::ST_float, 1, DSP::e::FileType::FT_flt));
- blocks["file_bin_recovered2"] = shared_ptr<DSP::Block>(new DSP::u::FileOutput("bin_output.txt", DSP::e::SampleType::ST_bit_text, 1, DSP::e::FileType::FT_raw));
+ blocks["file_bin_recovered"] = std::shared_ptr<DSP::Block>(new DSP::u::FileOutput("bin_output.flt", DSP::e::SampleType::ST_float, 1, DSP::e::FileType::FT_flt));
+ blocks["file_bin_recovered2"] = std::shared_ptr<DSP::Block>(new DSP::u::FileOutput("bin_output.txt", DSP::e::SampleType::ST_bit_text, 1, DSP::e::FileType::FT_raw));
blocks["PSconv"]->Output("out"),blocks["file_bin_recovered"]->Input("in");
blocks["PSconv"]->Output("out"),blocks["file_bin_recovered2"]->Input("in");
@@ -2582,7 +2582,7 @@ int test_ZPSTC_cw_3()
N_rc = coef_info.GetSize(0);
if (N_rc < 1)
{
- DSP::log << DSP::e::LogMode::Error << "No cw3_zad3_h_rc.coef: aborting" << endl;
+ DSP::log << DSP::e::LogMode::Error << "No cw3_zad3_h_rc.coef: aborting" << std::endl;
return -1;
}
else
@@ -2596,7 +2596,7 @@ int test_ZPSTC_cw_3()
N2 = coef_info.GetSize(0);
if (N2 < 1)
{
- DSP::log << DSP::e::LogMode::Error << "No cw3_zad3_h2.coef: aborting" << endl;
+ DSP::log << DSP::e::LogMode::Error << "No cw3_zad3_h2.coef: aborting" << std::endl;
return -1;
}
else
@@ -2620,9 +2620,9 @@ int test_ZPSTC_cw_3()
L1 = (unsigned int)(Fp1 / F_symb);
L2 = (unsigned int)(Fp2 / Fp1);
- stringstream ss;
+ std::stringstream ss;
ss << "Fsymb = " << F_symb << ", Fp1 = " << Fp1 << ", Fp2 = " << Fp2 << ", L1 = " << L1 << ", L2 = " << L2;
- DSP::log << ss.str() << endl;
+ DSP::log << ss.str() << std::endl;
SecondClock=DSP::Clock::GetClock(SymbolClock, L2, 1);
@@ -2689,7 +2689,7 @@ int test_ZPSTC_cw_3()
// ********************************************************** //
unsigned long bytes_read = BinData.GetBytesRead();
- DSP::log << "BinData.GetBytesRead() = " << bytes_read << endl;
+ DSP::log << "BinData.GetBytesRead() = " << bytes_read << std::endl;
if (bytes_read > 0)
{
NoOfSamplesProcessed = 0; // Play the whole file
@@ -2784,7 +2784,7 @@ int test_ZPSTC_cw_3()
and writes to standard output for 5 seconds of data.
*/
- vector<int16_t> test_record() {
+ std::vector<int16_t> test_record() {
long loops;
int rc;
int frames_size;
@@ -2793,7 +2793,7 @@ int test_ZPSTC_cw_3()
unsigned int val;
int dir;
snd_pcm_uframes_t frames;
- vector<int16_t> buffer;
+ std::vector<int16_t> buffer;
/* Open PCM device for recording (capture). */
rc = snd_pcm_open(&handle, "default",
@@ -2952,15 +2952,15 @@ int main(int argc, char*argv[])
DSP::log.SetLogFileName("DSPElib_test_log.txt");
#ifdef ALSA_support_H
- DSP::log << "test ALSA" << endl;
+ DSP::log << "test ALSA" << std::endl;
test_ALSA();
#endif // ALSA_support_H
- DSP::log << "test DSP::log" << endl;
- DSP::log << "test DSP::log(2)" << DSP::e::LogMode::second << "2" << endl;
- DSP::log << DSP::e::LogMode::Error << "test DSP::log error" << endl;
+ DSP::log << "test DSP::log" << std::endl;
+ DSP::log << "test DSP::log(2)" << DSP::e::LogMode::second << "2" << std::endl;
+ DSP::log << DSP::e::LogMode::Error << "test DSP::log error" << std::endl;
- DSP::log << "Starting SolveMatrix test" << endl;
+ DSP::log << "Starting SolveMatrix test" << std::endl;
for (auto i=0; i<3; i++) {
test_SolveMatrix(i);
}
@@ -2968,74 +2968,74 @@ int main(int argc, char*argv[])
test_SolveMatrix_prec(i);
}
//! \TODO test also DSP::f::LPF_LS
- DSP::log << DSP::e::LogMode::pause << "Finished SolveMatrix test" << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished SolveMatrix test" << std::endl;
#ifdef INCLUDE_DSPE_EXAMPLES
- DSP::log << "Starting test_hello" << endl;
+ DSP::log << "Starting test_hello" << std::endl;
test_hello();
- DSP::log << DSP::e::LogMode::Error << "Finished test_hello" << endl;
+ DSP::log << DSP::e::LogMode::Error << "Finished test_hello" << std::endl;
- DSP::log << "Starting test_sound_input" << endl;
+ DSP::log << "Starting test_sound_input" << std::endl;
bool use_audio_output = false;
test_sound_input(use_audio_output);
- DSP::log << DSP::e::LogMode::Error << "Finished test_sound_input" << endl;
+ DSP::log << DSP::e::LogMode::Error << "Finished test_sound_input" << std::endl;
#endif // INCLUDE_DSPE_EXAMPLES
- DSP::log << "Starting SymbolMapper test" << endl;
+ DSP::log << "Starting SymbolMapper test" << std::endl;
test_SymbolMapper();
- DSP::log << DSP::e::LogMode::pause << "Finished SymbolMapper test" << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished SymbolMapper test" << std::endl;
- DSP::log << "Starting test_ZPSTC_cw_3" << endl;
+ DSP::log << "Starting test_ZPSTC_cw_3" << std::endl;
test_ZPSTC_cw_3();
- DSP::log << "Finished test_ZPSTC_cw_3" << DSP::e::LogMode::pause << endl;
+ DSP::log << "Finished test_ZPSTC_cw_3" << DSP::e::LogMode::pause << std::endl;
- DSP::log << "Starting test_1" << endl;
+ DSP::log << "Starting test_1" << std::endl;
test_1(argc, argv);
- DSP::log << DSP::e::LogMode::pause << "Finished test_1" << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished test_1" << std::endl;
- DSP::log << "Starting test_2" << endl;
+ DSP::log << "Starting test_2" << std::endl;
test_2();
- DSP::log << DSP::e::LogMode::pause << "Finished test_2" << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished test_2" << std::endl;
- DSP::log << "Starting test_3" << endl;
+ DSP::log << "Starting test_3" << std::endl;
test_3();
- DSP::log << DSP::e::LogMode::pause << "Finished test_3" << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished test_3" << std::endl;
- DSP::log << "Starting test_4" << endl;
+ DSP::log << "Starting test_4" << std::endl;
test_4();
- DSP::log << DSP::e::LogMode::pause << "Finished test_4" << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished test_4" << std::endl;
- DSP::log << "Starting test_5" << endl;
+ DSP::log << "Starting test_5" << std::endl;
test_5();
- DSP::log << DSP::e::LogMode::pause << "Finished test_5" << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished test_5" << std::endl;
- DSP::log << "Starting test_6" << endl;
+ DSP::log << "Starting test_6" << std::endl;
test_6();
- DSP::log << DSP::e::LogMode::pause << "Finished test_6" << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished test_6" << std::endl;
- DSP::log << "Starting test_7" << endl;
+ DSP::log << "Starting test_7" << std::endl;
test_7();
- DSP::log << DSP::e::LogMode::pause << "Finished test_7" << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished test_7" << std::endl;
- DSP::log << "Starting test_8" << endl;
+ DSP::log << "Starting test_8" << std::endl;
test_8();
- DSP::log << DSP::e::LogMode::pause << "Finished test_8" << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished test_8" << std::endl;
- DSP::log << "Starting test_9" << endl;
+ DSP::log << "Starting test_9" << std::endl;
test_9();
- DSP::log << DSP::e::LogMode::pause << "Finished test_9" << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished test_9" << std::endl;
- DSP::log << "Starting test_10" << endl;
+ DSP::log << "Starting test_10" << std::endl;
test_10();
- DSP::log << DSP::e::LogMode::pause << "Finished test_10" << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished test_10" << std::endl;
- DSP::log << "Starting test_11" << endl;
+ DSP::log << "Starting test_11" << std::endl;
test_11();
- DSP::log << DSP::e::LogMode::pause << "Finished test_11" << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished test_11" << std::endl;
- DSP::log << "Starting test_12" << endl;
+ DSP::log << "Starting test_12" << std::endl;
test_12();
- DSP::log << DSP::e::LogMode::pause << "Finished test_12" << endl;
+ DSP::log << DSP::e::LogMode::pause << "Finished test_12" << std::endl;
}
diff --git a/src/cpp/ALSA_support.cpp b/src/cpp/ALSA_support.cpp
index 002eb33..b08e264 100644
--- a/src/cpp/ALSA_support.cpp
+++ b/src/cpp/ALSA_support.cpp
@@ -110,35 +110,35 @@ void DSP::ALSA_object_t::log_driver_data()
//! For logging
int val;
- DSP::log << "ALSA library version: " << SND_LIB_VERSION_STR << endl;
+ DSP::log << "ALSA library version: " << SND_LIB_VERSION_STR << std::endl;
- DSP::log << endl;
- DSP::log << "PCM stream types:" << endl;
+ DSP::log << std::endl;
+ DSP::log << "PCM stream types:" << std::endl;
for (val = 0; val <= SND_PCM_STREAM_LAST; val++)
- DSP::log << " " << snd_pcm_stream_name((snd_pcm_stream_t)val) << endl;
+ DSP::log << " " << snd_pcm_stream_name((snd_pcm_stream_t)val) << std::endl;
- DSP::log << endl;
- DSP::log << "PCM access types:" << endl;
+ DSP::log << std::endl;
+ DSP::log << "PCM access types:" << std::endl;
for (val = 0; val <= SND_PCM_ACCESS_LAST; val++)
- DSP::log << " " << snd_pcm_access_name((snd_pcm_access_t)val) << endl;
+ DSP::log << " " << snd_pcm_access_name((snd_pcm_access_t)val) << std::endl;
- DSP::log << endl;
- DSP::log << "PCM formats:" << endl;
+ DSP::log << std::endl;
+ DSP::log << "PCM formats:" << std::endl;
for (val = 0; val <= SND_PCM_FORMAT_LAST; val++)
if (snd_pcm_format_name((snd_pcm_format_t)val) != NULL)
DSP::log << " " << snd_pcm_format_name((snd_pcm_format_t)val) <<
- "(" << snd_pcm_format_description((snd_pcm_format_t)val) << ")" << endl;
+ "(" << snd_pcm_format_description((snd_pcm_format_t)val) << ")" << std::endl;
- DSP::log << endl;
- DSP::log << "PCM subformats:" << endl;
+ DSP::log << std::endl;
+ DSP::log << "PCM subformats:" << std::endl;
for (val = 0; val <= SND_PCM_SUBFORMAT_LAST; val++)
DSP::log << " " << snd_pcm_subformat_name((snd_pcm_subformat_t)val) <<
- "(" << snd_pcm_subformat_description((snd_pcm_subformat_t)val) << ")" << endl;
+ "(" << snd_pcm_subformat_description((snd_pcm_subformat_t)val) << ")" << std::endl;
- DSP::log << endl;
- DSP::log << "PCM states: " << endl;
+ DSP::log << std::endl;
+ DSP::log << "PCM states: " << std::endl;
for (val = 0; val <= SND_PCM_STATE_LAST; val++)
- DSP::log << " " << snd_pcm_state_name((snd_pcm_state_t)val) << endl;
+ DSP::log << " " << snd_pcm_state_name((snd_pcm_state_t)val) << std::endl;
#endif // AUDIO_DEBUG_MESSAGES_ON
}
@@ -161,15 +161,15 @@ int DSP::ALSA_object_t::open_alsa_device(snd_pcm_stream_t stream_type)
close_alsa_device();
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "Opening ALSA device" << endl;
+ DSP::log << "Opening ALSA device" << std::endl;
//! \TODO Test mode: Open mode (see SND_PCM_NONBLOCK, SND_PCM_ASYNC)
if (stream_type == SND_PCM_STREAM_PLAYBACK)
- DSP::log << "Opening PCM device for playback." << endl;
+ DSP::log << "Opening PCM device for playback." << std::endl;
else
- DSP::log << "Opening PCM device for recording (capture)." << endl;
+ DSP::log << "Opening PCM device for recording (capture)." << std::endl;
#endif // AUDIO_DEBUG_MESSAGES_ON
@@ -177,7 +177,7 @@ int DSP::ALSA_object_t::open_alsa_device(snd_pcm_stream_t stream_type)
if (rc < 0)
{
- DSP::log << "Unable to open pcm device: " << snd_strerror(rc) << endl;
+ DSP::log << "Unable to open pcm device: " << snd_strerror(rc) << std::endl;
return -1;
}
@@ -195,8 +195,8 @@ int DSP::ALSA_object_t::open_alsa_device(snd_pcm_stream_t stream_type)
snd_pcm_hw_params_set_access(alsa_handle, params, SND_PCM_ACCESS_RW_INTERLEAVED);
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "Setting the SND PCM FORMAT." << endl;
- DSP::log << "Something less than 0 means an error occurance." << endl;
+ DSP::log << "Setting the SND PCM FORMAT." << std::endl;
+ DSP::log << "Something less than 0 means an error occurance." << std::endl;
#endif // AUDIO_DEBUG_MESSAGES_ON
errc = DSP::ALSA_object_t::set_snd_pcm_format(params);
@@ -221,7 +221,7 @@ int DSP::ALSA_object_t::open_alsa_device(snd_pcm_stream_t stream_type)
if (rc < 0)
{
- DSP::log << "Unable to set a buffer size with error code: " << rc << endl;
+ DSP::log << "Unable to set a buffer size with error code: " << rc << std::endl;
return -5;
}
@@ -231,12 +231,12 @@ int DSP::ALSA_object_t::open_alsa_device(snd_pcm_stream_t stream_type)
#ifdef AUDIO_DEBUG_MESSAGES_ON
if (audio_outbuffer_size_in_frames != requested_audio_outbuffer_size_in_frames)
{
- DSP::log << "Current frames value should be equal: " << requested_audio_outbuffer_size_in_frames << endl;
- DSP::log << "Frames is not equal to tmp_frames! Frames: " << audio_outbuffer_size_in_frames << endl;
+ DSP::log << "Current frames value should be equal: " << requested_audio_outbuffer_size_in_frames << std::endl;
+ DSP::log << "Frames is not equal to tmp_frames! Frames: " << audio_outbuffer_size_in_frames << std::endl;
}
else
- DSP::log << "Frames has been set correctly." << endl;
+ DSP::log << "Frames has been set correctly." << std::endl;
#endif // AUDIO_DEBUG_MESSAGES_ON
}
@@ -253,7 +253,7 @@ int DSP::ALSA_object_t::open_alsa_device(snd_pcm_stream_t stream_type)
if (rc < 0)
{
- DSP::log << "Unable to set a buffer size with error code: " << rc << endl;
+ DSP::log << "Unable to set a buffer size with error code: " << rc << std::endl;
return -5;
}
@@ -263,12 +263,12 @@ int DSP::ALSA_object_t::open_alsa_device(snd_pcm_stream_t stream_type)
#ifdef AUDIO_DEBUG_MESSAGES_ON
if (audio_inbuffer_size_in_frames != requested_audio_inbuffer_size_in_frames)
{
- DSP::log << "Current frames value should be equal: " << requested_audio_inbuffer_size_in_frames << endl;
- DSP::log << "Frames is not equal to tmp_frames! Frames: " << audio_inbuffer_size_in_frames << endl;
+ DSP::log << "Current frames value should be equal: " << requested_audio_inbuffer_size_in_frames << std::endl;
+ DSP::log << "Frames is not equal to tmp_frames! Frames: " << audio_inbuffer_size_in_frames << std::endl;
}
else
- DSP::log << "Frames has been set correctly." << endl;
+ DSP::log << "Frames has been set correctly." << std::endl;
#endif // AUDIO_DEBUG_MESSAGES_ON
}
@@ -277,8 +277,8 @@ int DSP::ALSA_object_t::open_alsa_device(snd_pcm_stream_t stream_type)
if (rc < 0)
{
- DSP::log << "Unable to set hw parameters: " << snd_strerror(rc) << endl;
- DSP::log << "Closing ALSA device" << endl;
+ DSP::log << "Unable to set hw parameters: " << snd_strerror(rc) << std::endl;
+ DSP::log << "Closing ALSA device" << std::endl;
close_alsa_device();
return -2;
@@ -292,82 +292,82 @@ int DSP::ALSA_object_t::open_alsa_device(snd_pcm_stream_t stream_type)
// ============================================================= //
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "PCM handle name = '" << snd_pcm_name(alsa_handle) << "'" << endl;
+ DSP::log << "PCM handle name = '" << snd_pcm_name(alsa_handle) << "'" << std::endl;
- DSP::log << "PCM state = " << snd_pcm_state_name(snd_pcm_state(alsa_handle)) << endl;
+ DSP::log << "PCM state = " << snd_pcm_state_name(snd_pcm_state(alsa_handle)) << std::endl;
snd_pcm_hw_params_get_access(hw_params, (snd_pcm_access_t *) &val);
- DSP::log << "access type = " << snd_pcm_access_name((snd_pcm_access_t)val) << endl;
+ DSP::log << "access type = " << snd_pcm_access_name((snd_pcm_access_t)val) << std::endl;
snd_pcm_format_t format;
snd_pcm_hw_params_get_format(hw_params, &format);
DSP::log << "format = '" << snd_pcm_format_name(format) << "' "
- << "(" << snd_pcm_format_description(format) << ")" << endl;
+ << "(" << snd_pcm_format_description(format) << ")" << std::endl;
snd_pcm_hw_params_get_subformat(hw_params, (snd_pcm_subformat_t *)&val);
DSP::log << "subformat = '" << snd_pcm_subformat_name((snd_pcm_subformat_t)val) << "' "
- << "(" << snd_pcm_subformat_description((snd_pcm_subformat_t)val) << ")" << endl;
+ << "(" << snd_pcm_subformat_description((snd_pcm_subformat_t)val) << ")" << std::endl;
snd_pcm_hw_params_get_channels(hw_params, &val);
- DSP::log << "channels = " << val << endl;
+ DSP::log << "channels = " << val << std::endl;
snd_pcm_hw_params_get_rate(hw_params, &val, &dir);
- DSP::log << "rate = " << val << " bps" << endl;
+ DSP::log << "rate = " << val << " bps" << std::endl;
snd_pcm_hw_params_get_period_time(hw_params, &val, &dir);
- DSP::log << "period time = " << val << " us" << endl;
+ DSP::log << "period time = " << val << " us" << std::endl;
snd_pcm_hw_params_get_period_size(hw_params, (snd_pcm_uframes_t *)&val, &dir);
- DSP::log << "period size = " << val << " frames" << endl;
+ DSP::log << "period size = " << val << " frames" << std::endl;
snd_pcm_hw_params_get_buffer_time(hw_params, &val, &dir);
- DSP::log << "buffer time = " << val << " us" << endl;
+ DSP::log << "buffer time = " << val << " us" << std::endl;
snd_pcm_hw_params_get_buffer_size(hw_params, (snd_pcm_uframes_t *) &val);
- DSP::log << "buffer size = " << val << " frames" << endl;
+ DSP::log << "buffer size = " << val << " frames" << std::endl;
snd_pcm_hw_params_get_periods(hw_params, &val, &dir);
- DSP::log << "periods per buffer = " << val << " frames" << endl;
+ DSP::log << "periods per buffer = " << val << " frames" << std::endl;
snd_pcm_hw_params_get_rate_numden(hw_params, &val, &val2);
- DSP::log << "exact rate = " << val << "/" << val2 << " bps" << endl;
+ DSP::log << "exact rate = " << val << "/" << val2 << " bps" << std::endl;
val = snd_pcm_hw_params_get_sbits(hw_params);
- DSP::log << "significant bits = " << val << endl;
+ DSP::log << "significant bits = " << val << std::endl;
snd_pcm_hw_params_get_tick_time(hw_params, &val, &dir); // deprecated !!!
- DSP::log << "tick time = " << val << " us" << endl;
+ DSP::log << "tick time = " << val << " us" << std::endl;
val = snd_pcm_hw_params_is_batch(hw_params);
- DSP::log << "is batch = " << val << endl;
+ DSP::log << "is batch = " << val << std::endl;
val = snd_pcm_hw_params_is_block_transfer(hw_params);
- DSP::log << "is block transfer = " << val << endl;
+ DSP::log << "is block transfer = " << val << std::endl;
val = snd_pcm_hw_params_is_double(hw_params);
- DSP::log << "is double = " << val << endl;
+ DSP::log << "is double = " << val << std::endl;
val = snd_pcm_hw_params_is_half_duplex(hw_params);
- DSP::log << "is half duplex = " << val << endl;
+ DSP::log << "is half duplex = " << val << std::endl;
val = snd_pcm_hw_params_is_joint_duplex(hw_params);
- DSP::log <<"is joint duplex = " << val << endl;
+ DSP::log <<"is joint duplex = " << val << std::endl;
val = snd_pcm_hw_params_can_overrange(hw_params);
- DSP::log << "can overrange = " << val << endl;
+ DSP::log << "can overrange = " << val << std::endl;
val = snd_pcm_hw_params_can_mmap_sample_resolution(hw_params);
- DSP::log << "can mmap = " << val << endl;
+ DSP::log << "can mmap = " << val << std::endl;
val = snd_pcm_hw_params_can_pause(hw_params);
- DSP::log << "can pause = " << val << endl;
+ DSP::log << "can pause = " << val << std::endl;
val = snd_pcm_hw_params_can_resume(hw_params);
- DSP::log << "can resume = " << val << endl;
+ DSP::log << "can resume = " << val << std::endl;
val = snd_pcm_hw_params_can_sync_start(hw_params);
- DSP::log << "can sync start = " << val << endl;
+ DSP::log << "can sync start = " << val << std::endl;
#endif // AUDIO_DEBUG_MESSAGES_ON
// snd_pcm_hw_params_free(params);
@@ -459,7 +459,7 @@ int DSP::ALSA_object_t::open_alsa_device(snd_pcm_stream_t stream_type)
break;
default:
- DSP::log << "Unsupported no of bytes in channel" << endl;
+ DSP::log << "Unsupported no of bytes in channel" << std::endl;
return -6;
break;
}
@@ -503,7 +503,7 @@ int DSP::ALSA_object_t::open_alsa_device(snd_pcm_stream_t stream_type)
break;
default:
- DSP::log << "Unsupported no of bytes in channel" << endl;
+ DSP::log << "Unsupported no of bytes in channel" << std::endl;
return -9;
break;
}
@@ -515,7 +515,7 @@ int DSP::ALSA_object_t::open_alsa_device(snd_pcm_stream_t stream_type)
if (rc < 0)
{
- DSP::log << "Unable to set blocking mode" << endl;
+ DSP::log << "Unable to set blocking mode" << std::endl;
return -7;
}
}
@@ -526,7 +526,7 @@ int DSP::ALSA_object_t::open_alsa_device(snd_pcm_stream_t stream_type)
if (rc < 0)
{
- DSP::log << "Unable to set non blocking mode" << endl;
+ DSP::log << "Unable to set non blocking mode" << std::endl;
return -8;
}
}
@@ -545,7 +545,7 @@ int DSP::ALSA_object_t::set_snd_pcm_format(snd_pcm_hw_params_t *params)
errc = snd_pcm_hw_params_set_format(alsa_handle, params, SND_PCM_FORMAT_U8);
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "Format set with error code: " << errc << endl;
+ DSP::log << "Format set with error code: " << errc << std::endl;
#endif // AUDIO_DEBUG_MESSAGES_ON
break;
@@ -563,7 +563,7 @@ int DSP::ALSA_object_t::set_snd_pcm_format(snd_pcm_hw_params_t *params)
}
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "Format set with error code: " << errc << endl;
+ DSP::log << "Format set with error code: " << errc << std::endl;
#endif // AUDIO_DEBUG_MESSAGES_ON
break;
@@ -621,7 +621,7 @@ int DSP::ALSA_object_t::set_snd_pcm_format(snd_pcm_hw_params_t *params)
}
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "Format set with error code: " << errc << endl;
+ DSP::log << "Format set with error code: " << errc << std::endl;
#endif // AUDIO_DEBUG_MESSAGES_ON
break;
@@ -639,12 +639,12 @@ int DSP::ALSA_object_t::set_snd_pcm_format(snd_pcm_hw_params_t *params)
}
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "Format set with error code: " << errc << endl;
+ DSP::log << "Format set with error code: " << errc << std::endl;
#endif // AUDIO_DEBUG_MESSAGES_ON
break;
default:
- DSP::log << "Unsupported no of bytes in channel" << endl;
+ DSP::log << "Unsupported no of bytes in channel" << std::endl;
return -1;
break;
}
@@ -671,7 +671,7 @@ long DSP::ALSA_object_t::open_PCM_device_4_output(const int &no_of_channels, int
else
{
- DSP::log << "Device has not been opened. Error code: " << rc << endl;
+ DSP::log << "Device has not been opened. Error code: " << rc << std::endl;
return -1;
}
}
@@ -694,7 +694,7 @@ long DSP::ALSA_object_t::open_PCM_device_4_input(const int &no_of_channels, int
}
else
{
- DSP::log << "Device has not been opened. Error code: " << rc << endl;
+ DSP::log << "Device has not been opened. Error code: " << rc << std::endl;
return -1;
}
}
@@ -779,7 +779,7 @@ long DSP::ALSA_object_t::append_playback_buffer(DSP::Float_vector &float_buffer)
break;
default:
- DSP::log << "Unsupported no of bytes in channel" << endl;
+ DSP::log << "Unsupported no of bytes in channel" << std::endl;
break;
// converting samples ends
@@ -800,7 +800,7 @@ long DSP::ALSA_object_t::append_playback_buffer(DSP::Float_vector &float_buffer)
IsPlayingNow = true;
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "IsPlayingNow set to true" << endl;
+ DSP::log << "IsPlayingNow set to true" << std::endl;
#endif // AUDIO_DEBUG_MESSAGES_ON
}
}
@@ -817,7 +817,7 @@ long DSP::ALSA_object_t::append_playback_buffer(DSP::Float_vector &float_buffer)
else
{
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "DSP::ALSA_object_t::append_playback_buffer error code is positive. Nothing to play." << endl;
+ DSP::log << "DSP::ALSA_object_t::append_playback_buffer error code is positive. Nothing to play." << std::endl;
#endif // AUDIO_DEBUG_MESSAGES_ON
DSP::f::Sleep(0);
@@ -914,7 +914,7 @@ bool DSP::ALSA_object_t::get_wave_in_raw_buffer(DSP::e::SampleType &InSampleType
#ifdef AUDIO_DEBUG_MESSAGES_ON
// EPIPE means underrun
- DSP::log << "Underrun occurred" << endl;
+ DSP::log << "Underrun occurred" << std::endl;
#endif // AUDIO_DEBUG_MESSAGES_ON
snd_pcm_prepare(alsa_handle);
@@ -923,7 +923,7 @@ bool DSP::ALSA_object_t::get_wave_in_raw_buffer(DSP::e::SampleType &InSampleType
case EAGAIN:
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "EAGAIN occurred. Waiting for a free buffer." << endl;
+ DSP::log << "EAGAIN occurred. Waiting for a free buffer." << std::endl;
#endif // AUDIO_DEBUG_MESSAGES_ON
DSP::f::Sleep(0);
@@ -936,7 +936,7 @@ bool DSP::ALSA_object_t::get_wave_in_raw_buffer(DSP::e::SampleType &InSampleType
pcm_buffer[ind] += rc * no_of_channels_alsa * no_of_bytes_in_channel;
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "Short read. Current rc = " << rc << "." << endl;
+ DSP::log << "Short read. Current rc = " << rc << "." << std::endl;
#endif // AUDIO_DEBUG_MESSAGES_ON
if (pcm_buffer_size_in_frames[ind] == 0)
@@ -945,7 +945,7 @@ bool DSP::ALSA_object_t::get_wave_in_raw_buffer(DSP::e::SampleType &InSampleType
std::swap(wave_in_raw_buffer, capture_buffer);
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "Inbuffer is full." << endl;
+ DSP::log << "Inbuffer is full." << std::endl;
#endif // AUDIO_DEBUG_MESSAGES_ON
pcm_buffer[ind] = (uint8_t *)(capture_buffer.data());
@@ -959,8 +959,8 @@ bool DSP::ALSA_object_t::get_wave_in_raw_buffer(DSP::e::SampleType &InSampleType
{
#ifdef AUDIO_DEBUG_MESSAGES_ON
// EPIPE means underrun
- DSP::log << "Unsupported error." << endl;
- DSP::log << "Error from readi: " << snd_strerror(rc) << endl;
+ DSP::log << "Unsupported error." << std::endl;
+ DSP::log << "Error from readi: " << snd_strerror(rc) << std::endl;
#endif // AUDIO_DEBUG_MESSAGES_ON
pcm_buffer_size_in_frames[ind] = 0;
@@ -987,7 +987,7 @@ snd_pcm_sframes_t DSP::ALSA_object_t::pcm_writei(const void *buffer, const snd_p
{
case EAGAIN:
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "EAGAIN occurred. Waiting for a free buffer." << endl;
+ DSP::log << "EAGAIN occurred. Waiting for a free buffer." << std::endl;
#endif // AUDIO_DEBUG_MESSAGES_ON
//! \TODO M.B. In the future snd_pcm_status_get_avail / snd_pcm_avail_update could be used to select sleep time
DSP::f::Sleep(0);
@@ -996,7 +996,7 @@ snd_pcm_sframes_t DSP::ALSA_object_t::pcm_writei(const void *buffer, const snd_p
case EPIPE:
#ifdef AUDIO_DEBUG_MESSAGES_ON
// EPIPE means underrun
- DSP::log << "Underrun occurred" << endl;
+ DSP::log << "Underrun occurred" << std::endl;
#endif // AUDIO_DEBUG_MESSAGES_ON
snd_pcm_prepare(alsa_handle);
@@ -1010,7 +1010,7 @@ snd_pcm_sframes_t DSP::ALSA_object_t::pcm_writei(const void *buffer, const snd_p
current_buffer += rc * no_of_channels_alsa * no_of_bytes_in_channel;
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "Short write. Current rc = " << rc << "." << endl;
+ DSP::log << "Short write. Current rc = " << rc << "." << std::endl;
#endif // AUDIO_DEBUG_MESSAGES_ON
}
@@ -1018,8 +1018,8 @@ snd_pcm_sframes_t DSP::ALSA_object_t::pcm_writei(const void *buffer, const snd_p
{
#ifdef AUDIO_DEBUG_MESSAGES_ON
// EPIPE means underrun
- DSP::log << "Unsupported error." << endl;
- DSP::log << "Error from writei: " << snd_strerror(rc) << endl;
+ DSP::log << "Unsupported error." << std::endl;
+ DSP::log << "Error from writei: " << snd_strerror(rc) << std::endl;
#endif // AUDIO_DEBUG_MESSAGES_ON
buffer_size_in_frames = 0;
@@ -1029,7 +1029,7 @@ snd_pcm_sframes_t DSP::ALSA_object_t::pcm_writei(const void *buffer, const snd_p
}
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "The end of the playback" << endl;
+ DSP::log << "The end of the playback" << std::endl;
#endif // AUDIO_DEBUG_MESSAGES_ON
return rc;
@@ -1045,7 +1045,7 @@ void DSP::ALSA_object_t::close_alsa_device(bool do_drain, bool use_log)
}
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "Closing the PCM device." << endl;
+ DSP::log << "Closing the PCM device." << std::endl;
#endif // AUDIO_DEBUG_MESSAGES_ON
snd_pcm_close(alsa_handle);
@@ -1060,7 +1060,7 @@ void DSP::ALSA_object_t::close_alsa_device(bool do_drain, bool use_log)
if (use_log == true)
{
- DSP::log << "ALSA PCM sound closed." << endl;
+ DSP::log << "ALSA PCM sound closed." << std::endl;
}
IsDeviceInputOpen = false;
diff --git a/src/cpp/DSP_AudioMixer.cpp b/src/cpp/DSP_AudioMixer.cpp
index 11354ce..02f4d90 100644
--- a/src/cpp/DSP_AudioMixer.cpp
+++ b/src/cpp/DSP_AudioMixer.cpp
@@ -15,7 +15,7 @@
//---------------------------------------------------------------------------
//#pragma package(smart_init)
-const string TAudioMixer::PCMwaveFileName= "PCM wave file";
+const std::string TAudioMixer::PCMwaveFileName= "PCM wave file";
#ifdef WIN32
UINT TAudioMixer::WaveInCaps_size = 0;
@@ -31,7 +31,7 @@ long TAudioMixer::GetNoOfWaveInDevices(void) {
return -1;
}
-string TAudioMixer::GetWaveInDevName(UINT DevNo)
+std::string TAudioMixer::GetWaveInDevName(UINT DevNo)
{
#ifdef WIN32
UINT ile;
@@ -71,7 +71,7 @@ long TAudioMixer::GetNoOfWaveOutDevices(void) {
return -1;
}
-string TAudioMixer::GetWaveOutDevName(UINT DevNo)
+std::string TAudioMixer::GetWaveOutDevName(UINT DevNo)
{
#ifdef WIN32
UINT ile;
@@ -112,8 +112,8 @@ string TAudioMixer::GetWaveOutDevName(UINT DevNo)
TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
{
#ifdef __DEBUG__
- string tekst;
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << "Mixer initialization start" << endl;
+ std::string tekst;
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << "Mixer initialization start" << std::endl;
#endif
#ifdef WIN32
@@ -157,9 +157,9 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
#ifdef __DEBUG__
{
DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second
- << "No of mixer devices:" << to_string(MixersNumber)
- << ", No of WaveIn devices:" << to_string(WaveInNumber) << ", No of WaveOut devices:"
- << to_string(WaveOutNumber) << endl;
+ << "No of mixer devices:" << std::to_string(MixersNumber)
+ << ", No of WaveIn devices:" << std::to_string(WaveInNumber) << ", No of WaveOut devices:"
+ << std::to_string(WaveOutNumber) << std::endl;
}
#endif
@@ -178,11 +178,11 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
MIXER_OBJECTF_WAVEIN); //CALLBACK_WINDOW //DWORD fdwOpen
#ifdef __DEBUG__
{
- stringstream ss;
- ss << setfill ('0') << setw(8) << hex << rs;
- tekst = "Opened mixer (MIXER_OBJECTF_WAVEIN (dev:" + to_string(WaveInDevNo)
- + "/" + to_string(WaveInNumber) + ")) / result:" + ss.str();
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << endl;
+ std::stringstream ss;
+ ss << std::setfill ('0') << std::setw(8) << std::hex << rs;
+ tekst = "Opened mixer (MIXER_OBJECTF_WAVEIN (dev:" + std::to_string(WaveInDevNo)
+ + "/" + std::to_string(WaveInNumber) + ")) / result:" + ss.str();
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << std::endl;
}
#endif
rs=mixerOpen(&hMixer_out, WaveOutDevNo,
@@ -191,11 +191,11 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
MIXER_OBJECTF_WAVEOUT); //CALLBACK_WINDOW //DWORD fdwOpen
#ifdef __DEBUG__
{
- stringstream ss;
- ss << setfill ('0') << setw(8) << hex << rs;
- tekst = "Opened mixer (MIXER_OBJECTF_WAVEOUT (dev:" + to_string(WaveOutDevNo)
- + "/" + to_string(WaveOutNumber) + ")) / result:" + ss.str();
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << endl;
+ std::stringstream ss;
+ ss << std::setfill ('0') << std::setw(8) << std::hex << rs;
+ tekst = "Opened mixer (MIXER_OBJECTF_WAVEOUT (dev:" + std::to_string(WaveOutDevNo)
+ + "/" + std::to_string(WaveOutNumber) + ")) / result:" + ss.str();
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << std::endl;
}
#endif
@@ -209,10 +209,10 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
Input_MixerName = MixerCaps_in.szPname;
#ifdef __DEBUG__
{
- stringstream ss;
- ss << setfill ('0') << setw(8) << hex << rs;
+ std::stringstream ss;
+ ss << std::setfill ('0') << std::setw(8) << std::hex << rs;
tekst = "Input mixer name: \"" + Input_MixerName + "\" / result:" + ss.str();
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << endl;
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << std::endl;
}
#endif
//Get output Mixer name
@@ -221,10 +221,10 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
Output_MixerName = MixerCaps_out.szPname;
#ifdef __DEBUG__
{
- stringstream ss;
- ss << setfill ('0') << setw(8) << hex << rs;
+ std::stringstream ss;
+ ss << std::setfill ('0') << std::setw(8) << std::hex << rs;
tekst = "Output mixer name: \"" + Output_MixerName + "\" / result:" + ss.str();
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << endl;
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << std::endl;
}
#endif
@@ -240,7 +240,7 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
{
//! \bug Problems might occur when there is no WAVEIN input device (MixerLineWAVEIN will be corrupt)
#ifdef __DEBUG__
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << "No WAVEIN device found !!!" << endl;
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << "No WAVEIN device found !!!" << std::endl;
#endif
MixerLineWAVEIN.cControls = 0;
MixerLineWAVEIN.cConnections = 0;
@@ -248,10 +248,10 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
#ifdef __DEBUG__
{
- stringstream ss;
- ss << setfill ('0') << setw(8) << hex << rs;
+ std::stringstream ss;
+ ss << std::setfill ('0') << std::setw(8) << std::hex << rs;
tekst = "Got info about first WAVEIN destination line / result:" + ss.str();
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << endl;
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << std::endl;
}
#endif
@@ -276,10 +276,10 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
&MixerLineControl, MIXER_GETLINECONTROLSF_ALL | MIXER_OBJECTF_HMIXER);
#ifdef __DEBUG__
{
- stringstream ss;
- ss << setfill ('0') << setw(8) << hex << rs;
+ std::stringstream ss;
+ ss << std::setfill ('0') << std::setw(8) << std::hex << rs;
tekst = "Got master controls of first WAVEIN destination line / result:" + ss.str();
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << endl;
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << std::endl;
}
#endif
@@ -295,11 +295,11 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
MixerSupported=true;
#ifdef __DEBUG__
{
- stringstream ss;
- ss << setfill ('0') << setw(8) << hex << rs;
+ std::stringstream ss;
+ ss << std::setfill ('0') << std::setw(8) << std::hex << rs;
tekst = "Found master input mixer or multiplexer control (no " +
- to_string(ind) + ") / result: " + ss.str();
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << endl;
+ std::to_string(ind) + ") / result: " + ss.str();
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << std::endl;
}
#endif
}
@@ -309,11 +309,11 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
MixerControlWAVEIN_VOLUME_supported = true;
#ifdef __DEBUG__
{
- stringstream ss;
- ss << setfill ('0') << setw(8) << hex << rs;
- tekst = "Found master input volume control (no " + to_string(ind)
+ std::stringstream ss;
+ ss << std::setfill ('0') << std::setw(8) << std::hex << rs;
+ tekst = "Found master input volume control (no " + std::to_string(ind)
+ ") / result: " + ss.str();
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << endl;
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << std::endl;
}
#endif
//break;
@@ -324,11 +324,11 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
MixerControlWAVEIN_MUTE_supported = true;
#ifdef __DEBUG__
{
- stringstream ss;
- ss << setfill ('0') << setw(8) << hex << rs;
- tekst = "Found master input mute control (no " + to_string(ind)
+ std::stringstream ss;
+ ss << std::setfill ('0') << std::setw(8) << std::hex << rs;
+ tekst = "Found master input mute control (no " + std::to_string(ind)
+ ") / result: " + ss.str();
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << endl;
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << std::endl;
}
#endif
//break;
@@ -341,7 +341,7 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
if (InputMixer_support==true)
{ // Card supports global MIXER or MULTIPLEXER for input lines
#ifdef __DEBUG__
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << "InputMixer_support==true" << endl;
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << "InputMixer_support==true" << std::endl;
#endif
Mixer_InputLinesNumber = MixerControlWAVEIN.cMultipleItems;
@@ -356,10 +356,10 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
rs=mixerGetControlDetails((HMIXEROBJ)hMixer_in, &MixerControlDetails, MIXER_GETCONTROLDETAILSF_LISTTEXT);
#ifdef __DEBUG__
{
- stringstream ss;
- ss << setfill ('0') << setw(8) << hex << rs;
+ std::stringstream ss;
+ ss << std::setfill ('0') << std::setw(8) << std::hex << rs;
tekst = "Input mixer /multiplexer control info read (cChannels = 1) / result: " + ss.str();
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << endl;
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << std::endl;
}
#endif
if (rs != 0)
@@ -368,10 +368,10 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
// Correction: card doesn't support global MIXER or MULTIPLEXER for input lines
#ifdef __DEBUG__
{
- stringstream ss;
- ss << setfill ('0') << setw(8) << hex << rs;
+ std::stringstream ss;
+ ss << std::setfill ('0') << std::setw(8) << std::hex << rs;
tekst = "Input mixer /multiplexer control info read (cChannels = 0) / result: " + ss.str();
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << endl;
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << std::endl;
}
#endif
}
@@ -397,11 +397,11 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
&(MixerLinesWAVEIN[ind]), MIXER_GETLINEINFOF_LINEID | MIXER_OBJECTF_HMIXER);
#ifdef __DEBUG__
{
- stringstream ss;
- ss << setfill ('0') << setw(8) << hex << rs;
- tekst = "Input mixer/multiplexer source line " + to_string(ind)
+ std::stringstream ss;
+ ss << std::setfill ('0') << std::setw(8) << std::hex << rs;
+ tekst = "Input mixer/multiplexer source line " + std::to_string(ind)
+ " info read / result: " + ss.str();
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << endl;
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << std::endl;
}
#endif
if (MixerLinesWAVEIN_MAXcChannels<MixerLinesWAVEIN[ind].cChannels)
@@ -418,11 +418,11 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
&MixerLineControl, MIXER_GETLINECONTROLSF_ALL);
#ifdef __DEBUG__
{
- stringstream ss;
- ss << setfill ('0') << setw(8) << hex << rs;
- tekst = "Input mixer source line " + to_string(ind)
+ std::stringstream ss;
+ ss << std::setfill ('0') << std::setw(8) << std::hex << rs;
+ tekst = "Input mixer source line " + std::to_string(ind)
+ " controls info read / result: " + ss.str();
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << endl;
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << std::endl;
}
#endif
//Find control MIXERCONTROL_CONTROLTYPE_VOLUME and copy it
@@ -436,12 +436,12 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
MixerControlsWAVEIN_VOLUME_supported[ind] = true;
#ifdef __DEBUG__
{
- stringstream ss;
- ss << setfill ('0') << setw(8) << hex << rs;
- tekst = "Input mixer source line " + to_string(ind)
- + " volume control found (no " + to_string(ind_2)
+ std::stringstream ss;
+ ss << std::setfill ('0') << std::setw(8) << std::hex << rs;
+ tekst = "Input mixer source line " + std::to_string(ind)
+ + " volume control found (no " + std::to_string(ind_2)
+ ") / result: " + ss.str();
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << endl;
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << std::endl;
}
#endif
break;
@@ -453,7 +453,7 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
{ // Card does not support global MIXER or MULTIPLEXER for input lines
// Each of input lines is controlled separately
#ifdef __DEBUG__
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << "No input mixer/multiplexer device : processing source lines separately" << endl;
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << "No input mixer/multiplexer device : processing source lines separately" << std::endl;
#endif
//Free memory
@@ -476,10 +476,10 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
&(MixerLinesWAVEIN[ind]), MIXER_GETLINEINFOF_SOURCE | MIXER_OBJECTF_HMIXER);
#ifdef __DEBUG__
{
- stringstream ss;
- ss << setfill ('0') << setw(8) << hex << rs;
- tekst = "Input source line " + to_string(ind) + " info read / result: " + ss.str();
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << endl;
+ std::stringstream ss;
+ ss << std::setfill ('0') << std::setw(8) << std::hex << rs;
+ tekst = "Input source line " + std::to_string(ind) + " info read / result: " + ss.str();
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << std::endl;
}
#endif
@@ -519,10 +519,10 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
&MixerLineControl, MIXER_GETLINECONTROLSF_ALL | MIXER_OBJECTF_HMIXER);
#ifdef __DEBUG__
{
- stringstream ss;
- ss << setfill ('0') << setw(8) << hex << rs;
- tekst = "Input mixer source line " + to_string(ind) + " controls info read / result: " + ss.str();
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << endl;
+ std::stringstream ss;
+ ss << std::setfill ('0') << std::setw(8) << std::hex << rs;
+ tekst = "Input mixer source line " + std::to_string(ind) + " controls info read / result: " + ss.str();
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << std::endl;
}
#endif
//Find control MIXERCONTROL_CONTROLTYPE_VOLUME and copy it
@@ -538,11 +538,11 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
MixerControlsWAVEIN_VOLUME_supported[ind] = true;
#ifdef __DEBUG__
{
- stringstream ss;
- ss << setfill ('0') << setw(8) << hex << rs;
- tekst = "Found input mixer source line " + to_string(ind)
- + " volume control (no " + to_string(ind_2) + ") / result: " + ss.str();
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << endl;
+ std::stringstream ss;
+ ss << std::setfill ('0') << std::setw(8) << std::hex << rs;
+ tekst = "Found input mixer source line " + std::to_string(ind)
+ + " volume control (no " + std::to_string(ind_2) + ") / result: " + ss.str();
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << std::endl;
}
#endif
//break;
@@ -567,11 +567,11 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
MixerControlsWAVEIN_MUTE_supported[ind] = true;
#ifdef __DEBUG__
{
- stringstream ss;
- ss << setfill ('0') << setw(8) << hex << rs;
- tekst = "Found input mixer source line " + to_string(ind)
- + " mute control (no " + to_string(ind_2) + ") / result: " + ss.str();
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << endl;
+ std::stringstream ss;
+ ss << std::setfill ('0') << std::setw(8) << std::hex << rs;
+ tekst = "Found input mixer source line " + std::to_string(ind)
+ + " mute control (no " + std::to_string(ind_2) + ") / result: " + ss.str();
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << std::endl;
}
#endif
//break;
@@ -602,10 +602,10 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
&MixerLineOUT, MIXER_OBJECTF_HMIXER | MIXER_GETLINEINFOF_DESTINATION);
#ifdef __DEBUG__
{
- stringstream ss;
- ss << setfill ('0') << setw(8) << hex << rs;
- tekst = "Got output mixer device destination line " + to_string(ind) + " info / result: " + ss.str();
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << endl;
+ std::stringstream ss;
+ ss << std::setfill ('0') << std::setw(8) << std::hex << rs;
+ tekst = "Got output mixer device destination line " + std::to_string(ind) + " info / result: " + ss.str();
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << std::endl;
}
#endif
@@ -613,8 +613,8 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
{
MixerSupportedOUT=true;
#ifdef __DEBUG__
- tekst = "Found output mixer device SPEAKER destination line " + to_string(ind);
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << endl;
+ tekst = "Found output mixer device SPEAKER destination line " + std::to_string(ind);
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << std::endl;
#endif
break;
}
@@ -622,8 +622,8 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
{
MixerSupportedOUT=true;
#ifdef __DEBUG__
- tekst = "Found output mixer device HEADPHONES destination line " + to_string(ind) + " (looking still for SPEAKER)";
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << endl;
+ tekst = "Found output mixer device HEADPHONES destination line " + std::to_string(ind) + " (looking still for SPEAKER)";
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << std::endl;
#endif
//break;
}
@@ -645,10 +645,10 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
&MixerLineControl, MIXER_GETLINECONTROLSF_ALL);
#ifdef __DEBUG__
{
- stringstream ss;
- ss << setfill ('0') << setw(8) << hex << rs;
+ std::stringstream ss;
+ ss << std::setfill ('0') << std::setw(8) << std::hex << rs;
tekst = "Got controls of main output mixer device destination line / result: " + ss.str();
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << endl;
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << std::endl;
}
#endif
@@ -665,7 +665,7 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second
<< "Found main volume control (no " << ind
<< ") of output mixer device destination line / result: "
- << setfill ('0') << setw(8) << hex << rs << endl;
+ << std::setfill ('0') << std::setw(8) << std::hex << rs << std::endl;
}
#endif
}
@@ -684,7 +684,7 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
{
DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second
<< "Found main mute control (no " << ind
- << ") of output mixer device destination line / result: " << setfill ('0') << setw(8) << hex << rs << endl;
+ << ") of output mixer device destination line / result: " << std::setfill ('0') << std::setw(8) << std::hex << rs << std::endl;
}
#endif
}
@@ -717,11 +717,11 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
&(MixerLinesOUT[ind]), MIXER_GETLINEINFOF_SOURCE | MIXER_OBJECTF_HMIXER);
#ifdef __DEBUG__
{
- stringstream ss;
- ss << setfill ('0') << setw(8) << hex << rs;
- tekst = "Got info of output source line (no " + to_string(ind)
+ std::stringstream ss;
+ ss << std::setfill ('0') << std::setw(8) << std::hex << rs;
+ tekst = "Got info of output source line (no " + std::to_string(ind)
+ ") / result: " + ss.str();
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << endl;
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << std::endl;
}
#endif
@@ -736,11 +736,11 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
&MixerLineControl, MIXER_GETLINECONTROLSF_ALL);
#ifdef __DEBUG__
{
- stringstream ss;
- ss << setfill ('0') << setw(8) << hex << rs;
- tekst = "Got controls of output source line (no " + to_string(ind)
+ std::stringstream ss;
+ ss << std::setfill ('0') << std::setw(8) << std::hex << rs;
+ tekst = "Got controls of output source line (no " + std::to_string(ind)
+ ") / result: " + ss.str();
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << endl;
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << std::endl;
}
#endif
//Find control MIXERCONTROL_CONTROLTYPE_VOLUME and copy it
@@ -756,12 +756,12 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
MixerControlsOUT_VOL_supported[ind] = true;
#ifdef __DEBUG__
{
- stringstream ss;
- ss << setfill ('0') << setw(8) << hex << rs;
- tekst = "Found volume control (" + to_string(ind_2)
- + ") of output source line (no " + to_string(ind)
+ std::stringstream ss;
+ ss << std::setfill ('0') << std::setw(8) << std::hex << rs;
+ tekst = "Found volume control (" + std::to_string(ind_2)
+ + ") of output source line (no " + std::to_string(ind)
+ ") / result: " + ss.str();
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << endl;
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << std::endl;
}
#endif
//break;
@@ -775,12 +775,12 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
MixerControlsOUT_MUTE_supported[ind] = true;
#ifdef __DEBUG__
{
- stringstream ss;
- ss << setfill ('0') << setw(8) << hex << rs;
- tekst = "Found mute control (" + to_string(ind_2)
- + ") of output source line (no " + to_string(ind)
+ std::stringstream ss;
+ ss << std::setfill ('0') << std::setw(8) << std::hex << rs;
+ tekst = "Found mute control (" + std::to_string(ind_2)
+ + ") of output source line (no " + std::to_string(ind)
+ ") / result: " + ss.str();
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << endl;
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << tekst << std::endl;
}
#endif
//break;
@@ -825,13 +825,13 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
Memorized_OUT_LinesVolumes.clear();
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << "Not supported on this platform" << endl;
+ DSP::log << DSP::e::LogMode::Error << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << "Not supported on this platform" << std::endl;
#endif
#endif
#ifdef __DEBUG__
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << "Finished mixer configuration detection" << endl;
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << "Finished mixer configuration detection" << std::endl;
#endif
// ************************************************ //
@@ -841,15 +841,15 @@ TAudioMixer::TAudioMixer(UINT WaveInDevNo, UINT WaveOutDevNo)
//TEST
#ifdef __DEBUG__
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << "MemorizeMixerSettings_WAVEIN" << endl;
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << "MemorizeMixerSettings_WAVEIN" << std::endl;
#endif
MemorizeMixerSettings_WAVEIN();
#ifdef __DEBUG__
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << "MemorizeMixerSettings_OUT" << endl;
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << "MemorizeMixerSettings_OUT" << std::endl;
#endif
MemorizeMixerSettings_OUT();
#ifdef __DEBUG__
- DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << "Constructor finaly reached the end" << endl;
+ DSP::log << "TAudioMixer::TAudioMixer" << DSP::e::LogMode::second << "Constructor finaly reached the end" << std::endl;
#endif
}
@@ -895,7 +895,7 @@ TAudioMixer::~TAudioMixer(void)
// ************************************ //
}
-string TAudioMixer::GetMixerName(void)
+std::string TAudioMixer::GetMixerName(void)
{
Input_Output_MixerName = Input_MixerName;
//if (strcmp(Input_MixerName, Output_MixerName) != 0)
@@ -989,7 +989,7 @@ void TAudioMixer::MemorizeMixerSettings_WAVEIN(void)
MixerSettingsMemorized_WAVEIN=false;
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "TAudioMixer::MemorizeMixerSettings_WAVEIN" << DSP::e::LogMode::second << "Not yet implemented on this platform" << endl;
+ DSP::log << DSP::e::LogMode::Error << "TAudioMixer::MemorizeMixerSettings_WAVEIN" << DSP::e::LogMode::second << "Not yet implemented on this platform" << std::endl;
#endif
#endif
@@ -1005,7 +1005,7 @@ void TAudioMixer::ForgetMixerSettings_WAVEIN(void)
#else
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "TAudioMixer::ForgetMixerSettings_WAVEIN" << DSP::e::LogMode::second << "Not yet implemented on this platform" << endl;
+ DSP::log << DSP::e::LogMode::Error << "TAudioMixer::ForgetMixerSettings_WAVEIN" << DSP::e::LogMode::second << "Not yet implemented on this platform" << std::endl;
#endif
#endif
@@ -1084,7 +1084,7 @@ void TAudioMixer::RestoreMixerSettings_WAVEIN(void)
#else
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "TAudioMixer::RestoreMixerSettings_WAVEIN" << DSP::e::LogMode::second << "Not yet implemented on this platform" << endl;
+ DSP::log << DSP::e::LogMode::Error << "TAudioMixer::RestoreMixerSettings_WAVEIN" << DSP::e::LogMode::second << "Not yet implemented on this platform" << std::endl;
#endif
#endif
@@ -1098,24 +1098,24 @@ void TAudioMixer::MemorizeMixerSettings_OUT(void)
//Master Line Controls
#ifdef __DEBUG__
- DSP::log << "TAudioMixer::MemorizeMixerSettings_OUT" << DSP::e::LogMode::second << "Saving Master Line Controls State" << endl;
+ DSP::log << "TAudioMixer::MemorizeMixerSettings_OUT" << DSP::e::LogMode::second << "Saving Master Line Controls State" << std::endl;
#endif
Memorized_OUT_MasterState[0]=GetDestLineState(DSP::AM_MasterControl, 0);
Memorized_OUT_MasterState[1]=GetDestLineState(DSP::AM_MasterControl, 1);
#ifdef __DEBUG__
- DSP::log << "TAudioMixer::MemorizeMixerSettings_OUT" << DSP::e::LogMode::second << "Saving Master Line Controls Volume" << endl;
+ DSP::log << "TAudioMixer::MemorizeMixerSettings_OUT" << DSP::e::LogMode::second << "Saving Master Line Controls Volume" << std::endl;
#endif
Memorized_OUT_MasterVolume[0]=GetDestLineVolume(DSP::AM_MasterControl, 0);
Memorized_OUT_MasterVolume[1]=GetDestLineVolume(DSP::AM_MasterControl, 1);
//Master Line connections Controls
#ifdef __DEBUG__
- DSP::log << "TAudioMixer::MemorizeMixerSettings_OUT" << DSP::e::LogMode::second << "Saving Master Line connections Controls" << endl;
+ DSP::log << "TAudioMixer::MemorizeMixerSettings_OUT" << DSP::e::LogMode::second << "Saving Master Line connections Controls" << std::endl;
#endif
ile = GetNumberOfDestLines();
#ifdef __DEBUG__
{
- DSP::log << "TAudioMixer::MemorizeMixerSettings_OUT" << DSP::e::LogMode::second << "GetNumberOfDestLines() = " << ile << endl;
+ DSP::log << "TAudioMixer::MemorizeMixerSettings_OUT" << DSP::e::LogMode::second << "GetNumberOfDestLines() = " << ile << std::endl;
}
#endif
Memorized_OUT_LinesStates.clear();
@@ -1127,21 +1127,21 @@ void TAudioMixer::MemorizeMixerSettings_OUT(void)
{
#ifdef __DEBUG__
{
- DSP::log << "TAudioMixer::MemorizeMixerSettings_OUT" << DSP::e::LogMode::second << "Saving line #" << ind << " State" << endl;
+ DSP::log << "TAudioMixer::MemorizeMixerSettings_OUT" << DSP::e::LogMode::second << "Saving line #" << ind << " State" << std::endl;
}
#endif
Memorized_OUT_LinesStates[ind*2+0]=GetDestLineState(ind, 0);
Memorized_OUT_LinesStates[ind*2+1]=GetDestLineState(ind, 1);
#ifdef __DEBUG__
{
- DSP::log << "TAudioMixer::MemorizeMixerSettings_OUT" << DSP::e::LogMode::second << "Saving line #" << ind << " Volume" << endl;
+ DSP::log << "TAudioMixer::MemorizeMixerSettings_OUT" << DSP::e::LogMode::second << "Saving line #" << ind << " Volume" << std::endl;
}
#endif
Memorized_OUT_LinesVolumes[ind*2+0]=GetDestLineVolume(ind, 0);
Memorized_OUT_LinesVolumes[ind*2+1]=GetDestLineVolume(ind, 1);
}
#ifdef __DEBUG__
- DSP::log << "TAudioMixer::MemorizeMixerSettings_OUT" << DSP::e::LogMode::second << "Finished Saving Master Line connections Controls" << endl;
+ DSP::log << "TAudioMixer::MemorizeMixerSettings_OUT" << DSP::e::LogMode::second << "Finished Saving Master Line connections Controls" << std::endl;
#endif
}
@@ -1154,9 +1154,9 @@ void TAudioMixer::ForgetMixerSettings_OUT(void)
}
-string TAudioMixer::GetSourceLineName(int ind)
+std::string TAudioMixer::GetSourceLineName(int ind)
{
- string LineName;
+ std::string LineName;
LineName= "";
@@ -1175,9 +1175,9 @@ string TAudioMixer::GetSourceLineName(int ind)
return LineName;
}
-string TAudioMixer::GetDestLineName(int ind)
+std::string TAudioMixer::GetDestLineName(int ind)
{
- string LineName;
+ std::string LineName;
LineName= "";
@@ -1317,7 +1317,7 @@ int TAudioMixer::GetActiveSourceLine(void)
int ind;
MIXERCONTROLDETAILS MixerControlDetails;
- vector<MIXERCONTROLDETAILS_BOOLEAN> temp(Mixer_InputLinesNumber);
+ std::vector<MIXERCONTROLDETAILS_BOOLEAN> temp(Mixer_InputLinesNumber);
//We should reread lines state
if (InputMixer_support == true)
@@ -1846,7 +1846,7 @@ void TAudioMixer::SetActiveSourceLine(int ActiveNo)
/*! Fixed <b>2006.01.23</b> Added support for soundcards without global MIXER or MULTIPLEXER for input lines
*/
-void TAudioMixer::SetActiveSourceLine(string ActiveName)
+void TAudioMixer::SetActiveSourceLine(std::string ActiveName)
{
// if (strcmp("PCMwave file",ActiveName)==0)
if (ActiveName.compare("PCMwave file")==0)
@@ -2449,7 +2449,7 @@ double TAudioMixer::GetDestLineVolume(int LineNo, int Channel)
(void)Channel; // unused
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "TAudioMixer::GetDestLineVolume" << DSP::e::LogMode::second << "Not yet implemented on this platform" << endl;
+ DSP::log << DSP::e::LogMode::Error << "TAudioMixer::GetDestLineVolume" << DSP::e::LogMode::second << "Not yet implemented on this platform" << std::endl;
#endif
return -2.0; // NO CONTROLS
@@ -2508,7 +2508,7 @@ const DWORD TAudioMixer::Types[]={
#endif
};
-const string TAudioMixer::TypesNames[]={
+const std::string TAudioMixer::TypesNames[]={
#ifdef WIN32
"MIXERCONTROL_CT_CLASS_CUSTOM",
"MIXERCONTROL_CONTROLTYPE_CUSTOM",
@@ -2585,7 +2585,7 @@ const DWORD TAudioMixer::ComponentTypes[]={
0xffffffff
};
-const string TAudioMixer::ComponentNames[]={
+const std::string TAudioMixer::ComponentNames[]={
#ifdef WIN32
"MIXERLINE_COMPONENTTYPE_DST_DIGITAL",
"MIXERLINE_COMPONENTTYPE_DST_HEADPHONES",
@@ -2611,7 +2611,7 @@ const string TAudioMixer::ComponentNames[]={
"0xffffffff"
};
-const string TAudioMixer::GetMixerControlType(DWORD dwControlType)
+const std::string TAudioMixer::GetMixerControlType(DWORD dwControlType)
{
#ifdef WIN32
int indType;
@@ -2631,14 +2631,14 @@ const string TAudioMixer::GetMixerControlType(DWORD dwControlType)
(void)dwControlType; // unused
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "TAudioMixer::GetMixerControlType" << DSP::e::LogMode::second << "Not yet implemented on this platform" << endl;
+ DSP::log << DSP::e::LogMode::Error << "TAudioMixer::GetMixerControlType" << DSP::e::LogMode::second << "Not yet implemented on this platform" << std::endl;
#endif
return NULL;
#endif
}
-const string TAudioMixer::GetMixerComponentType(DWORD dwComponentType)
+const std::string TAudioMixer::GetMixerComponentType(DWORD dwComponentType)
{
int indType;
diff --git a/src/cpp/DSP_DOT.cpp b/src/cpp/DSP_DOT.cpp
index 5c29b67..225aae3 100644
--- a/src/cpp/DSP_DOT.cpp
+++ b/src/cpp/DSP_DOT.cpp
@@ -11,15 +11,13 @@
//#include <DSP_clocks.h>
#include <DSP_lib.h>
-using namespace std;
-
-const vector<string> DSP::DOT_colors =
+const std::vector<std::string> DSP::DOT_colors =
{
"red", "royalblue2", "green3", "turquoise2", "yellow3",
"chocolate4", "blueviolet", "deeppink1", "goldenrod1"
};
-const vector<string> DSP::DOT_edge_colors =
+const std::vector<std::string> DSP::DOT_edge_colors =
{
"royalblue2", "red", "green3", "turquoise2", "yellow3",
"chocolate4", "blueviolet", "deeppink1", "goldenrod1"
@@ -27,10 +25,10 @@ const vector<string> DSP::DOT_edge_colors =
#ifdef __DEBUG__
- string DSP::u::Splitter::GetComponentNodeParams_DOTfile(void) {
+ std::string DSP::u::Splitter::GetComponentNodeParams_DOTfile(void) {
return GetComponentNodeParams_DOTfile();
}
- string DSP::u::Splitter::GetComponentNodeParams_DOTfile(const string &leading_space)
+ std::string DSP::u::Splitter::GetComponentNodeParams_DOTfile(const std::string &leading_space)
{
UNUSED_ARGUMENT(leading_space);
return "[shape=point]";
@@ -40,10 +38,10 @@ const vector<string> DSP::DOT_edge_colors =
bool DSP::u::Splitter::UsePorts_DOTfile(void)
{ return false; }
- string DSP::u::Splitter::GetComponentEdgeParams_DOTfile(const unsigned int &output_index)
+ std::string DSP::u::Splitter::GetComponentEdgeParams_DOTfile(const unsigned int &output_index)
{
unsigned int ind2;
- stringstream text_buffer;
+ std::stringstream text_buffer;
// start from output with the same input the skip by NoOfInputs
//ind2 = output_index / (NoOfOutputs / NoOfInputs);
@@ -189,11 +187,11 @@ DSP::Macro_ptr DSP::Component::DOT_DrawAsMacro(DSP::Macro_ptr DrawnMacro)
}
// Returns component name used in DOTfile
-string DSP::Component::GetComponentName_DOTfile()
+std::string DSP::Component::GetComponentName_DOTfile()
{
long component_index;
- string type_name;
- string text_buffer;
+ std::string type_name;
+ std::string text_buffer;
component_index = GetComponentIndexInTable(this);
if (component_index < 0)
@@ -226,30 +224,30 @@ string DSP::Component::GetComponentName_DOTfile()
text_buffer = type_name;
text_buffer += '_';
- text_buffer += to_string(component_index);
+ text_buffer += std::to_string(component_index);
return text_buffer;
}
-string DSP::Component::GetComponentNodeParams_DOTfile(void) {
+std::string DSP::Component::GetComponentNodeParams_DOTfile(void) {
return GetComponentNodeParams_DOTfile("");
}
// Returns component node parameters used in DOTfile
/*
- * -# generate string segment (internal buffer - ?? size selection)
+ * -# generate std::string segment (internal buffer - ?? size selection)
* -# check if it will fit into the output buffer
- * -# copy string segment into output buffer.
+ * -# copy std::string segment into output buffer.
* .
*/
-string DSP::Component::GetHtmlNodeLabel_DOTfile(const unsigned long &no_of_inputs, const unsigned long &no_of_outputs, const string &node_name, const string &leading_space, const unsigned int &border_width)
+std::string DSP::Component::GetHtmlNodeLabel_DOTfile(const unsigned long &no_of_inputs, const unsigned long &no_of_outputs, const std::string &node_name, const std::string &leading_space, const unsigned int &border_width)
{
- string tempName;
+ std::string tempName;
unsigned int ind;
//! pointer to an internal text buffer
- string internal_text;
+ std::string internal_text;
//! length of the output text (including trailing zero)
- stringstream text_buffer;
+ std::stringstream text_buffer;
tempName = node_name;
if (tempName.length() == 0)
@@ -339,18 +337,18 @@ string DSP::Component::GetHtmlNodeLabel_DOTfile(const unsigned long &no_of_input
// Returns component node parameters used in DOTfile
/*
- * -# generate string segment (internal buffer - ?? size selection)
+ * -# generate std::string segment (internal buffer - ?? size selection)
* -# check if it will fit into the output buffer
- * -# copy string segment into output buffer.
+ * -# copy std::string segment into output buffer.
* .
*/
-string DSP::Component::GetComponentNodeParams_DOTfile(const string &leading_space)
+std::string DSP::Component::GetComponentNodeParams_DOTfile(const std::string &leading_space)
{
- string tempName;
+ std::string tempName;
//! pointer to an internal text buffer
- string internal_text;
+ std::string internal_text;
//! length of the output text (including trailing zero)
- stringstream text_buffer;
+ std::stringstream text_buffer;
tempName = GetName();
if (tempName.length() == 0)
@@ -377,9 +375,9 @@ string DSP::Component::GetComponentNodeParams_DOTfile(const string &leading_spac
return text_buffer.str();
}
-string DSP::Component::GetComponentEdgeParams_DOTfile(const unsigned int &output_index)
+std::string DSP::Component::GetComponentEdgeParams_DOTfile(const unsigned int &output_index)
{
- stringstream text_buffer;
+ std::stringstream text_buffer;
text_buffer << "[color=" << DOT_edge_colors[output_index % DOT_edge_colors.size()] << "]";
return text_buffer.str();
}
@@ -389,13 +387,13 @@ bool DSP::Component::UsePorts_DOTfile(void)
{ return true; }
// Writes component edges to file
-void DSP::Component::ComponentEdgesToDOTfile(std::ofstream &dot_plik, const string &this_name,
- vector<bool> &UsedMacrosTable, vector<DSP::Macro_ptr> &MacrosList,
+void DSP::Component::ComponentEdgesToDOTfile(std::ofstream &dot_plik, const std::string &this_name,
+ std::vector<bool> &UsedMacrosTable, std::vector<DSP::Macro_ptr> &MacrosList,
DSP::Macro_ptr DrawnMacro, unsigned int space_sep)
{
unsigned int ind, ind_sep;
unsigned long ind2;
- string that_name, text_buffer;
+ std::string that_name, text_buffer;
DSP::Block_ptr temp_block;
DSP::Macro_ptr current_macro;
@@ -504,10 +502,10 @@ void DSP::Component::ComponentEdgesToDOTfile(std::ofstream &dot_plik, const stri
{
for (ind_sep = 0; ind_sep < space_sep; ind_sep++)
dot_plik << ' ';
- stringstream ss;
+ std::stringstream ss;
ss << this_name << "_const_in" << ind + 1
<< " [shape=none,label="
- << fixed << setprecision(3) << temp_block->ConstantInputValues[ind] << "];";
+ << std::fixed << std::setprecision(3) << temp_block->ConstantInputValues[ind] << "];";
dot_plik << ss.str() << std::endl;
for (ind_sep = 0; ind_sep < space_sep; ind_sep++)
@@ -537,9 +535,9 @@ void DSP::Component::ComponentEdgesToDOTfile(std::ofstream &dot_plik, const stri
* Can be called for sources and mixed blocks but cannot call itself for sources & mixed blocks
*/
void DSP::Component::ComponentToDOTfile(std::ofstream &dot_plik,
- vector<bool> &ComponentDoneTable, long max_components_number,
- vector<bool> &UsedMacrosTable, vector<DSP::Macro_ptr> &MacrosList,
- vector<bool> &UsedClocksTable, vector<DSP::Clock_ptr> &ClocksList,
+ std::vector<bool> &ComponentDoneTable, long max_components_number,
+ std::vector<bool> &UsedMacrosTable, std::vector<DSP::Macro_ptr> &MacrosList,
+ std::vector<bool> &UsedClocksTable, std::vector<DSP::Clock_ptr> &ClocksList,
DSP::Macro_ptr DrawnMacro, DSP::Clock_ptr clock_ptr)
{
unsigned int ind;
@@ -547,7 +545,7 @@ void DSP::Component::ComponentToDOTfile(std::ofstream &dot_plik,
DSP::Block_ptr temp_OUT;
long component_index;
DSP::Macro_ptr current_macro;
- string this_name;
+ std::string this_name;
component_index = GetComponentIndexInTable(this);
@@ -556,7 +554,7 @@ void DSP::Component::ComponentToDOTfile(std::ofstream &dot_plik,
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::Component::ComponentToDOTfile" << DSP::e::LogMode::second
<< "max_components_number (" << (int)max_components_number
- << ") <= component_index (" << (int)component_index << ")" << endl;
+ << ") <= component_index (" << (int)component_index << ")" << std::endl;
#endif
return;
}
@@ -584,7 +582,7 @@ void DSP::Component::ComponentToDOTfile(std::ofstream &dot_plik,
else
{
// int name_len, temp_name_len;
- string temp_name;
+ std::string temp_name;
// bool done;
ComponentDoneTable[component_index] = true;
@@ -603,7 +601,7 @@ void DSP::Component::ComponentToDOTfile(std::ofstream &dot_plik,
/*! \bug 2010.04.19 For multiclock blocks clocks edge should point at appropriate block's input/output instead of the block itself
*/
- stringstream ss;
+ std::stringstream ss;
ss << "clock_" << clock_ptr;
dot_plik << " " << ss.str() << " -> ";
dot_plik << this_name << " [style=dotted, constraint=false, color="
@@ -635,7 +633,7 @@ void DSP::Component::ComponentToDOTfile(std::ofstream &dot_plik,
<< DOT_colors[OutputClocks[0]->GetMasterClockIndex() % DOT_colors.size()]
<< "];" << std::endl;
- stringstream ss;
+ std::stringstream ss;
ss << "clock_" << OutputClocks[0];
dot_plik << " " << ss.str() << " -> ";
dot_plik << this_name << " [style=dotted, constraint=false, color="
@@ -711,22 +709,22 @@ void DSP::Component::ComponentToDOTfile(std::ofstream &dot_plik,
return result;
}
- string DSP::Macro::GetMacroName_DOTfile()
+ std::string DSP::Macro::GetMacroName_DOTfile()
{
- stringstream ss;
+ std::stringstream ss;
ss << "macro_" << this;
return ss.str();
}
// Returns macro node parames used in DOTfile
- string DSP::Macro::GetMacroNodeParams_DOTfile()
+ std::string DSP::Macro::GetMacroNodeParams_DOTfile()
{
- stringstream text_buffer;
+ std::stringstream text_buffer;
text_buffer << "[";
- string leading_space = " ";
+ std::string leading_space = " ";
text_buffer << DSP::Component::GetHtmlNodeLabel_DOTfile(NoOfInputs, NoOfOutputs, GetName(), leading_space, 3);
text_buffer << ", color=blue]"; // shape=record, penwidth=4.0]";
@@ -734,13 +732,13 @@ void DSP::Component::ComponentToDOTfile(std::ofstream &dot_plik,
return text_buffer.str();
}
- string DSP::Macro::GetMacroInputNodeParams_DOTfile()
+ std::string DSP::Macro::GetMacroInputNodeParams_DOTfile()
{
- stringstream text_buffer;
+ std::stringstream text_buffer;
text_buffer << "[";
- string leading_space = " ";
+ std::string leading_space = " ";
text_buffer << DSP::Component::GetHtmlNodeLabel_DOTfile(0, MacroInput_block->NoOfOutputs, MacroInput_block->GetName(), leading_space, 3);
text_buffer << ", color=blue]"; // shape=record, penwidth=4.0]";
@@ -748,13 +746,13 @@ void DSP::Component::ComponentToDOTfile(std::ofstream &dot_plik,
return text_buffer.str();
}
- string DSP::Macro::GetMacroOutputNodeParams_DOTfile()
+ std::string DSP::Macro::GetMacroOutputNodeParams_DOTfile()
{
- stringstream text_buffer;
+ std::stringstream text_buffer;
text_buffer << "[";
- string leading_space = " ";
+ std::string leading_space = " ";
text_buffer << DSP::Component::GetHtmlNodeLabel_DOTfile(MacroOutput_block->NoOfInputs, 0, MacroOutput_block->GetName(), leading_space, 3);
text_buffer << ", color=blue]"; // shape=record, penwidth=4.0]";
@@ -762,9 +760,9 @@ void DSP::Component::ComponentToDOTfile(std::ofstream &dot_plik,
return text_buffer.str();
}
- string DSP::Macro::GetMacroEdgeParams_DOTfile(const unsigned int &output_index)
+ std::string DSP::Macro::GetMacroEdgeParams_DOTfile(const unsigned int &output_index)
{
- stringstream text_buffer;
+ std::stringstream text_buffer;
text_buffer << "[color=" << DOT_edge_colors[output_index % DOT_edge_colors.size()] << "]";
return text_buffer.str();
}
@@ -774,12 +772,12 @@ void DSP::Component::ComponentToDOTfile(std::ofstream &dot_plik,
{ return true; }
// Writes macro outgoing and constant inputs edges to file
- void DSP::Macro::MacroEdgesToDOTfile(std::ofstream &dot_plik, const string ¯o_name,
+ void DSP::Macro::MacroEdgesToDOTfile(std::ofstream &dot_plik, const std::string ¯o_name,
DSP::Macro_ptr DrawnMacro, unsigned int space_sep)
{
unsigned int ind, ind_sep;
- string that_name;
- stringstream text_buffer;
+ std::string that_name;
+ std::stringstream text_buffer;
DSP::Macro_ptr current_macro;
bool input_done;
//DSP::Component_ptr temp_component;
@@ -826,7 +824,7 @@ void DSP::Component::ComponentToDOTfile(std::ofstream &dot_plik,
else
{
// this should not happen
- DSP::log << "DSP::Macro::MacroEdgesToDOTfile" << DSP::e::LogMode::second << "Nothing connected to the output block's input" << endl;
+ DSP::log << "DSP::Macro::MacroEdgesToDOTfile" << DSP::e::LogMode::second << "Nothing connected to the output block's input" << std::endl;
}
@@ -884,7 +882,7 @@ void DSP::Component::ComponentToDOTfile(std::ofstream &dot_plik,
dot_plik << ' ';
text_buffer.clear(); text_buffer.str("");
text_buffer << macro_name << "_const_in" << ind << " [shape=none,label="
- << fixed << setprecision(3) << MacroInput_block->ConstantInputValues[ind] << "];";
+ << std::fixed << std::setprecision(3) << MacroInput_block->ConstantInputValues[ind] << "];";
dot_plik << text_buffer.str() << std::endl;
for (ind_sep = 0; ind_sep < space_sep; ind_sep++)
@@ -943,12 +941,12 @@ void DSP::Component::ComponentToDOTfile(std::ofstream &dot_plik,
}
//! Writes macro input edges to file
- void DSP::Macro::MacroInputEdgesToDOTfile(std::ofstream &dot_plik, const string ¯o_input_name,
+ void DSP::Macro::MacroInputEdgesToDOTfile(std::ofstream &dot_plik, const std::string ¯o_input_name,
DSP::Macro_ptr DrawnMacro, unsigned int space_sep)
{
unsigned int ind, ind_sep;
- string that_name;
- stringstream text_buffer;
+ std::string that_name;
+ std::stringstream text_buffer;
DSP::Macro_ptr current_macro;
DSP::Block_ptr current_output;
@@ -970,7 +968,7 @@ void DSP::Component::ComponentToDOTfile(std::ofstream &dot_plik,
}
if (current_output->Convert2Copy() != NULL)
{ // 2. Copy
- DSP::log << "DSP::Macro::MacroInputEdgesToDOTfile" << DSP::e::LogMode::second << "Edge to Copy !!!" << endl;
+ DSP::log << "DSP::Macro::MacroInputEdgesToDOTfile" << DSP::e::LogMode::second << "Edge to Copy !!!" << std::endl;
}
// ++++++++++++++++++++++++++++++++++++++++++++++++++ //
@@ -978,7 +976,7 @@ void DSP::Component::ComponentToDOTfile(std::ofstream &dot_plik,
if (current_macro != NULL)
{
//! \todo edge to other macro
- DSP::log << "DSP::Macro::MacroInputEdgesToDOTfile" << DSP::e::LogMode::second << "edge to other macro not implemented yet" << endl;
+ DSP::log << "DSP::Macro::MacroInputEdgesToDOTfile" << DSP::e::LogMode::second << "edge to other macro not implemented yet" << std::endl;
}
else
{
@@ -1053,12 +1051,12 @@ void DSP::Component::ComponentToDOTfile(std::ofstream &dot_plik,
}
// Writes component edges to file
- void DSP::Macro::MacroOutputEdgesToDOTfile(std::ofstream &dot_plik, const string ¯o_output_name,
+ void DSP::Macro::MacroOutputEdgesToDOTfile(std::ofstream &dot_plik, const std::string ¯o_output_name,
DSP::Macro_ptr DrawnMacro, unsigned int space_sep)
{
unsigned int ind, ind_sep;
- string that_name;
- stringstream text_buffer;
+ std::string that_name;
+ std::stringstream text_buffer;
bool input_done;
@@ -1074,7 +1072,7 @@ void DSP::Component::ComponentToDOTfile(std::ofstream &dot_plik,
dot_plik << ' ';
text_buffer.clear(); text_buffer.str("");
text_buffer << macro_output_name << "_const_in" << ind + 1 << " [shape=none,label="
- << fixed << setprecision(3) << MacroOutput_block->ConstantInputValues[ind] << "];",
+ << std::fixed << std::setprecision(3) << MacroOutput_block->ConstantInputValues[ind] << "];",
dot_plik << text_buffer.str() << std::endl;
for (ind_sep = 0; ind_sep < space_sep; ind_sep++)
@@ -1184,7 +1182,7 @@ void DSP::Component::ComponentToDOTfile(std::ofstream &dot_plik,
{
if (DrawnMacro != this)
{
- string macro_name;
+ std::string macro_name;
///////////////////////////////
// Zdefiniuj macro node
@@ -1200,7 +1198,7 @@ void DSP::Component::ComponentToDOTfile(std::ofstream &dot_plik,
}
else
{
- string component_name;
+ std::string component_name;
// draw macro input
component_name = MacroInput_block->GetComponentName_DOTfile();
@@ -1235,7 +1233,7 @@ void DSP::Component::ComponentToDOTfile(std::ofstream &dot_plik,
* dot-file format.
*
*/
-void DSP::Clock::SchemeToDOTfile(DSP::Clock_ptr ReferenceClock, const string &dot_filename,
+void DSP::Clock::SchemeToDOTfile(DSP::Clock_ptr ReferenceClock, const std::string &dot_filename,
DSP::Macro_ptr DrawnMacro)
{
UNUSED_RELEASE_ARGUMENT(ReferenceClock);
@@ -1246,20 +1244,20 @@ void DSP::Clock::SchemeToDOTfile(DSP::Clock_ptr ReferenceClock, const string &do
// ********************************** //
if (ReferenceClock==NULL)
{
- DSP::log << DSP::e::LogMode::Error << "DSP::Clock::SchemeToDOTfile" << DSP::e::LogMode::second << "NULL ReferenceClock" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Clock::SchemeToDOTfile" << DSP::e::LogMode::second << "NULL ReferenceClock" << std::endl;
return;
}
// ********************************** //
- string tekst;
+ std::string tekst;
std::ofstream dot_plik(dot_filename);
- vector<DSP::Clock_ptr> ClocksList;
+ std::vector<DSP::Clock_ptr> ClocksList;
DSP::Clock_ptr temp_clock;
- vector<bool> UsedClocksTable;
+ std::vector<bool> UsedClocksTable;
long int max_components_number;
- vector<bool> ComponentDoneTable;
- vector<bool> UsedMacrosTable;
- vector<DSP::Macro_ptr> MacrosList;
+ std::vector<bool> ComponentDoneTable;
+ std::vector<bool> UsedMacrosTable;
+ std::vector<DSP::Macro_ptr> MacrosList;
DSP::Clock_trigger_ptr Clock_trigger;
// ********************************** //
@@ -1290,7 +1288,7 @@ void DSP::Clock::SchemeToDOTfile(DSP::Clock_ptr ReferenceClock, const string &do
#ifdef __DEBUG__
if (ClocksList.size() != DSP::Clock::GetNoOfClocks())
DSP::log << DSP::e::LogMode::Error << "DSP::Clock::SchemeToDOTfile" << DSP::e::LogMode::second
- << "wrong number of clocks in ClocksList" << endl;
+ << "wrong number of clocks in ClocksList" << std::endl;
#endif // __DEBUG__
// ********************************** //
@@ -1360,7 +1358,7 @@ void DSP::Clock::SchemeToDOTfile(DSP::Clock_ptr ReferenceClock, const string &do
if (Clock_trigger != NULL)
{
- stringstream ss;
+ std::stringstream ss;
ss << "clock_" << Clock_trigger->SignalActivatedClock;
dot_plik << " " << DSP::Component::GetComponent(ind)->GetComponentName_DOTfile() << " -> ";
@@ -1422,7 +1420,7 @@ void DSP::Clock::SchemeToDOTfile(DSP::Clock_ptr ReferenceClock, const string &do
// clocks subgraph
if (ClocksList.size() > 0)
{
- stringstream ss;
+ std::stringstream ss;
//dot_plik << " subgraph cluster_CLOCKS {" << std::endl;
ss << " subgraph cluster_clock_group_" << ClocksList[0]->MasterClockIndex << " {";
dot_plik << ss.str() << std::endl;
@@ -1518,9 +1516,9 @@ void DSP::Clock::SchemeToDOTfile(DSP::Clock_ptr ReferenceClock, const string &do
* Returns true if any of the sources has been drawn.
*/
bool DSP::Clock::ClockComponentsToDOTfile(std::ofstream &dot_plik,
- vector<bool> &ComponentDoneTable, long max_components_number,
- vector<bool> &UsedMacrosTable, vector<DSP::Macro_ptr> &MacrosList,
- vector<bool> &UsedClocksTable, vector<DSP::Clock_ptr> &ClocksList,
+ std::vector<bool> &ComponentDoneTable, long max_components_number,
+ std::vector<bool> &UsedMacrosTable, std::vector<DSP::Macro_ptr> &MacrosList,
+ std::vector<bool> &UsedClocksTable, std::vector<DSP::Clock_ptr> &ClocksList,
DSP::Macro_ptr DrawnMacro)
{
unsigned long ind;
@@ -1546,13 +1544,13 @@ void DSP::Clock::SchemeToDOTfile(DSP::Clock_ptr ReferenceClock, const string &do
}
bool DSP::Clock::ClockNotificationsToDOTfile(std::ofstream &dot_plik,
- vector<bool> &ComponentDoneTable, long max_components_number)
+ std::vector<bool> &ComponentDoneTable, long max_components_number)
//, bool *UsedClocksTable, DSP::Clock_ptr *ClocksList) long clocks_number)
{
unsigned long ind;
long component_index;
- string block_name;
- string clock_name;
+ std::string block_name;
+ std::string clock_name;
bool clock_used;
clock_used = false;
@@ -1565,7 +1563,7 @@ void DSP::Clock::SchemeToDOTfile(DSP::Clock_ptr ReferenceClock, const string &do
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::Clock::ClockNotificationsToDOTfile" << DSP::e::LogMode::second
<< "max_components_number (" << max_components_number
- << ") <= component_index (" << component_index << ")" << endl;
+ << ") <= component_index (" << component_index << ")" << std::endl;
#endif
}
else
@@ -1575,7 +1573,7 @@ void DSP::Clock::SchemeToDOTfile(DSP::Clock_ptr ReferenceClock, const string &do
//if (ComponentsNotifications_Table[ind]->DOT_DrawAsMacro() == NULL)
block_name = ComponentsNotifications_Table[ind]->GetComponentName_DOTfile();
- stringstream ss;
+ std::stringstream ss;
ss << "clock_" << this;
clock_name = ss.str();
diff --git a/src/cpp/DSP_Fourier.cpp b/src/cpp/DSP_Fourier.cpp
index 26299ea..9514e52 100644
--- a/src/cpp/DSP_Fourier.cpp
+++ b/src/cpp/DSP_Fourier.cpp
@@ -271,7 +271,7 @@ void DSP::Fourier::absFFT(const unsigned long &N, DSP::Float_vector &abs_fft, co
#ifdef __DEBUG__
if (fft.size() != probki.size()) {
- DSP::log << DSP::e::LogMode::Error << "DSP::Fourier::absFFT" << DSP::e::LogMode::second << "fft.size() != probki.size()" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Fourier::absFFT" << DSP::e::LogMode::second << "fft.size() != probki.size()" << std::endl;
return;
}
#endif
@@ -419,7 +419,7 @@ void DSP::Fourier::abs2FFT(const unsigned long &N, DSP::Float_vector &abs_fft, c
#ifdef __DEBUG__
if (fft.size() != probki.size()) {
- DSP::log << DSP::e::LogMode::Error << "DSP::Fourier::abs2FFT" << DSP::e::LogMode::second << "fft.size() != probki.size()" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Fourier::abs2FFT" << DSP::e::LogMode::second << "fft.size() != probki.size()" << std::endl;
return;
}
#endif
@@ -983,7 +983,7 @@ void DSP::Fourier::DFT(const unsigned long &N, const DSP::Complex_vector &probki
#ifdef __DEBUG__
if (probki_in.size() != probki_out.size()) {
- DSP::log << DSP::e::LogMode::Error << "DSP::Fourier::DFT" << DSP::e::LogMode::second << "probki_in.size() != probki_out.size()" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Fourier::DFT" << DSP::e::LogMode::second << "probki_in.size() != probki_out.size()" << std::endl;
return;
}
#endif
diff --git a/src/cpp/DSP_IO.cpp b/src/cpp/DSP_IO.cpp
index e0ff649..eefaa45 100644
--- a/src/cpp/DSP_IO.cpp
+++ b/src/cpp/DSP_IO.cpp
@@ -30,12 +30,12 @@
//*****************************************************//
//*****************************************************//
unsigned long DSP::f::ReadCoefficientsFromFile(DSP::Float_vector &Buffer, unsigned long N,
- const string &FileName, const string &FileDir,
+ const std::string &FileName, const std::string &FileDir,
DSP::e::SampleType type,
unsigned long offset)
{
FILE *plik;
- string file_name;
+ std::string file_name;
uint32_t ValuesRead;
unsigned int ind;
@@ -57,7 +57,7 @@ unsigned long DSP::f::ReadCoefficientsFromFile(DSP::Float_vector &Buffer, unsign
case DSP::e::SampleType::ST_uchar:
//reading
{
- vector<uint8_t> tempBuffer;
+ std::vector<uint8_t> tempBuffer;
tempBuffer.resize(N);
ValuesRead=(uint32_t)fread(tempBuffer.data(), sizeof(uint8_t), N, plik);
//convertion
@@ -68,7 +68,7 @@ unsigned long DSP::f::ReadCoefficientsFromFile(DSP::Float_vector &Buffer, unsign
case DSP::e::SampleType::ST_short:
//reading
{
- vector<short> tempBuffer;
+ std::vector<short> tempBuffer;
tempBuffer.resize(N);
ValuesRead=(uint32_t)fread(tempBuffer.data(), sizeof(short), N, plik);
//convertion
@@ -91,7 +91,7 @@ unsigned long DSP::f::ReadCoefficientsFromFile(DSP::Float_vector &Buffer, unsign
#ifdef __DEBUG__
else
{
- DSP::log << DSP::e::LogMode::Error << "DSP::f::ReadCoefficientsFromFile" << DSP::e::LogMode::second << "ReadCoefficientsFromFile wrong offset" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::f::ReadCoefficientsFromFile" << DSP::e::LogMode::second << "ReadCoefficientsFromFile wrong offset" << std::endl;
}
#endif
fclose(plik);
@@ -101,12 +101,12 @@ unsigned long DSP::f::ReadCoefficientsFromFile(DSP::Float_vector &Buffer, unsign
//*****************************************************//
unsigned long DSP::f::ReadCoefficientsFromFile(DSP::Complex_vector &Buffer, unsigned long N,
- const string &FileName, const string &FileDir,
+ const std::string &FileName, const std::string &FileDir,
DSP::e::SampleType type,
unsigned long offset)
{
FILE *plik;
- string file_name;
+ std::string file_name;
uint32_t ValuesRead;
unsigned int ind;
@@ -128,7 +128,7 @@ unsigned long DSP::f::ReadCoefficientsFromFile(DSP::Complex_vector &Buffer, unsi
case DSP::e::SampleType::ST_uchar:
//reading
{
- vector<uint8_t> tempBuffer;
+ std::vector<uint8_t> tempBuffer;
tempBuffer.resize(2*N);
ValuesRead=(uint32_t)fread(tempBuffer.data(), sizeof(uint8_t), 2*N, plik);
//convertion
@@ -143,7 +143,7 @@ unsigned long DSP::f::ReadCoefficientsFromFile(DSP::Complex_vector &Buffer, unsi
case DSP::e::SampleType::ST_short:
//reading
{
- vector<short> tempBuffer;
+ std::vector<short> tempBuffer;
tempBuffer.resize(2*N);
ValuesRead=(uint32_t)fread(tempBuffer.data(), sizeof(short), 2*N, plik);
//convertion
@@ -158,7 +158,7 @@ unsigned long DSP::f::ReadCoefficientsFromFile(DSP::Complex_vector &Buffer, unsi
case DSP::e::SampleType::ST_float:
//reading
{
- vector<DSP::Float> tempBuffer;
+ std::vector<DSP::Float> tempBuffer;
tempBuffer.resize(2*N);
ValuesRead=(uint32_t)fread(Buffer.data(), sizeof(float), 2*N, plik);
// convertion
@@ -175,7 +175,7 @@ unsigned long DSP::f::ReadCoefficientsFromFile(DSP::Complex_vector &Buffer, unsi
#ifdef __DEBUG__
else
{
- DSP::log << DSP::e::LogMode::Error << "DSP::f::ReadCoefficientsFromFile" << DSP::e::LogMode::second << "ReadCoefficientsFromFile wrong offset" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::f::ReadCoefficientsFromFile" << DSP::e::LogMode::second << "ReadCoefficientsFromFile wrong offset" << std::endl;
}
#endif
fclose(plik);
@@ -243,7 +243,7 @@ DSP::u::Vacuum::Vacuum(bool AreInputsComplex, unsigned int NoOfInputs_in)
void DSP::u::Vacuum::Init(bool AreInputsComplex, unsigned int NoOfInputs_in)
{
unsigned int ind;
- string temp;
+ std::string temp;
SetName("Vacuum", false);
@@ -270,16 +270,16 @@ void DSP::u::Vacuum::Init(bool AreInputsComplex, unsigned int NoOfInputs_in)
}
}
- vector <unsigned int> all_indexes;
+ std::vector <unsigned int> all_indexes;
for (ind=0; ind<NoOfInputs_in; ind++)
{
if (AreInputsComplex == false)
{
all_indexes.push_back(ind);
- temp = "in" + to_string(ind+1);
+ temp = "in" + std::to_string(ind+1);
DefineInput(temp, ind);
- temp = "in" + to_string(ind+1) + ".re";
+ temp = "in" + std::to_string(ind+1) + ".re";
DefineInput(temp, ind);
}
else
@@ -287,12 +287,12 @@ void DSP::u::Vacuum::Init(bool AreInputsComplex, unsigned int NoOfInputs_in)
all_indexes.push_back(2*ind);
all_indexes.push_back(2*ind+1);
- temp = "in" + to_string(ind+1);
+ temp = "in" + std::to_string(ind+1);
DefineInput(temp, 2*ind, 2*ind+1);
- temp = "in" + to_string(ind+1) + ".re";
+ temp = "in" + std::to_string(ind+1) + ".re";
DefineInput(temp, 2*ind);
- temp = "in" + to_string(ind+1) + ".im";
+ temp = "in" + std::to_string(ind+1) + ".im";
DefineInput(temp, 2*ind+1);
}
}
@@ -316,11 +316,11 @@ void DSP::u::Vacuum::InputExecute(INPUT_EXECUTE_ARGS)
//*****************************************************//
//*****************************************************//
// Determines file type by filename extension
-DSP::e::FileType DSP::f::FileExtToFileType(const string &filename)
+DSP::e::FileType DSP::f::FileExtToFileType(const std::string &filename)
{
DSP::e::FileType FileType;
int ind;
- string ext;
+ std::string ext;
FileType = DSP::e::FileType::FT_raw;
@@ -339,7 +339,7 @@ DSP::e::FileType DSP::f::FileExtToFileType(const string &filename)
if (ext.length() > 0)
{
- string upper_ext = ext;
+ std::string upper_ext = ext;
std::transform(upper_ext.begin(), upper_ext.end(),upper_ext.begin(), ::toupper);
if (upper_ext.compare("FLT") == 0)
FileType = DSP::e::FileType::FT_flt;
@@ -355,13 +355,13 @@ DSP::e::FileType DSP::f::FileExtToFileType(const string &filename)
//*****************************************************//
//*****************************************************//
DSP::u::FileInput::FileInput(DSP::Clock_ptr ParentClock,
- const string &FileName,
+ const std::string &FileName,
unsigned int NoOfChannels,
DSP::e::SampleType sample_type,
DSP::e::FileType FILEtype)
: DSP::File(), DSP::Source()
{
- string temp;
+ std::string temp;
bool ready;
SetName("FileInput", false);
@@ -380,7 +380,7 @@ DSP::u::FileInput::FileInput(DSP::Clock_ptr ParentClock,
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::u::FileInput::FileInput" << DSP::e::LogMode::second
- << "Detection of no of channels is not supported for DSP::e::FileType::FT_raw (defaulting to 1 channels)" << endl;
+ << "Detection of no of channels is not supported for DSP::e::FileType::FT_raw (defaulting to 1 channels)" << std::endl;
NoOfChannels = 1;
#endif
}
@@ -407,7 +407,7 @@ DSP::u::FileInput::FileInput(DSP::Clock_ptr ParentClock,
//NoOfChannels = 2;
//! \bug support for reading files with different number of channels then number of block's outputs
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::u::FileInput::FileInput" << DSP::e::LogMode::second << "Wrong number of channels for *.tape file !!!" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::FileInput::FileInput" << DSP::e::LogMode::second << "Wrong number of channels for *.tape file !!!" << std::endl;
#endif
ready = false;
}
@@ -417,7 +417,7 @@ DSP::u::FileInput::FileInput(DSP::Clock_ptr ParentClock,
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::u::FileInput::FileInput" << DSP::e::LogMode::second
<< "Incorrect number of input channels: expected "
- << NoOfOutputs << " but found " << NoOfFileChannels << "!!!" << endl;
+ << NoOfOutputs << " but found " << NoOfFileChannels << "!!!" << std::endl;
#endif
//! \bug support for reading files with different number of channels then number of block's outputs
ready = false;
@@ -441,7 +441,7 @@ DSP::u::FileInput::FileInput(DSP::Clock_ptr ParentClock,
if (NoOfOutputs > 2)
{
unsigned int ind;
- vector <unsigned int> tempOut;
+ std::vector <unsigned int> tempOut;
tempOut.resize(NoOfOutputs);
for (ind=0; ind<NoOfOutputs; ind++)
tempOut[ind]=ind;
@@ -451,7 +451,7 @@ DSP::u::FileInput::FileInput(DSP::Clock_ptr ParentClock,
DefineOutput("out.im", 1);
for (ind=0; ind<NoOfOutputs; ind++)
{
- temp = "out" + to_string(ind+1);
+ temp = "out" + std::to_string(ind+1);
DefineOutput(temp, ind);
}
}
@@ -462,7 +462,7 @@ DSP::u::FileInput::FileInput(DSP::Clock_ptr ParentClock,
// +++++++++++++++++++++++++++++++++++++++++++++ //
if (ready == false) {
DSP::log << DSP::e::LogMode::Error << "DSP::u::FileInput" << DSP::e::LogMode::second
- << "Block <" << GetName() << "> failed to open file \"" << FileName << "\"" << endl;
+ << "Block <" << GetName() << "> failed to open file \"" << FileName << "\"" << std::endl;
OutputExecute_ptr = &OutputExecute_Dummy;
}
else
@@ -474,12 +474,12 @@ bool DSP::u::FileInput::SetSkip(long long Offset)
UNUSED_ARGUMENT(Offset);
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::u::FileInput::SetSkip" << DSP::e::LogMode::second << "not implemented yet" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::FileInput::SetSkip" << DSP::e::LogMode::second << "not implemented yet" << std::endl;
#endif
return false;
}
-bool DSP::u::FileInput::OpenFile(const string &FileName,
+bool DSP::u::FileInput::OpenFile(const std::string &FileName,
DSP::e::SampleType sample_type, DSP::e::FileType FILEtype,
unsigned int Default_NoOfChannels)
{
@@ -507,7 +507,7 @@ bool DSP::u::FileInput::OpenFile(const string &FileName,
ready = false;
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::u::FileInput::FileInput" << DSP::e::LogMode::second << "Unsupported *.flt file version !!!" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::FileInput::FileInput" << DSP::e::LogMode::second << "Unsupported *.flt file version !!!" << std::endl;
//! \todo verify if file header data match constructor parameters
#endif
}
@@ -531,15 +531,15 @@ bool DSP::u::FileInput::OpenFile(const string &FileName,
ready = false;
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::u::FileInput::FileInput" << DSP::e::LogMode::second << "Unsupported *.tape file sample type!!!" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::FileInput::FileInput" << DSP::e::LogMode::second << "Unsupported *.tape file sample type!!!" << std::endl;
#endif
}
#ifdef __DEBUG__
if (sizeof(DSP::T_TAPE_header) != DSP::TAPE_header_LEN)
- DSP::log << DSP::e::LogMode::Error << "DSP::u::FileInput::FileInput" << DSP::e::LogMode::second << "TAPE_header_LEN does not much sizeof T_TAPE_header structure !!!" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::FileInput::FileInput" << DSP::e::LogMode::second << "TAPE_header_LEN does not much sizeof T_TAPE_header structure !!!" << std::endl;
if (tape_header[0].header_size() != DSP::TAPE_header_LEN)
- DSP::log << DSP::e::LogMode::Error << "DSP::u::FileInput::FileInput" << DSP::e::LogMode::second << "Unsupported *.tape file version !!!" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::FileInput::FileInput" << DSP::e::LogMode::second << "Unsupported *.tape file version !!!" << std::endl;
#endif
SamplingRate = tape_header[0].sampling_rate();
@@ -558,7 +558,7 @@ bool DSP::u::FileInput::OpenFile(const string &FileName,
#ifdef __DEBUG__
{
DSP::log << DSP::e::LogMode::Error << "DSP::u::FileInput::FileInput" << DSP::e::LogMode::second
- << "This (" << FileName << ") is not PCM WAVE file or file is corrupted !!!" << endl;
+ << "This (" << FileName << ") is not PCM WAVE file or file is corrupted !!!" << std::endl;
}
#endif
}
@@ -582,7 +582,7 @@ bool DSP::u::FileInput::OpenFile(const string &FileName,
#ifdef __DEBUG__
{
DSP::log << DSP::e::LogMode::Error << "DSP::u::FileInput::FileInput" << DSP::e::LogMode::second
- << "Unsupported PCM sample size ==> " << wav_header[0].wBitsPerSample << " bits!!!" << endl;
+ << "Unsupported PCM sample size ==> " << wav_header[0].wBitsPerSample << " bits!!!" << std::endl;
}
#endif
break;
@@ -596,7 +596,7 @@ bool DSP::u::FileInput::OpenFile(const string &FileName,
#ifdef __DEBUG__
{
DSP::log << DSP::e::LogMode::Error << "DSP::u::FileInput::FileInput" << DSP::e::LogMode::second
- << "No data have been found in PCM file " << FileName << "!!!" << endl;
+ << "No data have been found in PCM file " << FileName << "!!!" << std::endl;
}
#endif
}
@@ -717,7 +717,7 @@ unsigned long DSP::u::FileInput::GetSampleSize(DSP::e::SampleType SampleType_in)
if ((DSP::File_buffer_size % 8) != 0)
{
DSP::log << DSP::e::LogMode::Error << "DSP::u::FileInput" << DSP::e::LogMode::second << "Can't read bit stream corectly:"
- " DSP::File_buffer_size is not a multiply of byte size (8 bits)" << endl;
+ " DSP::File_buffer_size is not a multiply of byte size (8 bits)" << std::endl;
}
break;
case DSP::e::SampleType::ST_short:
@@ -728,7 +728,7 @@ unsigned long DSP::u::FileInput::GetSampleSize(DSP::e::SampleType SampleType_in)
break;
default:
sample_size=8*sizeof(short);
- DSP::log << DSP::e::LogMode::Error << "DSP::u::FileInput" << DSP::e::LogMode::second << "Unsupported data type" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::FileInput" << DSP::e::LogMode::second << "Unsupported data type" << std::endl;
break;
}
sample_size*=NoOfFileChannels;
@@ -998,7 +998,7 @@ bool DSP::u::FileInput::OutputExecute(OUTPUT_EXECUTE_ARGS)
//*****************************************************//
DSP::u::FileOutput::FileOutput(unsigned char NoOfChannels) : DSP::Block()
{
- string temp;
+ std::string temp;
ReOpen_FileType = DSP::e::FileType::FT_raw;
ReOpen_sampling_rate = 0;
ReOpen_SampleType = DSP::e::SampleType::ST_none;
@@ -1032,7 +1032,7 @@ DSP::u::FileOutput::FileOutput(unsigned char NoOfChannels) : DSP::Block()
if (NoOfChannels > 2)
{
unsigned int ind;
- vector <unsigned int> tempOut;
+ std::vector <unsigned int> tempOut;
tempOut.resize(NoOfChannels);
for (ind=0; ind<NoOfChannels; ind++)
tempOut[ind]=ind;
@@ -1042,7 +1042,7 @@ DSP::u::FileOutput::FileOutput(unsigned char NoOfChannels) : DSP::Block()
DefineInput("in.im", 1);
for (ind=0; ind<NoOfChannels; ind++)
{
- temp = "in" + to_string(ind+1);
+ temp = "in" + std::to_string(ind+1);
DefineInput(temp, ind);
}
}
@@ -1063,13 +1063,13 @@ DSP::u::FileOutput::FileOutput(unsigned char NoOfChannels) : DSP::Block()
UnblockFile = false;
}
-DSP::u::FileOutput::FileOutput(const string &FileName,
+DSP::u::FileOutput::FileOutput(const std::string &FileName,
DSP::e::SampleType sample_type,
unsigned int NoOfChannels,
DSP::e::FileType file_type, long int sampling_rate)
: DSP::Block()
{
- string temp;
+ std::string temp;
SetName("FileOutput", false);
SetNoOfOutputs(0);
@@ -1093,7 +1093,7 @@ DSP::u::FileOutput::FileOutput(const string &FileName,
if (NoOfChannels > 2)
{
unsigned int ind;
- vector<unsigned int> tempOut;
+ std::vector<unsigned int> tempOut;
tempOut.resize(NoOfChannels);
for (ind=0; ind<NoOfChannels; ind++)
tempOut[ind]=ind;
@@ -1103,7 +1103,7 @@ DSP::u::FileOutput::FileOutput(const string &FileName,
DefineInput("in.im", 1);
for (ind=0; ind<NoOfChannels; ind++)
{
- temp = "in" + to_string(ind+1);
+ temp = "in" + std::to_string(ind+1);
DefineInput(temp, ind);
}
}
@@ -1132,7 +1132,7 @@ unsigned long DSP::u::FileOutput::GetSamplingRate(void)
return ReOpen_sampling_rate;
}
-bool DSP::u::FileOutput::Open(const string &FileName, DSP::e::SampleType sample_type, unsigned int NoOfChannels,
+bool DSP::u::FileOutput::Open(const std::string &FileName, DSP::e::SampleType sample_type, unsigned int NoOfChannels,
DSP::e::FileType file_type, long int sampling_rate)
{
FileType = file_type;
@@ -1145,7 +1145,7 @@ bool DSP::u::FileOutput::Open(const string &FileName, DSP::e::SampleType sample_
if (NoOfChannels > UCHAR_MAX)
{
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::u::FileOutput::Open" << DSP::e::LogMode::second << "NoOfChannels to large (> UCHAR_MAX)" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::FileOutput::Open" << DSP::e::LogMode::second << "NoOfChannels to large (> UCHAR_MAX)" << std::endl;
#endif
NoOfChannels = UCHAR_MAX;
}
@@ -1191,7 +1191,7 @@ bool DSP::u::FileOutput::Open(const string &FileName, DSP::e::SampleType sample_
if ((DSP::File_buffer_size % 8) != 0)
{
DSP::log << DSP::e::LogMode::Error << "DSP::u::FileOutput" << DSP::e::LogMode::second << "Can't write bit stream correctly:"
- " DSP::File_buffer_size is not a multiply of byte size (8 bits)" << endl;
+ " DSP::File_buffer_size is not a multiply of byte size (8 bits)" << std::endl;
}
// "0 / 1" byte by byte
TmpBuffer.resize(SampleSize*DSP::File_buffer_size);
@@ -1201,7 +1201,7 @@ bool DSP::u::FileOutput::Open(const string &FileName, DSP::e::SampleType sample_
break;
default:
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::u::FileOutput" << DSP::e::LogMode::second << "Unsupported data type changing to DSP::e::SampleType::ST_short" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::FileOutput" << DSP::e::LogMode::second << "Unsupported data type changing to DSP::e::SampleType::ST_short" << std::endl;
#endif
SampleType = DSP::e::SampleType::ST_short;
Execute_ptr = &InputExecute_short;
@@ -1228,7 +1228,7 @@ bool DSP::u::FileOutput::Open(const string &FileName, DSP::e::SampleType sample_
break;
default:
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::u::FileOutput" << DSP::e::LogMode::second << "*.wav: unsupported sample type" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::FileOutput" << DSP::e::LogMode::second << "*.wav: unsupported sample type" << std::endl;
#endif
break;
}
@@ -1288,7 +1288,7 @@ bool DSP::u::FileOutput::Open(const string &FileName, DSP::e::SampleType sample_
break;
default:
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::u::FileOutput" << DSP::e::LogMode::second << "*.flt: unsupported sample type" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::FileOutput" << DSP::e::LogMode::second << "*.flt: unsupported sample type" << std::endl;
#endif
break;
}
@@ -1332,7 +1332,7 @@ bool DSP::File::SetOffset(long long Offset, DSP::e::OffsetMode mode)
case DSP::e::OffsetMode::standard:
default:
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::u::FileOutput:: SetOffset" << DSP::e::LogMode::second << "The mode is unsuported" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::FileOutput:: SetOffset" << DSP::e::LogMode::second << "The mode is unsuported" << std::endl;
#endif
break;
}
@@ -1378,7 +1378,7 @@ unsigned long DSP::u::FileOutput::GetSampleSize(DSP::e::SampleType SampleType_in
if ((DSP::File_buffer_size % 8) != 0)
{
DSP::log << DSP::e::LogMode::Error << "DSP::u::FileOutput::GetSampleSize" << DSP::e::LogMode::second << "Can't write bit stream corectly:"
- " DSP::File_buffer_size is not a multiply of byte size (8 bits)" << endl;
+ " DSP::File_buffer_size is not a multiply of byte size (8 bits)" << std::endl;
}
break;
case DSP::e::SampleType::ST_none:
@@ -1386,7 +1386,7 @@ unsigned long DSP::u::FileOutput::GetSampleSize(DSP::e::SampleType SampleType_in
break;
default:
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::u::FileOutput::GetSampleSize" << DSP::e::LogMode::second << "Unsupported data type changing to DSP::e::SampleType::ST_short" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::FileOutput::GetSampleSize" << DSP::e::LogMode::second << "Unsupported data type changing to DSP::e::SampleType::ST_short" << std::endl;
#endif
sample_size=8*sizeof(short);
break;
@@ -1456,7 +1456,7 @@ void DSP::u::FileOutput::PerformReOpen(void)
ReOpenFile = false;
}
-void DSP::u::FileOutput::ReOpen(const string &FileName, DSP::e::SampleType sample_type,
+void DSP::u::FileOutput::ReOpen(const std::string &FileName, DSP::e::SampleType sample_type,
DSP::e::FileType file_type, long int sampling_rate)
{
ReOpen_FileName = FileName;
@@ -1473,7 +1473,7 @@ bool DSP::u::FileOutput::BlockOutput(bool block)
if (FileHandle == NULL)
{
#ifdef __DEBUG__
- DSP::log << "DSP::u::FileOutput::BlockOutput" << DSP::e::LogMode::second << "Warning: FileHandle == NULL !!!" << endl;
+ DSP::log << "DSP::u::FileOutput::BlockOutput" << DSP::e::LogMode::second << "Warning: FileHandle == NULL !!!" << std::endl;
#endif
return false;
}
@@ -1654,7 +1654,7 @@ unsigned long DSP::u::FileOutput::WriteSegmentFromBuffer(
break;
default:
- DSP::log << DSP::e::LogMode::Error << "DSP::u::FileOutput::WriteSegmentToBuffer" << DSP::e::LogMode::second << "Unsupported file sample type - write aborted" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::FileOutput::WriteSegmentToBuffer" << DSP::e::LogMode::second << "Unsupported file sample type - write aborted" << std::endl;
return 0;
}
@@ -2383,7 +2383,7 @@ void DSP::u::FileOutput::FlushBuffer(void)
{
#ifdef __DEBUG__
case DSP::e::SampleType::ST_short:
- DSP::log << "DSP::u::FileOutput::FlushBuffer" << DSP::e::LogMode::second << "DSP::e::SampleType::ST_short no longer supported" << endl;
+ DSP::log << "DSP::u::FileOutput::FlushBuffer" << DSP::e::LogMode::second << "DSP::e::SampleType::ST_short no longer supported" << std::endl;
/*
tempBuffer_float=Buffer;
@@ -2397,7 +2397,7 @@ void DSP::u::FileOutput::FlushBuffer(void)
*/
break;
case DSP::e::SampleType::ST_float:
- DSP::log << "DSP::u::FileOutput::FlushBuffer" << DSP::e::LogMode::second << "DSP::e::SampleType::ST_float no longer supported" << endl;
+ DSP::log << "DSP::u::FileOutput::FlushBuffer" << DSP::e::LogMode::second << "DSP::e::SampleType::ST_float no longer supported" << std::endl;
/*
tempBuffer_float=Buffer;
@@ -2411,10 +2411,10 @@ void DSP::u::FileOutput::FlushBuffer(void)
*/
break;
case DSP::e::SampleType::ST_tchar:
- DSP::log << "DSP::u::FileOutput::FlushBuffer" << DSP::e::LogMode::second << "DSP::e::SampleType::ST_tchar no longer supported" << endl;
+ DSP::log << "DSP::u::FileOutput::FlushBuffer" << DSP::e::LogMode::second << "DSP::e::SampleType::ST_tchar no longer supported" << std::endl;
break;
case DSP::e::SampleType::ST_uchar:
- DSP::log << "DSP::u::FileOutput::FlushBuffer" << DSP::e::LogMode::second << "DSP::e::SampleType::ST_uchar no longer supported" << endl;
+ DSP::log << "DSP::u::FileOutput::FlushBuffer" << DSP::e::LogMode::second << "DSP::e::SampleType::ST_uchar no longer supported" << std::endl;
/*
tempBuffer_float=Buffer;
@@ -2428,7 +2428,7 @@ void DSP::u::FileOutput::FlushBuffer(void)
*/
break;
case DSP::e::SampleType::ST_bit_text:
- DSP::log << "DSP::u::FileOutput::FlushBuffer" << DSP::e::LogMode::second << "DSP::e::SampleType::ST_bit_text no longer supported" << endl;
+ DSP::log << "DSP::u::FileOutput::FlushBuffer" << DSP::e::LogMode::second << "DSP::e::SampleType::ST_bit_text no longer supported" << std::endl;
/*
tempBuffer_float=Buffer;
@@ -2491,7 +2491,7 @@ void DSP::u::FileOutput::FlushBuffer(void)
break;
default:
#ifdef __DEBUG__
- DSP::log << "DSP::u::FileOutput::FlushBuffer" << DSP::e::LogMode::second << "Unsupported format detected" << endl;
+ DSP::log << "DSP::u::FileOutput::FlushBuffer" << DSP::e::LogMode::second << "Unsupported format detected" << std::endl;
#endif
break;
}
@@ -2518,10 +2518,10 @@ void DSP::u::FileOutput::raw_FlushBuffer(void)
//*****************************************************//
//*****************************************************//
-bool DSP::f::GetWAVEfileParams(const string &FileName, const string &FileDir,
+bool DSP::f::GetWAVEfileParams(const std::string &FileName, const std::string &FileDir,
T_WAVEchunk_ptr WAVEparams)
{
- string tekst;
+ std::string tekst;
FILE *hIn;
tekst = FileDir;
@@ -2545,7 +2545,7 @@ bool DSP::f::GetWAVEfileParams(const string &FileName, const string &FileDir,
#ifdef __DEBUG__
{
DSP::log << DSP::e::LogMode::Error << "DSP::f::GetWAVEfileParams" << DSP::e::LogMode::second
- << "This (" << FileName << ") is not PCM WAVE file or file is corrupted !!!" << endl;
+ << "This (" << FileName << ") is not PCM WAVE file or file is corrupted !!!" << std::endl;
}
#endif
fclose(hIn);
@@ -2558,7 +2558,7 @@ bool DSP::f::GetWAVEfileParams(const string &FileName, const string &FileDir,
// Creates object for *.wav files reading
DSP::u::WaveInput::WaveInput(DSP::Clock_ptr ParentClock,
- const string &FileName_in, const string &FileDir_in,
+ const std::string &FileName_in, const std::string &FileDir_in,
unsigned int OutputsNo)
: DSP::File(), DSP::Source()
{
@@ -2581,8 +2581,8 @@ DSP::u::WaveInput::WaveInput(DSP::Clock_ptr ParentClock,
if (OutputsNo > 2)
{
unsigned int ind;
- vector<unsigned int> tempOut;
- string temp;
+ std::vector<unsigned int> tempOut;
+ std::string temp;
tempOut.resize(OutputsNo);
for (ind=0; ind<OutputsNo; ind++)
@@ -2593,7 +2593,7 @@ DSP::u::WaveInput::WaveInput(DSP::Clock_ptr ParentClock,
DefineOutput("out.im", 1);
for (ind=0; ind<OutputsNo; ind++)
{
- temp = "out" + to_string(ind+1);
+ temp = "out" + std::to_string(ind+1);
DefineOutput(temp, ind);
}
}
@@ -2625,7 +2625,7 @@ bool DSP::u::WaveInput::SetSkip(long long Offset)
UNUSED_ARGUMENT(Offset);
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::u::FileInput::SetSkip" << DSP::e::LogMode::second << "not implemented yet" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::FileInput::SetSkip" << DSP::e::LogMode::second << "not implemented yet" << std::endl;
#endif
return false;
}
@@ -2635,7 +2635,7 @@ bool DSP::u::WaveInput::SetSkip(long long Offset)
//To be used in constructor
bool DSP::u::WaveInput::Init(void)
{
- string tekst;
+ std::string tekst;
int len;
BufferIndex=0; //this means also that Buffer is empty
@@ -2661,7 +2661,7 @@ bool DSP::u::WaveInput::Init(void)
#ifdef __DEBUG__
DSP::log << "DSP::u::WaveInput::Init" << DSP::e::LogMode::second
<< "(Input file \"" << tekst
- << "\" in block <" << GetName() << "> could not be opened" << endl;
+ << "\" in block <" << GetName() << "> could not be opened" << std::endl;
#endif
FileEnd=true;
@@ -2677,7 +2677,7 @@ bool DSP::u::WaveInput::Init(void)
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::u::WaveInput::Init" << DSP::e::LogMode::second
- << "This (" << FileName << ") is not PCM WAVE file or file is corrupted !!!" << endl;
+ << "This (" << FileName << ") is not PCM WAVE file or file is corrupted !!!" << std::endl;
#endif
fclose(FileHandle);
FileHandle=NULL;
@@ -2688,7 +2688,7 @@ bool DSP::u::WaveInput::Init(void)
//Check channels number
#ifdef __DEBUG__
{
- stringstream temp;
+ std::stringstream temp;
switch (WAVEchunk.nChannels)
{
case 1:
@@ -2705,7 +2705,7 @@ bool DSP::u::WaveInput::Init(void)
<< WAVEchunk.wBitsPerSample << "bits";
break;
}
- DSP::log << "DSP::u::WaveInput::Init" << DSP::e::LogMode::second << temp.str() << endl;
+ DSP::log << "DSP::u::WaveInput::Init" << DSP::e::LogMode::second << temp.str() << std::endl;
}
#endif
//SampleSize = WAVEchunk.wBitsPerSample * WAVEchunk.nChannels;
@@ -2715,7 +2715,7 @@ bool DSP::u::WaveInput::Init(void)
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::u::WaveInput::Init" << DSP::e::LogMode::second
- << "No data have been found in PCM file " << FileName << "!!!" << endl;
+ << "No data have been found in PCM file " << FileName << "!!!" << std::endl;
#endif
fclose(FileHandle);
FileHandle=NULL;
@@ -2827,7 +2827,7 @@ uint32_t DSP::u::WaveInput::ReadAudioSegment(void)
#ifdef __DEBUG__
else
{
- DSP::log << DSP::e::LogMode::Error << "DSP::u::WaveInput::ReadAudioSegment" << DSP::e::LogMode::second << "unsupported PCM sample size" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::WaveInput::ReadAudioSegment" << DSP::e::LogMode::second << "unsupported PCM sample size" << std::endl;
}
#endif
@@ -2932,7 +2932,7 @@ inline void __fastcall CAudioInput::Execute() {};
//================================================================//
inline void CWaveInput::SourceDescription(TStringList *Text)
{
- string temp;
+ std::string temp;
int ind, ind_;
SYSTEMTIME stime;
@@ -3046,7 +3046,7 @@ void DSP::T_WAVEchunk::PrepareHeader(
wBitsPerSample = wBitsPerSample_in;
#ifdef __DEBUG__
if ((wBitsPerSample % 8) != 0)
- DSP::log << DSP::e::LogMode::Error << "T_WAVEchunk::PrepareHeader" << DSP::e::LogMode::second << "wBitsPerSample_in in not a multiple of 8" << endl;
+ DSP::log << DSP::e::LogMode::Error << "T_WAVEchunk::PrepareHeader" << DSP::e::LogMode::second << "wBitsPerSample_in in not a multiple of 8" << std::endl;
#endif
nBlockAlign = (uint16_t)(wBitsPerSample / 8 * nChannels);
nAvgBytesPerSec = nSamplesPerSec * nBlockAlign;
@@ -3472,7 +3472,7 @@ inline short CDirectXInput::GetFullBuffersNo(void)
inline void CDirectXInput::SourceDescription(TStringList *Text)
{
- string temp;
+ std::string temp;
int ind, ind_;
SYSTEMTIME stime;
@@ -3519,31 +3519,31 @@ inline void CDirectXInput::SourceDescription(TStringList *Text)
{
case MMSYSERR_ALLOCATED:
DSP::log << DSP::e::LogMode::Error << "DSP::f::AudioCheckError" << DSP::e::LogMode::second <<
- "Specified resource is already allocated." << endl;
+ "Specified resource is already allocated." << std::endl;
break;
case MMSYSERR_BADDEVICEID:
DSP::log << DSP::e::LogMode::Error << "DSP::f::AudioCheckError" << DSP::e::LogMode::second <<
- "Specified device identifier is out of range." << endl;
+ "Specified device identifier is out of range." << std::endl;
break;
case MMSYSERR_NODRIVER:
DSP::log << DSP::e::LogMode::Error << "DSP::f::AudioCheckError" << DSP::e::LogMode::second <<
- "No device driver is present." << endl;
+ "No device driver is present." << std::endl;
break;
case MMSYSERR_NOMEM:
DSP::log << DSP::e::LogMode::Error << "DSP::f::AudioCheckError" << DSP::e::LogMode::second <<
- "Unable to allocate or lock memory." << endl;
+ "Unable to allocate or lock memory." << std::endl;
break;
case WAVERR_BADFORMAT:
DSP::log << DSP::e::LogMode::Error << "DSP::f::AudioCheckError" << DSP::e::LogMode::second <<
- "Attempted to open with an unsupported waveform-audio format." << endl;
+ "Attempted to open with an unsupported waveform-audio format." << std::endl;
break;
case WAVERR_SYNC:
DSP::log << DSP::e::LogMode::Error << "DSP::f::AudioCheckError" << DSP::e::LogMode::second <<
- "The device is synchronous but waveOutOpen was called without using the WAVE_ALLOWSYNC flag." << endl;
+ "The device is synchronous but waveOutOpen was called without using the WAVE_ALLOWSYNC flag." << std::endl;
break;
case MMSYSERR_INVALFLAG:
DSP::log << DSP::e::LogMode::Error << "DSP::f::AudioCheckError" << DSP::e::LogMode::second <<
- "Invalid flag" << endl;
+ "Invalid flag" << std::endl;
break;
case MMSYSERR_NOERROR:
return false;
@@ -3553,24 +3553,24 @@ inline void CDirectXInput::SourceDescription(TStringList *Text)
break;
case MMSYSERR_INVALHANDLE:
DSP::log << DSP::e::LogMode::Error << "DSP::f::AudioCheckError" << DSP::e::LogMode::second <<
- "Specified device handle is invalid." << endl;
+ "Specified device handle is invalid." << std::endl;
break;
case WAVERR_UNPREPARED:
DSP::log << DSP::e::LogMode::Error << "DSP::f::AudioCheckError" << DSP::e::LogMode::second <<
- "The data block pointed to by the pwh parameter hasn't been prepared." << endl;
+ "The data block pointed to by the pwh parameter hasn't been prepared." << std::endl;
break;
case MMSYSERR_HANDLEBUSY:
DSP::log << DSP::e::LogMode::Error << "DSP::f::AudioCheckError" << DSP::e::LogMode::second <<
- "Handle busy." << endl;
+ "Handle busy." << std::endl;
break;
case WAVERR_STILLPLAYING:
DSP::log << DSP::e::LogMode::Error << "DSP::f::AudioCheckError" << DSP::e::LogMode::second <<
- "There are still buffers in the queue." << endl;
+ "There are still buffers in the queue." << std::endl;
break;
default:
{
DSP::log << DSP::e::LogMode::Error << "DSP::f::AudioCheckError" << DSP::e::LogMode::second
- << "Unknown error " << WAVERR_BASE << " " << result << endl;
+ << "Unknown error " << WAVERR_BASE << " " << result << std::endl;
}
break;
}
@@ -3604,7 +3604,7 @@ uint32_t DSP::f::GetAudioBufferSize(const unsigned long &SamplingFreq, const DSP
#ifdef __DEBUG__
if ((SamplingFreq * size) / DSP::ReferenceFs > UINT32_MAX){
DSP::log << DSP::e::LogMode::Error << "DSP::f::GetAudioBufferSize" << DSP::e::LogMode::second
- << "Buffer size (" << (SamplingFreq * size) / DSP::ReferenceFs << ") > UINT32_MAX" << endl;
+ << "Buffer size (" << (SamplingFreq * size) / DSP::ReferenceFs << ") > UINT32_MAX" << std::endl;
}
#endif
size = (uint32_t)((SamplingFreq * size) / DSP::ReferenceFs);
@@ -3640,11 +3640,11 @@ uint32_t DSP::f::GetAudioBufferSize(const unsigned long &SamplingFreq, const DSP
// #ifdef AUDIO_DEBUG_MESSAGES_ON
// case WIM_OPEN:
// DSP::log << "DSP::u::AudioInput::waveInProc" << DSP::e::LogMode::second
- // << "WIM_OPEN(" << (int)dwInstance << ")" << endl;
+ // << "WIM_OPEN(" << (int)dwInstance << ")" << std::endl;
// break;
// case WIM_CLOSE:
// DSP::log << "DSP::u::AudioInput::waveInProc" << DSP::e::LogMode::second
- // << "WIM_CLOSE(" << (int)dwInstance << ")" << endl;
+ // << "WIM_CLOSE(" << (int)dwInstance << ")" << std::endl;
// break;
// #endif
// #endif
@@ -3653,7 +3653,7 @@ uint32_t DSP::f::GetAudioBufferSize(const unsigned long &SamplingFreq, const DSP
// #ifdef __DEBUG__
// #ifdef AUDIO_DEBUG_MESSAGES_ON
// DSP::log << "DSP::u::AudioInput::waveInProc" << DSP::e::LogMode::second
- // << "WIM_DATA(" << (int)dwInstance << ")" << endl;
+ // << "WIM_DATA(" << (int)dwInstance << ")" << std::endl;
// #endif
// #endif
@@ -3665,7 +3665,7 @@ uint32_t DSP::f::GetAudioBufferSize(const unsigned long &SamplingFreq, const DSP
// {
// #ifdef __DEBUG__
// #ifdef AUDIO_DEBUG_MESSAGES_ON
- // DSP::log << "DSP::u::AudioInput::waveInProc" << DSP::e::LogMode::second << "All buffers had been used - skipping input audio frame" << endl;
+ // DSP::log << "DSP::u::AudioInput::waveInProc" << DSP::e::LogMode::second << "All buffers had been used - skipping input audio frame" << std::endl;
// #endif
// #endif
// result=waveInUnprepareHeader(Current->hWaveIn,
@@ -3698,7 +3698,7 @@ uint32_t DSP::f::GetAudioBufferSize(const unsigned long &SamplingFreq, const DSP
// #ifdef __DEBUG__
// if (Current->InSampleType != DSP::e::SampleType::ST_short)
// {
- // DSP::log << "DSP::u::AudioInput::waveInProc_short" << DSP::e::LogMode::second << "Current->InSampleType != DSP::e::SampleType::ST_short" << endl;
+ // DSP::log << "DSP::u::AudioInput::waveInProc_short" << DSP::e::LogMode::second << "Current->InSampleType != DSP::e::SampleType::ST_short" << std::endl;
// }
// #endif
@@ -3725,7 +3725,7 @@ uint32_t DSP::f::GetAudioBufferSize(const unsigned long &SamplingFreq, const DSP
// {
// #ifdef __DEBUG__
// #ifdef AUDIO_DEBUG_MESSAGES_ON
- // DSP::log << "DSP::u::AudioInput::waveInProc" << DSP::e::LogMode::second << "Wrong audio frame ready or other unexpected error" << endl;
+ // DSP::log << "DSP::u::AudioInput::waveInProc" << DSP::e::LogMode::second << "Wrong audio frame ready or other unexpected error" << std::endl;
// #endif
// #endif
// }
@@ -3768,7 +3768,7 @@ uint32_t DSP::f::GetAudioBufferSize(const unsigned long &SamplingFreq, const DSP
// break;
// case WIM_CLOSE:
// DSP::log << "DSP::u::AudioInput::waveInProc" << DSP::e::LogMode::second
- // << "WIM_CLOSE(" << (int)dwInstance << ")" << endl;
+ // << "WIM_CLOSE(" << (int)dwInstance << ")" << std::endl;
// break;
// #endif
// #endif
@@ -3777,7 +3777,7 @@ uint32_t DSP::f::GetAudioBufferSize(const unsigned long &SamplingFreq, const DSP
// #ifdef __DEBUG__
// #ifdef AUDIO_DEBUG_MESSAGES_ON
// DSP::log << "DSP::u::AudioInput::waveInProc" << DSP::e::LogMode::second
- // << "WIM_DATA(" << (int)dwInstance << ")" << endl;
+ // << "WIM_DATA(" << (int)dwInstance << ")" << std::endl;
// #endif
// #endif
@@ -3789,7 +3789,7 @@ uint32_t DSP::f::GetAudioBufferSize(const unsigned long &SamplingFreq, const DSP
// {
// #ifdef __DEBUG__
// #ifdef AUDIO_DEBUG_MESSAGES_ON
- // DSP::log << "DSP::u::AudioInput::waveInProc" << DSP::e::LogMode::second << "All buffers had been used - skipping input audio frame" << endl;
+ // DSP::log << "DSP::u::AudioInput::waveInProc" << DSP::e::LogMode::second << "All buffers had been used - skipping input audio frame" << std::endl;
// #endif
// #endif
// result=waveInUnprepareHeader(Current->hWaveIn,
@@ -3822,7 +3822,7 @@ uint32_t DSP::f::GetAudioBufferSize(const unsigned long &SamplingFreq, const DSP
// #ifdef __DEBUG__
// if (Current->InSampleType != DSP::e::SampleType::ST_uchar)
// {
- // DSP::log << "DSP::u::AudioInput::waveInProc_uchar" << DSP::e::LogMode::second << "Current->InSampleType != DSP::e::SampleType::ST_uchar" << endl;
+ // DSP::log << "DSP::u::AudioInput::waveInProc_uchar" << DSP::e::LogMode::second << "Current->InSampleType != DSP::e::SampleType::ST_uchar" << std::endl;
// }
// #endif
@@ -3849,7 +3849,7 @@ uint32_t DSP::f::GetAudioBufferSize(const unsigned long &SamplingFreq, const DSP
// {
// #ifdef __DEBUG__
// #ifdef AUDIO_DEBUG_MESSAGES_ON
- // DSP::log << "DSP::u::AudioInput::waveInProc" << DSP::e::LogMode::second << "Wrong audio frame ready or other unexpected error" << endl;
+ // DSP::log << "DSP::u::AudioInput::waveInProc" << DSP::e::LogMode::second << "Wrong audio frame ready or other unexpected error" << std::endl;
// #endif
// #endif
// }
@@ -3916,7 +3916,7 @@ void DSP::u::AudioOutput::Init(unsigned long SamplingFreq,
UNUSED_ARGUMENT(WaveOutDevNo);
#endif
- string temp;
+ std::string temp;
SetNoOfInputs(InputsNo, true);
@@ -3939,7 +3939,7 @@ void DSP::u::AudioOutput::Init(unsigned long SamplingFreq,
}
for (unsigned int ind_i=0; ind_i<NoOfInputs; ind_i++)
{
- temp = "in" + to_string(ind_i+1);
+ temp = "in" + std::to_string(ind_i+1);
DefineInput(temp, ind_i);
ClockGroups.AddInput2Group("input", Input(temp));
}
@@ -4004,19 +4004,19 @@ bool DSP::u::AudioInput::SOUND_object_callback(const DSP::e::SampleType &InSampl
case DSP::e::SampleType::ST_short: {
if (InBufferLen != wave_in_raw_buffer.size() / sizeof(short)) {
DSP::log << "DSP::u::AudioInput::SOUND_object_callback" << DSP::e::LogMode::second << "incorrect wave_in_raw_buffer size: " <<
- wave_in_raw_buffer.size() << " instead of " << InBufferLen * sizeof(short) << endl;
+ wave_in_raw_buffer.size() << " instead of " << InBufferLen * sizeof(short) << std::endl;
}
}
break;
case DSP::e::SampleType::ST_uchar: {
if (InBufferLen != wave_in_raw_buffer.size() / sizeof(uint8_t)) {
DSP::log << "DSP::u::AudioInput::SOUND_object_callback" << DSP::e::LogMode::second << "incorrect wave_in_raw_buffer size: " <<
- wave_in_raw_buffer.size() << " instead of " << InBufferLen * sizeof(uint8_t) << endl;
+ wave_in_raw_buffer.size() << " instead of " << InBufferLen * sizeof(uint8_t) << std::endl;
}
}
break;
default:
- DSP::log << "DSP::u::AudioInput::SOUND_object_callback" << DSP::e::LogMode::second << "Unsupported Current->InSampleType" << endl;
+ DSP::log << "DSP::u::AudioInput::SOUND_object_callback" << DSP::e::LogMode::second << "Unsupported Current->InSampleType" << std::endl;
break;
}
#endif // __DEBUG__
@@ -4054,7 +4054,7 @@ bool DSP::u::AudioInput::SOUND_object_callback(const DSP::e::SampleType &InSampl
default:
#ifdef __DEBUG__
- DSP::log << "DSP::u::AudioInput::SOUND_object_callback" << DSP::e::LogMode::second << "Unsupported Current->InSampleType" << endl;
+ DSP::log << "DSP::u::AudioInput::SOUND_object_callback" << DSP::e::LogMode::second << "Unsupported Current->InSampleType" << std::endl;
#endif
break;
}
@@ -4083,7 +4083,7 @@ void DSP::u::AudioInput::Init(DSP::Clock_ptr ParentClock,
unsigned int WaveInDevNo)
{
unsigned long ind;
- string temp;
+ std::string temp;
// #ifdef WINMMAPI
// MMRESULT result;
@@ -4115,7 +4115,7 @@ void DSP::u::AudioInput::Init(DSP::Clock_ptr ParentClock,
}
for (unsigned int ind_i=0; ind_i<NoOfOutputs; ind_i++)
{
- temp = "out" + to_string(ind_i+1);
+ temp = "out" + std::to_string(ind_i+1);
DefineOutput(temp, ind_i);
}
@@ -4160,12 +4160,12 @@ void DSP::u::AudioInput::Init(DSP::Clock_ptr ParentClock,
DSP::input_callback_function cp = &DSP::u::AudioInput::SOUND_object_callback;
snd_object.register_input_callback_object(this, cp); // use default device
#ifdef __DEBUG__
- DSP::log << "DSP::u::AudioInput::Init" << DSP::e::LogMode::second << "using callback mode" << endl;
+ DSP::log << "DSP::u::AudioInput::Init" << DSP::e::LogMode::second << "using callback mode" << std::endl;
#endif // __DEBUG__
}
#ifdef __DEBUG__
else {
- DSP::log << "DSP::u::AudioInput::Init" << DSP::e::LogMode::second << "using non-callback mode" << endl;
+ DSP::log << "DSP::u::AudioInput::Init" << DSP::e::LogMode::second << "using non-callback mode" << std::endl;
}
#endif // __DEBUG__
if (snd_object.open_PCM_device_4_input(NoOfOutputs, BitPrec, SamplingFreq, audio_inbuffer_size) > 0) {
@@ -4218,7 +4218,7 @@ DSP::u::AudioOutput::~AudioOutput()
// }
// #ifdef AUDIO_DEBUG_MESSAGES_ON
- // DSP::log << "DSP::u::AudioOutput" << DSP::e::LogMode::second << "Closing DSP::u::AudioOutput" << endl;
+ // DSP::log << "DSP::u::AudioOutput" << DSP::e::LogMode::second << "Closing DSP::u::AudioOutput" << std::endl;
// #endif
// result=waveOutClose(hWaveOut);
// while (result==WAVERR_STILLPLAYING)
@@ -4229,7 +4229,7 @@ DSP::u::AudioOutput::~AudioOutput()
// // sleep(100);
// // #endif
// #ifdef AUDIO_DEBUG_MESSAGES_ON
- // DSP::log << "DSP::u::AudioOutput" << DSP::e::LogMode::second << "Closing DSP::u::AudioOutput" << endl;
+ // DSP::log << "DSP::u::AudioOutput" << DSP::e::LogMode::second << "Closing DSP::u::AudioOutput" << std::endl;
// #endif
// result=waveOutClose(hWaveOut);
// }
@@ -4297,7 +4297,7 @@ void DSP::u::AudioOutput::FlushBuffer(void)
// // Send buffer to the audio device
// #ifdef AUDIO_DEBUG_MESSAGES_ON
- // DSP::log << "DSP::u::AudioOutput" << DSP::e::LogMode::second << "Flushing output buffer" << endl;
+ // DSP::log << "DSP::u::AudioOutput" << DSP::e::LogMode::second << "Flushing output buffer" << std::endl;
// #endif
// while (1)
@@ -4387,7 +4387,7 @@ void DSP::u::AudioOutput::FlushBuffer(void)
// {
// // Sleep(10);
// #ifdef AUDIO_DEBUG_MESSAGES_ON
- // DSP::log << "DSP::u::AudioOutput" << DSP::e::LogMode::second << "Waiting for free output buffer" << endl;
+ // DSP::log << "DSP::u::AudioOutput" << DSP::e::LogMode::second << "Waiting for free output buffer" << std::endl;
// #endif
// DSP::f::Sleep(0);
// }
@@ -4434,7 +4434,7 @@ void DSP::u::AudioOutput::InputExecute(INPUT_EXECUTE_ARGS)
#ifdef __DEBUG__
#ifdef VerboseCompilation
DSP::log << "DSP::u::AudioOutput" << DSP::e::LogMode::second
- << InputNo << ": " << setw(5) << setprecision(3) << fixed << value << endl;
+ << InputNo << ": " << std::setw(5) << std::setprecision(3) << std::fixed << value << std::endl;
#endif
#endif
}
@@ -4461,7 +4461,7 @@ bool DSP::u::AudioInput::OutputExecute(OUTPUT_EXECUTE_ARGS)
if (DSP_THIS->InBufferLen == 0)
{ // no audio device opened
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "DSP::u::AudioInput::Execute" << DSP::e::LogMode::second << "No audio device opened" << endl;
+ DSP::log << "DSP::u::AudioInput::Execute" << DSP::e::LogMode::second << "No audio device opened" << std::endl;
#endif
for (ind=0; ind < DSP_THIS->NoOfOutputs; ind++)
@@ -4500,7 +4500,7 @@ bool DSP::u::AudioInput::OutputExecute(OUTPUT_EXECUTE_ARGS)
// so we must wait for some
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "DSP::u::AudioInput::Execute" << DSP::e::LogMode::second << "no data ready we must wait" << endl;
+ DSP::log << "DSP::u::AudioInput::Execute" << DSP::e::LogMode::second << "no data ready we must wait" << std::endl;
#endif
DSP::Clock::InputNeedsMoreTime[DSP_THIS->my_clock->MasterClockIndex] = true;
return false;
@@ -4517,7 +4517,7 @@ bool DSP::u::AudioInput::OutputExecute(OUTPUT_EXECUTE_ARGS)
DSP_THIS->CurrentBufferIndex %= DSP::NoOfAudioInputBuffers;
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "DSP::u::AudioInput::Execute" << DSP::e::LogMode::second << "fresh data has finally arrived" << endl;
+ DSP::log << "DSP::u::AudioInput::Execute" << DSP::e::LogMode::second << "fresh data has finally arrived" << std::endl;
#endif
}
else
@@ -4580,7 +4580,7 @@ bool DSP::u::AudioInput::OutputExecute(OUTPUT_EXECUTE_ARGS)
return false;
}
-// DSP::log << "DSP::u::AudioInput::Execute" << "No input buffer ready yet" << endl;
+// DSP::log << "DSP::u::AudioInput::Execute" << "No input buffer ready yet" << std::endl;
DSP::Clock::InputNeedsMoreTime[DSP_THIS->my_clock->MasterClockIndex] = true;
return false;
}
@@ -4607,7 +4607,7 @@ DSP::u::InputBuffer::InputBuffer(DSP::Clock_ptr ParentClock, int BufferSize_in,
: DSP::Source()
{
DSP::Clock_ptr NotificationClock;
- string temp;
+ std::string temp;
SetName("InputBuffer", false);
@@ -4632,7 +4632,7 @@ DSP::u::InputBuffer::InputBuffer(DSP::Clock_ptr ParentClock, int BufferSize_in,
if (NoOfChannels > 2)
{
unsigned int ind;
- vector <unsigned int> tempOut;
+ std::vector <unsigned int> tempOut;
tempOut.resize(NoOfChannels);
for (ind=0; ind<NoOfChannels; ind++)
tempOut[ind]=ind;
@@ -4642,7 +4642,7 @@ DSP::u::InputBuffer::InputBuffer(DSP::Clock_ptr ParentClock, int BufferSize_in,
DefineOutput("out.im", 1);
for (ind=0; ind<NoOfChannels; ind++)
{
- temp = "out" + to_string(ind+1);
+ temp = "out" + std::to_string(ind+1);
DefineOutput(temp, ind);
}
}
@@ -4743,14 +4743,14 @@ void DSP::u::InputBuffer::WriteBuffer(void *source,
{
DSP::log << DSP::e::LogMode::Error << "DSP::u::InputBuffer::WriteBuffer" << DSP::e::LogMode::second
<< "(" << this->GetName() << ") source_size ("
- << source_size << ") doesn't match source_DataType" << endl;
+ << source_size << ") doesn't match source_DataType" << std::endl;
}
if (BufferSize < NoOfSourceSamples)
{
- stringstream tekst;
+ std::stringstream tekst;
DSP::log << DSP::e::LogMode::Error << "DSP::u::InputBuffer::WriteBuffer" << DSP::e::LogMode::second
<< "(" << this->GetName() << ") source_size ("
- << source_size << ") larger then Buffer size\n" << endl;
+ << source_size << ") larger then Buffer size\n" << std::endl;
}
#endif
@@ -4909,8 +4909,8 @@ DSP::u::OutputBuffer::OutputBuffer(unsigned int BufferSize_in, unsigned int NoOf
DSP::Buffer_callback_ptr func_ptr, unsigned int CallbackIdentifier)
: DSP::Block(), DSP::Source()
{
- vector<unsigned int> tempOut;
- string temp;
+ std::vector<unsigned int> tempOut;
+ std::string temp;
DSP::Clock_ptr OutputClock;
Init(BufferSize_in, NoOfInputs_in, cyclic, NotificationsStep_in);
@@ -4920,7 +4920,7 @@ DSP::u::OutputBuffer::OutputBuffer(unsigned int BufferSize_in, unsigned int NoOf
tempOut.resize(NoOfOutputs);
for (unsigned int ind=0; ind<NoOfOutputs; ind++)
{
- temp = "out" + to_string(ind+1);
+ temp = "out" + std::to_string(ind+1);
DefineOutput(temp, ind);
tempOut[ind]=ind;
@@ -4977,8 +4977,8 @@ DSP::u::OutputBuffer::OutputBuffer(unsigned int BufferSize_in, unsigned int NoOf
unsigned int NoOfOutputs_in, DSP::Buffer_callback_ptr func_ptr, unsigned int CallbackIdentifier)
: DSP::Block(), DSP::Source()
{
- vector <unsigned int> tempOut;
- string temp;
+ std::vector <unsigned int> tempOut;
+ std::string temp;
Init(BufferSize_in, NoOfInputs_in, cyclic, -1);
@@ -4987,7 +4987,7 @@ DSP::u::OutputBuffer::OutputBuffer(unsigned int BufferSize_in, unsigned int NoOf
tempOut.resize(NoOfOutputs);
for (unsigned int ind=0; ind<NoOfOutputs; ind++)
{
- temp = "out" + to_string(ind+1);
+ temp = "out" + std::to_string(ind+1);
DefineOutput(temp, ind);
tempOut[ind]=ind;
@@ -5047,7 +5047,7 @@ DSP::u::OutputBuffer::~OutputBuffer(void)
void DSP::u::OutputBuffer::Init(unsigned int BufferSize_in, unsigned int NoOfChannels,
DSP::e::BufferType cyclic, int NotificationsStep_in)
{
- string temp;
+ std::string temp;
SetName("OutputBuffer", false);
@@ -5076,7 +5076,7 @@ void DSP::u::OutputBuffer::Init(unsigned int BufferSize_in, unsigned int NoOfCha
if (NoOfChannels > 2)
{
unsigned int ind;
- vector <unsigned int> tempIn;
+ std::vector <unsigned int> tempIn;
tempIn.resize(NoOfChannels);
for (ind=0; ind<NoOfChannels; ind++)
tempIn[ind]=ind;
@@ -5086,7 +5086,7 @@ void DSP::u::OutputBuffer::Init(unsigned int BufferSize_in, unsigned int NoOfCha
DefineInput("in.im", 1);
for (ind=0; ind<NoOfChannels; ind++)
{
- temp = "in" + to_string(ind+1);
+ temp = "in" + std::to_string(ind+1);
DefineInput(temp, ind);
}
}
@@ -5134,7 +5134,7 @@ unsigned long DSP::u::OutputBuffer::ReadBuffer(void *dest, long int dest_size,
#ifdef __DEBUG__
if (dest == NULL)
{
- DSP::log << DSP::e::LogMode::Error << "DSP::u::OutputBuffer::ReadBuffer" << DSP::e::LogMode::second << "dest == NULL !!!" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::OutputBuffer::ReadBuffer" << DSP::e::LogMode::second << "dest == NULL !!!" << std::endl;
return 0;
}
#endif
@@ -5159,7 +5159,7 @@ unsigned long DSP::u::OutputBuffer::ReadBuffer(void *dest, long int dest_size,
if (NoOfDestSamples*OutputSampleSize != dest_size)
{
DSP::log << DSP::e::LogMode::Error << "DSP::u::OutputBuffer::ReadBuffer" << DSP::e::LogMode::second
- << "(" << this->GetName() << ") dest_size (" << dest_size << ") doesn't match dest_DataType" << endl;
+ << "(" << this->GetName() << ") dest_size (" << dest_size << ") doesn't match dest_DataType" << std::endl;
}
#endif
@@ -5233,7 +5233,7 @@ unsigned long DSP::u::OutputBuffer::ReadBuffer(void *dest, long int dest_size,
//128 128 256 256
#ifdef __DEBUG__
if (reset - (BufferSize - BufferIndex) > INT_MAX) {
- DSP::log << DSP::e::LogMode::Error << "DSP::u::OutputBuffer::ReadBuffer" << DSP::e::LogMode::second << "step > INT_MAX" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::OutputBuffer::ReadBuffer" << DSP::e::LogMode::second << "step > INT_MAX" << std::endl;
}
#endif // __DEBUG__
step = (int)(reset - (BufferSize - BufferIndex));
@@ -5429,7 +5429,7 @@ bool DSP::u::OutputBuffer::OutputExecute(OUTPUT_EXECUTE_ARGS)
#ifdef __DEBUG__
else
{
- DSP::log << DSP::e::LogMode::Error << "DSP::u::OutputBuffer::OutputExecute" << DSP::e::LogMode::second << "DSP_THIS->OutputSamples_ready == false" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::OutputBuffer::OutputExecute" << DSP::e::LogMode::second << "DSP_THIS->OutputSamples_ready == false" << std::endl;
}
#endif
@@ -5526,7 +5526,7 @@ void DSP::f::Sleep(uint32_t time)
/*! Checks Coefficients file type and fills
* DSP_LoadCoef_Info structure.
*/
-bool DSP::LoadCoef::Open(const string &Filename, const string &Dir)
+bool DSP::LoadCoef::Open(const std::string &Filename, const std::string &Dir)
{
FILE *plik;
uint32_t ValuesRead;
@@ -5600,7 +5600,7 @@ bool DSP::LoadCoef::Open(const string &Filename, const string &Dir)
if (this->NoOfVectors == -1)
{
- DSP::log << DSP::e::LogMode::Error << "DSP_LoadCoef::Open" << DSP::e::LogMode::second << "File doesn't exist or unsupported file format." << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP_LoadCoef::Open" << DSP::e::LogMode::second << "File doesn't exist or unsupported file format." << std::endl;
return false;
}
@@ -5804,7 +5804,7 @@ bool DSP::LoadCoef::Load(DSP::Float_vector &FIR_coef, int vector_index)
}
//!
-FILE * CreateFLTfile(const string &filename, const unsigned int &NoOfChannels = 1U, const unsigned int &Fp=0)
+FILE * CreateFLTfile(const std::string &filename, const unsigned int &NoOfChannels = 1U, const unsigned int &Fp=0)
{
FILE *FileHandle;
@@ -5822,7 +5822,7 @@ FILE * CreateFLTfile(const string &filename, const unsigned int &NoOfChannels =
}
// Saves to *.flt file len samples from real valued vector
-bool DSP::f::SaveVector(const string &filename, const DSP::Float_vector &vector, const unsigned int &Fp)
+bool DSP::f::SaveVector(const std::string &filename, const DSP::Float_vector &vector, const unsigned int &Fp)
{
FILE *FileHandle = CreateFLTfile(filename, 1U, Fp);
@@ -5837,7 +5837,7 @@ bool DSP::f::SaveVector(const string &filename, const DSP::Float_vector &vector,
return false;
}
// Saves to *.flt file len samples from complex valued vector
-bool DSP::f::SaveVector(const string &filename, const DSP::Complex_vector &vector, const unsigned int &Fp)
+bool DSP::f::SaveVector(const std::string &filename, const DSP::Complex_vector &vector, const unsigned int &Fp)
{
FILE *FileHandle = CreateFLTfile(filename, 2U, Fp);
diff --git a/src/cpp/DSP_clocks.cpp b/src/cpp/DSP_clocks.cpp
index b440851..5c2a8c6 100644
--- a/src/cpp/DSP_clocks.cpp
+++ b/src/cpp/DSP_clocks.cpp
@@ -198,14 +198,14 @@ void DSP::Clock::SetAsNewMasterClock(DSP::Clock_ptr new_master)
if (MasterClocks[new_master->MasterClockIndex] != NULL)
{
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::Clock::SetAsNewMasterClock" << DSP::e::LogMode::second << "Cannot set new master clock if the old has not been released" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Clock::SetAsNewMasterClock" << DSP::e::LogMode::second << "Cannot set new master clock if the old has not been released" << std::endl;
#endif
return;
}
if (First[new_master->MasterClockIndex] == NULL)
{
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::Clock::SetAsNewMasterClock" << DSP::e::LogMode::second << "There are no clocks on the list for given master clock !!!" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Clock::SetAsNewMasterClock" << DSP::e::LogMode::second << "There are no clocks on the list for given master clock !!!" << std::endl;
#endif
return;
}
@@ -415,7 +415,7 @@ unsigned long DSP::Clock::Execute(DSP::Clock_ptr ReferenceClock,
{
// ReferenceClock=GetClock();
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::Clock::Execute" << DSP::e::LogMode::second << "NULL ReferenceClock" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Clock::Execute" << DSP::e::LogMode::second << "NULL ReferenceClock" << std::endl;
#endif
return 0;
}
@@ -536,24 +536,24 @@ unsigned long DSP::Clock::Execute(DSP::Clock_ptr ReferenceClock,
if (ReferenceClock_is_signal_activated == false)
{
#ifdef __DEBUG__
- DSP::log << "DSP::Clock::Execute" << DSP::e::LogMode::second << "Not all sources processed but no source is ready" << endl;
- DSP::log << "DSP::Clock::Execute" << DSP::e::LogMode::second << ">> Check if there is the feedback loop without DSP::u::LoopDelay." << endl;
+ DSP::log << "DSP::Clock::Execute" << DSP::e::LogMode::second << "Not all sources processed but no source is ready" << std::endl;
+ DSP::log << "DSP::Clock::Execute" << DSP::e::LogMode::second << ">> Check if there is the feedback loop without DSP::u::LoopDelay." << std::endl;
DSP::log << "DSP::Clock::Execute >>" << DSP::e::LogMode::second
- << "Number of signal activated clocks still on the list:" << *SignalActivatedClocksListLength_ptr << endl;
+ << "Number of signal activated clocks still on the list:" << *SignalActivatedClocksListLength_ptr << std::endl;
for (clock_ind=0; clock_ind<(*ListLength); clock_ind++)
{
for (unsigned int component_ind=0; component_ind<ClocksList[clock_ind]->NoOfComponents; component_ind++)
{
DSP::log << "DSP::Clock::Execute >>" << DSP::e::LogMode::second
<< clock_ind << ":" << component_ind << ") NOTIFY: " << ClocksList[clock_ind]->ComponentsNotifications_Table[component_ind]->GetName()
- << endl;
+ << std::endl;
}
for (unsigned int sources_ind=0; sources_ind<ClocksList[clock_ind]->NoOfSources; sources_ind++)
{
DSP::log << "DSP::Clock::Execute >>" << DSP::e::LogMode::second
<< clock_ind << ":" << sources_ind << ") PROCESS: " << ClocksList[clock_ind]->SourcesTable[sources_ind]->GetName()
- << endl;
+ << std::endl;
}
}
#endif
@@ -750,7 +750,7 @@ void DSP::Clock::ClockInit(DSP::Clock_ptr ReferenceClock, long int L_in, long in
if (ActiveClocksList == NULL)
{
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::Clock::ClockInit" << DSP::e::LogMode::second << "ActiveClockList not yet defined" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Clock::ClockInit" << DSP::e::LogMode::second << "ActiveClockList not yet defined" << std::endl;
#endif
return;
}
@@ -786,7 +786,7 @@ void DSP::Clock::UpdateGlobalSamplingRate(void)
if (clocks_GlobalSamplingRate != current->GlobalSamplingRate) {
DSP::log << DSP::e::LogMode::Error
<< "DSP::Clock::UpdateGlobalSamplingRate: clocks_GlobalSamplingRate = " << clocks_GlobalSamplingRate
- << " but current->GlobalSamplingRate = " << current->GlobalSamplingRate << endl;
+ << " but current->GlobalSamplingRate = " << current->GlobalSamplingRate << std::endl;
}
}
}
@@ -953,7 +953,7 @@ void DSP::Clock::FreeClocks(DSP::Clock_ptr ReferenceClock)
if (ReferenceClock == NULL)
{
#ifdef __DEBUG__
- DSP::log << "DSP::Clock::FreeClocks" << DSP::e::LogMode::second << "Reference clock is NULL" << endl;
+ DSP::log << "DSP::Clock::FreeClocks" << DSP::e::LogMode::second << "Reference clock is NULL" << std::endl;
#endif
return;
}
@@ -962,7 +962,7 @@ void DSP::Clock::FreeClocks(DSP::Clock_ptr ReferenceClock)
if (temp_master == NULL)
{
#ifdef __DEBUG__
- DSP::log << "DSP::Clock::FreeClocks" << DSP::e::LogMode::second << "Reference clock refers to NULL Master Clock" << endl;
+ DSP::log << "DSP::Clock::FreeClocks" << DSP::e::LogMode::second << "Reference clock refers to NULL Master Clock" << std::endl;
#endif
// ??? Master Clock was not reelected
//return;
@@ -986,7 +986,7 @@ void DSP::Clock::FreeClocks(DSP::Clock_ptr ReferenceClock)
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::Clock::FreeClocks" << DSP::e::LogMode::second
- << "Reference clock refers to Master Clock which it is not related to (it's possible that Reference clock is invalid or was deleted before)" << endl;
+ << "Reference clock refers to Master Clock which it is not related to (it's possible that Reference clock is invalid or was deleted before)" << std::endl;
#endif
return;
}
@@ -1292,7 +1292,7 @@ void DSP::Clock::UpdateCycleLengths(DSP::Clock_ptr RootParentClock)
if (RootParentClock==NULL)
{
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::Clock::UpdateCycleLengths" << DSP::e::LogMode::second << "RootParentClock undefined" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Clock::UpdateCycleLengths" << DSP::e::LogMode::second << "RootParentClock undefined" << std::endl;
#endif
return; //there's nothing to do
}
@@ -1442,7 +1442,7 @@ DSP::Clock_ptr DSP::Clock::GetClock(DSP::Clock_ptr ParentClock, long L, long M)
if (ParentClock==NULL)
{
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "GetClock" << DSP::e::LogMode::second << "ParrentClock undefined" << endl;
+ DSP::log << DSP::e::LogMode::Error << "GetClock" << DSP::e::LogMode::second << "ParrentClock undefined" << std::endl;
#endif
return NULL;
}
@@ -1495,7 +1495,7 @@ unsigned long DSP::Clock::GetTimeToNextCycle(DSP::Clock_ptr CurrentMasterClock)
* ClockList - vector with list where clocks' pointers will be stored (appended)
*/
long DSP::Clock::GetAlgorithmClocks(DSP::Clock_ptr ReferenceClock,
- vector<DSP::Clock_ptr> &ClocksList,
+ std::vector<DSP::Clock_ptr> &ClocksList,
bool FindSignalActivatedClocks)
{
unsigned long index;
@@ -1563,7 +1563,7 @@ DSP::Clock_ptr* DSP::Clock::FindNextActiveClocks(DSP::Clock_ptr CurrentMasterClo
if (ActiveClocksList==NULL)
{ //b��d lub brak zegar�w
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::Clock::FindNextActiveClocks" << DSP::e::LogMode::second << "Error or there are no Clocks at all" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Clock::FindNextActiveClocks" << DSP::e::LogMode::second << "Error or there are no Clocks at all" << std::endl;
#endif
return NULL;
}
@@ -1571,7 +1571,7 @@ DSP::Clock_ptr* DSP::Clock::FindNextActiveClocks(DSP::Clock_ptr CurrentMasterClo
if (ActiveClocksList[CurrentMasterClock->MasterClockIndex]==NULL)
{ //b?d lub brak zegarw
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::Clock::FindNextActiveClocks" << DSP::e::LogMode::second << "Error or there are no Clocks at all (2)" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Clock::FindNextActiveClocks" << DSP::e::LogMode::second << "Error or there are no Clocks at all (2)" << std::endl;
#endif
return NULL;
}
@@ -1639,9 +1639,9 @@ void DSP::Clock::ListOfAllComponents(bool list_outputs)
UNUSED_RELEASE_ARGUMENT(list_outputs);
#ifdef __DEBUG__
- DSP::log << "DSP::Clock::ListOfAllComponents" << DSP::e::LogMode::second << "Starting ..." << endl;
+ DSP::log << "DSP::Clock::ListOfAllComponents" << DSP::e::LogMode::second << "Starting ..." << std::endl;
DSP::Component::ListOfAllComponents(list_outputs);
- DSP::log << "DSP::Clock::ListOfAllComponents" << DSP::e::LogMode::second << "End" << endl << endl;
+ DSP::log << "DSP::Clock::ListOfAllComponents" << DSP::e::LogMode::second << "End" << std::endl << std::endl;
#endif
}
@@ -1649,14 +1649,14 @@ void DSP::Clock::ListComponents(void)
{
#ifdef __DEBUG__
DSP::Clock *current;
- string text;
+ std::string text;
- DSP::log << "DSP::Clock::ListComponents" << DSP::e::LogMode::second << "Starting ..." << endl;
+ DSP::log << "DSP::Clock::ListComponents" << DSP::e::LogMode::second << "Starting ..." << std::endl;
for (unsigned int ind_clocks = 0; ind_clocks < NoOfMasterClocks; ind_clocks++)
{
DSP::log << "DSP::Clock::ListComponents" << DSP::e::LogMode::second
<< "Master clock (index = " << ind_clocks
- << ") / Number of Master clocks " << ((int)NoOfMasterClocks) << endl;
+ << ") / Number of Master clocks " << ((int)NoOfMasterClocks) << std::endl;
// DSP::Component::ListComponents(MasterClocks[ind_clocks]);
@@ -1669,21 +1669,21 @@ void DSP::Clock::ListComponents(void)
{
for (unsigned int ind = 0; ind < current->NoOfSources; ind++)
{
- DSP::log << " >>source" << DSP::e::LogMode::second << current->SourcesTable[ind]->GetName() << endl;
+ DSP::log << " >>source" << DSP::e::LogMode::second << current->SourcesTable[ind]->GetName() << std::endl;
}
}
DSP::Component::ListComponents(current);
- DSP::log << endl;
+ DSP::log << std::endl;
current=current->Next;
}
// List Unconnected components
- DSP::log << "DSP::Clock::ListComponents" << DSP::e::LogMode::second << "Master clock >>NULL<<" << endl;
+ DSP::log << "DSP::Clock::ListComponents" << DSP::e::LogMode::second << "Master clock >>NULL<<" << std::endl;
DSP::Component::ListComponents(NULL);
}
- DSP::log << "DSP::Clock::ListComponents" << DSP::e::LogMode::second << "End" << endl << endl;
+ DSP::log << "DSP::Clock::ListComponents" << DSP::e::LogMode::second << "End" << std::endl << std::endl;
#endif
}
@@ -1693,10 +1693,10 @@ void DSP::Clock::ListComponents(DSP::Clock_ptr MasterClock)
#ifdef __DEBUG__
DSP::Clock *current;
- string text;
+ std::string text;
bool OK;
- DSP::log << "DSP::Clock::ListComponents" << DSP::e::LogMode::second << "Starting ..." << endl;
+ DSP::log << "DSP::Clock::ListComponents" << DSP::e::LogMode::second << "Starting ..." << std::endl;
// checking whether MasterClock still exists
OK = false;
@@ -1711,7 +1711,7 @@ void DSP::Clock::ListComponents(DSP::Clock_ptr MasterClock)
if (OK == true)
{
DSP::log << "DSP::Clock::ListComponents" << DSP::e::LogMode::second
- << "List for master clock with index: " << (int)MasterClock->MasterClockIndex << endl;
+ << "List for master clock with index: " << (int)MasterClock->MasterClockIndex << std::endl;
//Find clock which points to this one
current=First[MasterClock->MasterClockIndex];
@@ -1721,7 +1721,7 @@ void DSP::Clock::ListComponents(DSP::Clock_ptr MasterClock)
{
for (unsigned int ind = 0; ind < current->NoOfSources; ind++)
{
- DSP::log << " >>source" << DSP::e::LogMode::second << current->SourcesTable[ind]->GetName() << endl;
+ DSP::log << " >>source" << DSP::e::LogMode::second << current->SourcesTable[ind]->GetName() << std::endl;
}
}
@@ -1732,9 +1732,9 @@ void DSP::Clock::ListComponents(DSP::Clock_ptr MasterClock)
}
else
{
- DSP::log << ">> WARNING" << DSP::e::LogMode::second << "Given Clock does not exists" << endl;
+ DSP::log << ">> WARNING" << DSP::e::LogMode::second << "Given Clock does not exists" << std::endl;
}
- DSP::log << "DSP::Clock::ListComponents" << DSP::e::LogMode::second << "End" << endl << endl;
+ DSP::log << "DSP::Clock::ListComponents" << DSP::e::LogMode::second << "End" << std::endl << std::endl;
#endif
}
@@ -1753,7 +1753,7 @@ void DSP::Clock::AddSignalActivatedClock(unsigned int MasterClockIndex,
#ifdef __DEBUG__
else
{
- DSP::log << DSP::e::LogMode::Error << "DSP::Clock::AddSignalActivatedClock" << DSP::e::LogMode::second << "Trying too add more than MAX_NO_OF_SIGNAL_ACTIVATED_CLOCKS clocks." << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Clock::AddSignalActivatedClock" << DSP::e::LogMode::second << "Trying too add more than MAX_NO_OF_SIGNAL_ACTIVATED_CLOCKS clocks." << std::endl;
}
#endif // __DEBUG__
}
diff --git a/src/cpp/DSP_logstream.cpp b/src/cpp/DSP_logstream.cpp
index dfd33c3..322ed24 100644
--- a/src/cpp/DSP_logstream.cpp
+++ b/src/cpp/DSP_logstream.cpp
@@ -8,7 +8,6 @@
#include <cstring>
#include <iostream>
-using namespace std;
#include "DSP_logstream.h"
@@ -39,7 +38,7 @@ namespace DSP
class LogStatus
{
friend void DSP::logstream::SetLogState(const DSP::e::LogState &);
- friend void DSP::logstream::SetLogFileName(const string &);
+ friend void DSP::logstream::SetLogFileName(const std::string &);
friend void DSP::logstream::SetLogFunctionPtr(DSP::Message_callback_ptr);
friend long int DSP::logstream::NoOfErrors(bool Reset);
friend DSP::logstream& ::operator<< (DSP::logstream& os, const DSP::e::LogMode& log_mode);
@@ -51,7 +50,7 @@ namespace DSP
long int ErrorsCounter;
//! LOG file name (possibly together with path)
- string file_name;
+ std::string file_name;
std::ofstream *plik; // bool IsFileOpened;
//! User defined Message processing function
@@ -64,7 +63,7 @@ namespace DSP
* - LS_file=2,
* - LS_file_append=6, // = (LS_file | 4)
*/
- void WriteMessage2LOGfile(const string &Message);
+ void WriteMessage2LOGfile(const std::string &Message);
/*! \warning Should be used only in WriteMessage2LOGfile
*/
@@ -102,8 +101,8 @@ namespace DSP
bool start_new_line;
std::shared_ptr<std::recursive_mutex> mtx = nullptr;
- string First_string; //! Main part of the collected message
- string Second_string; //! Second_string part of the collected message
+ std::string First_string; //! Main part of the collected message
+ std::string Second_string; //! Second_string part of the collected message
DSP::e::LogMode mode; //! stream mode (Error/Info)
DSP::e::LogMode msg_part; //! message part (first/second)
bool pause_after_message; //! if true wiat for key press in console mode
@@ -121,7 +120,7 @@ namespace DSP
//! Error message generation
/*! Waits for user reaction.
*/
- void ErrorMessage(const string &source, const string &message = "");
+ void ErrorMessage(const std::string &source, const std::string &message = "");
//! Information message generation
/* -# source == "" && message == "" => "\n"
* -# source != "" && message == "" => "source\n"
@@ -129,28 +128,28 @@ namespace DSP
* -# source != "" && message != "" => "Info(source): message\n"
* .
*/
- void InfoMessage(const string &source = "", const string &message = "");
+ void InfoMessage(const std::string &source = "", const std::string &message = "");
// //! returns size of text buffer required for the given message
- //int DSP::f::GetMessageLength(bool IsError, const string &source, const string &message = NULL);
+ //int DSP::f::GetMessageLength(bool IsError, const std::string &source, const std::string &message = NULL);
//! Returns error message in format used in DSP::f::ErrorMessage.
/*! See also ::DSP::f::GetErrorMessage, ::DSP::f::GetInfoMessage.
*/
- string GetErrorMessage(const string &source, const string &message = "");
+ std::string GetErrorMessage(const std::string &source, const std::string &message = "");
//! Returns informational message in format used in DSP::f::InfoMessage.
/*! See also ::GetMessageLength.
*/
- string GetInfoMessage(const string &source, const string &message = "");
+ std::string GetInfoMessage(const std::string &source, const std::string &message = "");
//! Error or Information message generation
- void Message(bool IsError, const string &source, const string &message = "");
+ void Message(bool IsError, const std::string &source, const std::string &message = "");
};
logstream::logstream(void) : std::ostream(this)
{
init_logstream();
// test:
- // log << "test" << endl;
- // log << "test2" << LogMode::second << "2" << endl;
+ // log << "test" << std::endl;
+ // log << "test2" << LogMode::second << "2" << std::endl;
}
logstream::~logstream(void)
@@ -346,7 +345,7 @@ namespace DSP
log_buf->LogStatus_object.Mode = Mode;
}
- void logstream::SetLogFileName(const string &file_name)
+ void logstream::SetLogFileName(const std::string &file_name)
{
log_buf->LogStatus_object.file_name = file_name;
@@ -358,7 +357,7 @@ namespace DSP
log_buf->LogStatus_object.function_ptr = function_ptr;
}
- void LogStatus::WriteMessage2LOGfile(const string &Message)
+ void LogStatus::WriteMessage2LOGfile(const std::string &Message)
{
if (plik == NULL)
{
@@ -427,9 +426,9 @@ namespace DSP
}
// Error message generation
- void logbuf::ErrorMessage(const string &source, const string &message)
+ void logbuf::ErrorMessage(const std::string &source, const std::string &message)
{
- string MessageText;
+ std::string MessageText;
// ******************************************* //
LogStatus_object.ErrorsCounter++;
@@ -454,7 +453,7 @@ namespace DSP
if ((LogStatus_object.Mode & DSP::e::LogState::console) == DSP::e::LogState::console)
{ // console
//printf(MessageText.c_str());
- cout << MessageText << flush;
+ std::cout << MessageText << std::flush;
}
if ((LogStatus_object.Mode & DSP::e::LogState::file) == DSP::e::LogState::file)
{ // file & file_append
@@ -470,9 +469,9 @@ namespace DSP
}
}
- string logbuf::GetErrorMessage(const string &source, const string &message)
+ std::string logbuf::GetErrorMessage(const std::string &source, const std::string &message)
{
- string text_buffer;
+ std::string text_buffer;
if (message.length() == 0)
if (source.length() == 0) {
text_buffer = "";
@@ -486,9 +485,9 @@ namespace DSP
}
// Information message generation
- void logbuf::InfoMessage(const string &source, const string &message)
+ void logbuf::InfoMessage(const std::string &source, const std::string &message)
{
- string MessageText;
+ std::string MessageText;
if (LogStatus_object.Mode == DSP::e::LogState::off)
return;
@@ -511,7 +510,7 @@ namespace DSP
if ((LogStatus_object.Mode & DSP::e::LogState::console) == DSP::e::LogState::console)
{ // console
//printf(MessageText.c_str());
- cout << MessageText << flush;
+ std::cout << MessageText << std::flush;
}
if ((LogStatus_object.Mode & DSP::e::LogState::file) == DSP::e::LogState::file)
{ // file & file_append
@@ -527,9 +526,9 @@ namespace DSP
}
}
- string logbuf::GetInfoMessage(const string &source, const string &message)
+ std::string logbuf::GetInfoMessage(const std::string &source, const std::string &message)
{
- string text_buffer;
+ std::string text_buffer;
if (message.length() == 0)
if (source.length() == 0)
text_buffer = "\n";
@@ -545,7 +544,7 @@ namespace DSP
// Error or Information message generation
- void logbuf::Message(bool IsError, const string &source, const string &message)
+ void logbuf::Message(bool IsError, const std::string &source, const std::string &message)
{
if (IsError == false)
InfoMessage(source, message);
diff --git a/src/cpp/DSP_misc.cpp b/src/cpp/DSP_misc.cpp
index f27238e..f130b0a 100644
--- a/src/cpp/DSP_misc.cpp
+++ b/src/cpp/DSP_misc.cpp
@@ -34,16 +34,16 @@ DSP::libver DSP::lib_version(void)
return VersionData;
}
-string DSP::lib_version_string()
+std::string DSP::lib_version_string()
{
- stringstream tekst;
+ std::stringstream tekst;
#ifdef __ANONYMOUS__
return "";
#else
tekst << "Signal processing in this application is built on\n"
"DSP Engine ver. " << int(VersionData.major)
- << "." << setw(2) << setfill('0') << int(VersionData.minor)
- << "." << setw(3) << setfill('0') << VersionData.build
+ << "." << std::setw(2) << std::setfill('0') << int(VersionData.minor)
+ << "." << std::setw(3) << std::setfill('0') << VersionData.build
<< " 2005-" << DSP_VER_YEAR
<< " Marek Blok";
#endif
@@ -75,7 +75,7 @@ unsigned long DSP::f::gcd(unsigned long a, unsigned long b)
// DSP::Float_ptr B_in) //right-hand side quantities vector
// Solves matrix equation using Gaussian elimination with backsubstitution
void DSP::f::SolveMatrixEqu(
- const vector<DSP::Float_vector> &A_in, //!matrix coefficients (table of rows)
+ const std::vector<DSP::Float_vector> &A_in, //!matrix coefficients (table of rows)
DSP::Float_vector &X, //!vector reserved for solution
const DSP::Float_vector &B_in) //!right-hand side quantities vector
{
@@ -86,14 +86,14 @@ void DSP::f::SolveMatrixEqu(
DSP::Float_vector B; //vector B
unsigned int Size = (unsigned int)(B_in.size());
if (Size != A_in.size()) {
- DSP::log << DSP::e::LogMode::Error << "DSP::f::SolveMatrixEqu" << DSP::e::LogMode::second << "Size mismatch of matrix A_in and vector B_in" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::f::SolveMatrixEqu" << DSP::e::LogMode::second << "Size mismatch of matrix A_in and vector B_in" << std::endl;
return;
}
else {
//! \TODO check also second dimension of matrix A_in
}
- vector<DSP::Float_vector> A(Size,DSP::Float_vector(Size));
+ std::vector<DSP::Float_vector> A(Size,DSP::Float_vector(Size));
for (i = 0; i < int(Size); i++) {
A[i]=A_in[i]; // copy content of rows
}
@@ -117,7 +117,7 @@ void DSP::f::SolveMatrixEqu(
if (pivot_row != row)
{
// tempA=A[row]; A[row]=A[pivot_row]; A[pivot_row]=tempA;
- swap(A[row],A[pivot_row]);
+ std::swap(A[row],A[pivot_row]);
tempB=B[row]; B[row]=B[pivot_row]; B[pivot_row]=tempB;
}
@@ -146,7 +146,7 @@ void DSP::f::SolveMatrixEqu(
};
void DSP::f::SolveMatrixEqu_prec(
- const vector<DSP::Float_vector> &A_in, //!matrix coefficients (table of rows)
+ const std::vector<DSP::Float_vector> &A_in, //!matrix coefficients (table of rows)
DSP::Float_vector &X_in, //!vector reserved for solution
const DSP::Float_vector &B_in) //right-hand side quantities vector
{
@@ -157,14 +157,14 @@ void DSP::f::SolveMatrixEqu_prec(
DSP::Prec_Float_vector B; //vector B
unsigned int Size = (unsigned int)(B_in.size());
if (Size != A_in.size()) {
- DSP::log << DSP::e::LogMode::Error << "DSP::f::SolveMatrixEqu_prec" << DSP::e::LogMode::second << "Size mismatch of matrix A_in and vector B_in" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::f::SolveMatrixEqu_prec" << DSP::e::LogMode::second << "Size mismatch of matrix A_in and vector B_in" << std::endl;
return;
}
else {
//! \TODO check also second dimension of matrix A_in
}
- vector<DSP::Prec_Float_vector> A(Size,DSP::Prec_Float_vector(Size));
+ std::vector<DSP::Prec_Float_vector> A(Size,DSP::Prec_Float_vector(Size));
B.resize(Size);
for (i = 0; i < int(Size); i++) {
for (j = 0; j < Size; j++) {
@@ -194,7 +194,7 @@ void DSP::f::SolveMatrixEqu_prec(
if (pivot_row != row)
{
// tempA=A[row]; A[row]=A[pivot_row]; A[pivot_row]=tempA;
- swap(A[row],A[pivot_row]);
+ std::swap(A[row],A[pivot_row]);
tempB=B[row]; B[row]=B[pivot_row]; B[pivot_row]=tempB;
}
@@ -227,7 +227,7 @@ void DSP::f::SolveMatrixEqu_prec(
};
void DSP::f::SolveMatrixEqu_prec(
- const vector<DSP::Prec_Float_vector> &A_in, //!matrix coefficients (table of rows)
+ const std::vector<DSP::Prec_Float_vector> &A_in, //!matrix coefficients (table of rows)
DSP::Prec_Float_vector &X_in, //!vector reserved for solution
const DSP::Prec_Float_vector &B_in, //right-hand side quantities vector
int use_pivoting) // pivoting mode
@@ -241,16 +241,16 @@ void DSP::f::SolveMatrixEqu_prec(
DSP::Prec_Float_vector B; //vector B
unsigned int Size = (unsigned int)(B_in.size());
if (Size != A_in.size()) {
- DSP::log << DSP::e::LogMode::Error << "DSP::f::SolveMatrixEqu_prec" << DSP::e::LogMode::second << "Size mismatch of matrix A_in and vector B_in" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::f::SolveMatrixEqu_prec" << DSP::e::LogMode::second << "Size mismatch of matrix A_in and vector B_in" << std::endl;
return;
}
else {
//! \TODO check also second dimension of matrix A_in
}
- vector<DSP::Prec_Float_vector> A(Size,DSP::Prec_Float_vector(Size));
+ std::vector<DSP::Prec_Float_vector> A(Size,DSP::Prec_Float_vector(Size));
B.resize(Size);
- vector<int> X_ind; // indexing of solution samples <== important if column pivoting is used
+ std::vector<int> X_ind; // indexing of solution samples <== important if column pivoting is used
X_ind.resize(Size);
DSP::Prec_Float_vector X; //vector X - for solutions
@@ -284,7 +284,7 @@ void DSP::f::SolveMatrixEqu_prec(
if (pivot_row != row)
{
// tempA=A[row]; A[row]=A[pivot_row]; A[pivot_row]=tempA;
- swap(A[row],A[pivot_row]);
+ std::swap(A[row],A[pivot_row]);
tempB=B[row]; B[row]=B[pivot_row]; B[pivot_row]=tempB;
}
@@ -323,7 +323,7 @@ void DSP::f::SolveMatrixEqu_prec(
if (pivot_row != row)
{
// tempA=A[row]; A[row]=A[pivot_row]; A[pivot_row]=tempA;
- swap(A[row],A[pivot_row]);
+ std::swap(A[row],A[pivot_row]);
tempB=B[row]; B[row]=B[pivot_row]; B[pivot_row]=tempB;
}
@@ -382,9 +382,9 @@ void DSP::f::SolveMatrixEqu_prec(
#ifndef _MSC_VER
//! \bug problem with DSP::f::MakeDir(".", "outputs")
-bool DSP::f::MakeDir(const string &dir_name, const string &parent_dir)
+bool DSP::f::MakeDir(const std::string &dir_name, const std::string &parent_dir)
{
- string full_name;
+ std::string full_name;
DIR *temp_dir;
//strncpy(full_name, ".", 1023);
@@ -401,7 +401,7 @@ bool DSP::f::MakeDir(const string &dir_name, const string &parent_dir)
if (temp_dir == NULL)
{
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::f::MakeDir" << DSP::e::LogMode::second << "Parent directory does not exist" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::f::MakeDir" << DSP::e::LogMode::second << "Parent directory does not exist" << std::endl;
#endif
return false;
}
@@ -428,7 +428,7 @@ bool DSP::f::MakeDir(const string &dir_name, const string &parent_dir)
if (temp_dir == NULL)
{
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::f::MakeDir" << DSP::e::LogMode::second << "Could not create directory" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::f::MakeDir" << DSP::e::LogMode::second << "Could not create directory" << std::endl;
#endif
return false;
}
@@ -436,7 +436,7 @@ bool DSP::f::MakeDir(const string &dir_name, const string &parent_dir)
}
#else
-bool checkIfDirectoryExists(const string& dirname) {
+bool checkIfDirectoryExists(const std::string& dirname) {
WIN32_FIND_DATA data;
HANDLE hFile = FindFirstFile(dirname.c_str(), &data);
bool _dir_exists = false;
@@ -453,9 +453,9 @@ bool checkIfDirectoryExists(const string& dirname) {
}
//! \bug problem with DSP::f::MakeDir(".", "outputs")
-bool DSP::f::MakeDir(const string& dir_name, const string& parent_dir)
+bool DSP::f::MakeDir(const std::string& dir_name, const std::string& parent_dir)
{
- string full_name;
+ std::string full_name;
//strncpy(full_name, ".", 1023);
if (parent_dir.length() == 0)
@@ -471,7 +471,7 @@ bool DSP::f::MakeDir(const string& dir_name, const string& parent_dir)
if (_dir_exists == false)
{
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::f::MakeDir" << DSP::e::LogMode::second << "Parent directory does not exist" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::f::MakeDir" << DSP::e::LogMode::second << "Parent directory does not exist" << std::endl;
#endif
return false;
}
@@ -482,7 +482,7 @@ bool DSP::f::MakeDir(const string& dir_name, const string& parent_dir)
if (_mkdir(full_name.c_str()) != 0)
{
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::f::MakeDir" << DSP::e::LogMode::second << "Could not create directory" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::f::MakeDir" << DSP::e::LogMode::second << "Could not create directory" << std::endl;
#endif
return false;
}
@@ -492,12 +492,12 @@ bool DSP::f::MakeDir(const string& dir_name, const string& parent_dir)
// Splits directory name into bits and tries to create it
-void DSP::f::MakeDir_Ex(const string &dir_name)
+void DSP::f::MakeDir_Ex(const std::string &dir_name)
{
- string sub_dir;
- string parent_subdir;
- string parent_dir;
- string temp_parent_dir;
+ std::string sub_dir;
+ std::string parent_subdir;
+ std::string parent_dir;
+ std::string temp_parent_dir;
#ifndef _MSC_VER
DIR *temp_dir;
@@ -818,7 +818,7 @@ void DSP::f::Gauss(int size, DSP::Float_ptr buffer, DSP::Float sigma, bool norma
if (sigma > 0.5)
{
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::f::Gauss" << DSP::e::LogMode::second << "Sigma must be less or equal 0.5" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::f::Gauss" << DSP::e::LogMode::second << "Sigma must be less or equal 0.5" << std::endl;
#endif
return;
}
@@ -939,7 +939,7 @@ void DSP::f::sinc(int size, DSP::Float_ptr buffer)
}
template <typename T>
-void DSP::f::sinc(const DSP::Float_vector& arguments, vector<T>& output_buffer) {
+void DSP::f::sinc(const DSP::Float_vector& arguments, std::vector<T>& output_buffer) {
unsigned int n;
DSP::Float x;
output_buffer.resize(arguments.size());
@@ -1087,7 +1087,7 @@ void DSP::f::LPF_LS (int N, DSP::Float fp, DSP::Float fs, DSP::Float_vector &h_b
// DSP::Prec_Float_ptr *G;
// DSP::Prec_Float_ptr a;
- vector<DSP::Prec_Float_vector> G;
+ std::vector<DSP::Prec_Float_vector> G;
DSP::Prec_Float_vector a;
L=(DSP::Prec_Float(N)-1)/2;
diff --git a/src/cpp/DSP_modules.cpp b/src/cpp/DSP_modules.cpp
index 036d20c..75bb05f 100644
--- a/src/cpp/DSP_modules.cpp
+++ b/src/cpp/DSP_modules.cpp
@@ -37,7 +37,7 @@ DSP::name::name(void)
#endif
}
-DSP::name::name(const string &Name)
+DSP::name::name(const std::string &Name)
{
UNUSED_RELEASE_ARGUMENT(Name);
@@ -46,7 +46,7 @@ DSP::name::name(const string &Name)
#endif
}
-void DSP::name::SetName(const string &Name, bool Append)
+void DSP::name::SetName(const std::string &Name, bool Append)
{
#ifndef __DEBUG__
UNUSED_ARGUMENT(Name);
@@ -63,7 +63,7 @@ void DSP::name::SetName(const string &Name, bool Append)
#endif
}
-string DSP::name::GetName()
+std::string DSP::name::GetName()
{
#ifdef __DEBUG__
return ObjectName;
@@ -260,7 +260,7 @@ DSP::Component::~Component(void)
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::Component::~DSP::Component" << DSP::e::LogMode::second
- << "Notifications have not been correctly unregistered for component: >>" << GetName() << "<<" << endl;
+ << "Notifications have not been correctly unregistered for component: >>" << GetName() << "<<" << std::endl;
#endif
NotificationClocks.clear();
}
@@ -291,13 +291,13 @@ DSP::Component::~Component(void)
DSP::output DSP::output::_null(true);
//! read output name
-const string &DSP::output::get_name(void) const {
+const std::string &DSP::output::get_name(void) const {
return _name;
}
//! set output name
-void DSP::output::set_name(const string &name) {
+void DSP::output::set_name(const std::string &name) {
if (_is_null == true) {
- DSP::log << DSP::e::LogMode::Error << "DSP::output::set_name" << DSP::e::LogMode::second << "Attempt to set name to null output object" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::output::set_name" << DSP::e::LogMode::second << "Attempt to set name to null output object" << std::endl;
return;
}
_name = name;
@@ -324,13 +324,13 @@ DSP::output::~output(void)
DSP::input DSP::input::_null(true);
//! read input name
-const string &DSP::input::get_name(void) const {
+const std::string &DSP::input::get_name(void) const {
return _name;
}
//! set input name
-void DSP::input::set_name(const string &name) {
+void DSP::input::set_name(const std::string &name) {
if (_is_null == true) {
- DSP::log << DSP::e::LogMode::Error << "DSP::input::set_name" << DSP::e::LogMode::second << "Attempt to set name to null input object" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::input::set_name" << DSP::e::LogMode::second << "Attempt to set name to null input object" << std::endl;
return;
}
_name = name;
@@ -363,7 +363,7 @@ bool operator<<( const DSP::input &input, const DSP::output &output) {
return DSP::_connect_class::connect(output, input);
}
-bool DSP::Component::UndefineOutput(const string &Name)
+bool DSP::Component::UndefineOutput(const std::string &Name)
{
unsigned int ind;
bool done;
@@ -398,14 +398,14 @@ bool DSP::Component::UndefineOutput(const string &Name)
if (done == false)
{
DSP::log << "UndefineOutput" << DSP::e::LogMode::second
- << "Name >" << Name << "< was not defined for block: >" << GetName() << "<" << endl;
+ << "Name >" << Name << "< was not defined for block: >" << GetName() << "<" << std::endl;
}
#endif
return done;
}
-bool DSP::Component::DefineOutput(const string &Name, const unsigned int &OutputNo)
+bool DSP::Component::DefineOutput(const std::string &Name, const unsigned int &OutputNo)
{
unsigned int ind;
@@ -413,7 +413,7 @@ bool DSP::Component::DefineOutput(const string &Name, const unsigned int &Output
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DefineOutput" << DSP::e::LogMode::second
- << "Output number out too large for block: >" << GetName() << "<" << endl;
+ << "Output number out too large for block: >" << GetName() << "<" << std::endl;
#endif
return false;
}
@@ -425,8 +425,8 @@ bool DSP::Component::DefineOutput(const string &Name, const unsigned int &Output
{
#ifdef __DEBUG__
DSP::log << "DefineOutput" << DSP::e::LogMode::second
- << "Name >" << Name << "< already defined for block: >" << GetName() << "<" << endl;
- DSP::log << " " << DSP::e::LogMode::second << "Name will be deleted before redefining" << endl;
+ << "Name >" << Name << "< already defined for block: >" << GetName() << "<" << std::endl;
+ DSP::log << " " << DSP::e::LogMode::second << "Name will be deleted before redefining" << std::endl;
#endif
UndefineOutput(Name);
@@ -437,7 +437,7 @@ bool DSP::Component::DefineOutput(const string &Name, const unsigned int &Output
tempOut.component=this;
if (Name.length() == 0)
{
- tempOut.set_name(to_string(DefinedOutputs.size()));
+ tempOut.set_name(std::to_string(DefinedOutputs.size()));
}
else
{
@@ -452,7 +452,7 @@ bool DSP::Component::DefineOutput(const string &Name, const unsigned int &Output
return true;
}
-bool DSP::Component::DefineOutput(const string &Name,
+bool DSP::Component::DefineOutput(const std::string &Name,
const unsigned int &OutputNo_re, const unsigned int &OutputNo_im)
{
unsigned int ind;
@@ -461,7 +461,7 @@ bool DSP::Component::DefineOutput(const string &Name,
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DefineOutput" << DSP::e::LogMode::second
- << "Output number (realis) out too large for block: " << GetName() << endl;
+ << "Output number (realis) out too large for block: " << GetName() << std::endl;
#endif
return false;
}
@@ -469,7 +469,7 @@ bool DSP::Component::DefineOutput(const string &Name,
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DefineOutput" << DSP::e::LogMode::second
- << "Output number (imaginaris) out too large for block: " << GetName() << endl;
+ << "Output number (imaginaris) out too large for block: " << GetName() << std::endl;
#endif
return false;
}
@@ -481,8 +481,8 @@ bool DSP::Component::DefineOutput(const string &Name,
{
#ifdef __DEBUG__
DSP::log << "DefineOutput" << DSP::e::LogMode::second
- << "Name >" << Name << "< already defined for block: >" << GetName() << "<" << endl;
- DSP::log << " " << DSP::e::LogMode::second << "Name will be deleted before redefining" << endl;
+ << "Name >" << Name << "< already defined for block: >" << GetName() << "<" << std::endl;
+ DSP::log << " " << DSP::e::LogMode::second << "Name will be deleted before redefining" << std::endl;
#endif
UndefineOutput(Name);
@@ -493,7 +493,7 @@ bool DSP::Component::DefineOutput(const string &Name,
tempOut.component=this;
if (Name.length() == 0)
{
- tempOut.set_name(to_string(DefinedOutputs.size()));
+ tempOut.set_name(std::to_string(DefinedOutputs.size()));
}
else
{
@@ -509,7 +509,7 @@ bool DSP::Component::DefineOutput(const string &Name,
return true;
}
-bool DSP::Component::DefineOutput(const string &Name, const vector<unsigned int> &Outputs)
+bool DSP::Component::DefineOutput(const std::string &Name, const std::vector<unsigned int> &Outputs)
{
unsigned int ind;
@@ -518,7 +518,7 @@ bool DSP::Component::DefineOutput(const string &Name, const vector<unsigned int>
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DefineOutput" << DSP::e::LogMode::second
- << "Output number (" << ind << ") out too large for block: " << GetName() << endl;
+ << "Output number (" << ind << ") out too large for block: " << GetName() << std::endl;
#endif
return false;
}
@@ -529,10 +529,10 @@ bool DSP::Component::DefineOutput(const string &Name, const vector<unsigned int>
if (Name.compare(DefinedOutputs[ind].get_name()) == 0)
{
#ifdef __DEBUG__
- stringstream tekst;
+ std::stringstream tekst;
DSP::log << "DefineOutput" << DSP::e::LogMode::second
- << "Name >" << Name << "< already defined for block: >" << GetName() << "<" << endl;
- DSP::log << " " << DSP::e::LogMode::second << "Name will be deleted before redefining" << endl;
+ << "Name >" << Name << "< already defined for block: >" << GetName() << "<" << std::endl;
+ DSP::log << " " << DSP::e::LogMode::second << "Name will be deleted before redefining" << std::endl;
#endif
UndefineOutput(Name);
@@ -543,7 +543,7 @@ bool DSP::Component::DefineOutput(const string &Name, const vector<unsigned int>
tempOut.component=this;
if (Name.length() == 0)
{
- tempOut.set_name(to_string(DefinedOutputs.size()));
+ tempOut.set_name(std::to_string(DefinedOutputs.size()));
}
else
{
@@ -559,7 +559,7 @@ bool DSP::Component::DefineOutput(const string &Name, const vector<unsigned int>
return true;
}
-bool DSP::Block::UndefineInput(const string &Name)
+bool DSP::Block::UndefineInput(const std::string &Name)
{
unsigned int ind;
bool done;
@@ -592,14 +592,14 @@ bool DSP::Block::UndefineInput(const string &Name)
if (done == false)
{
DSP::log << "UndefineInput" << DSP::e::LogMode::second
- << "Name >" << Name << "< was not defined for block: >" << GetName() << "<" << endl;
+ << "Name >" << Name << "< was not defined for block: >" << GetName() << "<" << std::endl;
}
#endif
return done;
}
-bool DSP::Block::DefineInput(const string &Name, const unsigned int &InputNo)
+bool DSP::Block::DefineInput(const std::string &Name, const unsigned int &InputNo)
{
unsigned int ind;
@@ -607,7 +607,7 @@ bool DSP::Block::DefineInput(const string &Name, const unsigned int &InputNo)
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DefineInput(\""+Name+"\")" << DSP::e::LogMode::second
- << "Input number:" << InputNo << ", too large for block: " << GetName() << endl;
+ << "Input number:" << InputNo << ", too large for block: " << GetName() << std::endl;
#endif
return false;
}
@@ -619,8 +619,8 @@ bool DSP::Block::DefineInput(const string &Name, const unsigned int &InputNo)
{
#ifdef __DEBUG__
DSP::log << "DefineInput" << DSP::e::LogMode::second
- << "Name >" << Name << "< already defined for block: >" << GetName() << "<" << endl;
- DSP::log << " " << DSP::e::LogMode::second << "Name will be deleted before redefining" << endl;
+ << "Name >" << Name << "< already defined for block: >" << GetName() << "<" << std::endl;
+ DSP::log << " " << DSP::e::LogMode::second << "Name will be deleted before redefining" << std::endl;
#endif
UndefineInput(Name);
@@ -631,7 +631,7 @@ bool DSP::Block::DefineInput(const string &Name, const unsigned int &InputNo)
tempIn.component=this;
if (Name.length() == 0)
{
- tempIn.set_name(to_string(DefinedInputs.size()));
+ tempIn.set_name(std::to_string(DefinedInputs.size()));
}
else
{
@@ -646,7 +646,7 @@ bool DSP::Block::DefineInput(const string &Name, const unsigned int &InputNo)
return true;
}
-bool DSP::Block::DefineInput(const string &Name,
+bool DSP::Block::DefineInput(const std::string &Name,
const unsigned int &InputNo_re, const unsigned int &InputNo_im)
{
unsigned int ind;
@@ -655,7 +655,7 @@ bool DSP::Block::DefineInput(const string &Name,
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DefineInput(\"" << Name << "\")" << DSP::e::LogMode::second
- << "Input number:" << InputNo_re << ", (realis) too large for block: " << GetName() << endl;
+ << "Input number:" << InputNo_re << ", (realis) too large for block: " << GetName() << std::endl;
#endif
return false;
}
@@ -663,7 +663,7 @@ bool DSP::Block::DefineInput(const string &Name,
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DefineInput(\"" << Name << "\")" << DSP::e::LogMode::second
- << "Input number " << InputNo_re << " (imaginaris) too large for block: " << GetName() << endl;
+ << "Input number " << InputNo_re << " (imaginaris) too large for block: " << GetName() << std::endl;
#endif
return false;
}
@@ -675,8 +675,8 @@ bool DSP::Block::DefineInput(const string &Name,
{
#ifdef __DEBUG__
DSP::log << "DefineInput" << DSP::e::LogMode::second
- << "Name >" << Name << "< already defined for block: >" << GetName() << "<" << endl;
- DSP::log << " " << DSP::e::LogMode::second << "Name will be deleted before redefining" << endl;
+ << "Name >" << Name << "< already defined for block: >" << GetName() << "<" << std::endl;
+ DSP::log << " " << DSP::e::LogMode::second << "Name will be deleted before redefining" << std::endl;
#endif
UndefineInput(Name);
@@ -687,7 +687,7 @@ bool DSP::Block::DefineInput(const string &Name,
tempIn.component=this;
if (Name.length() == 0)
{
- tempIn.set_name(to_string(DefinedInputs.size()));
+ tempIn.set_name(std::to_string(DefinedInputs.size()));
}
else
{
@@ -703,8 +703,8 @@ bool DSP::Block::DefineInput(const string &Name,
return true;
}
-bool DSP::Block::DefineInput(const string &Name,
- const vector<unsigned int> &Inputs)
+bool DSP::Block::DefineInput(const std::string &Name,
+ const std::vector<unsigned int> &Inputs)
{
unsigned int ind;
@@ -713,7 +713,7 @@ bool DSP::Block::DefineInput(const string &Name,
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DefineInput(\"" << Name << "\")" << DSP::e::LogMode::second
- << "Input number:" << ind << ", too large for block: " << GetName() << endl;
+ << "Input number:" << ind << ", too large for block: " << GetName() << std::endl;
#endif
return false;
}
@@ -725,8 +725,8 @@ bool DSP::Block::DefineInput(const string &Name,
{
#ifdef __DEBUG__
DSP::log << "DefineInput" << DSP::e::LogMode::second
- << "Name >" << Name << "< already defined for block: >" << GetName() << "<" << endl;
- DSP::log << " " << DSP::e::LogMode::second << "Name will be deleted before redefining" << endl;
+ << "Name >" << Name << "< already defined for block: >" << GetName() << "<" << std::endl;
+ DSP::log << " " << DSP::e::LogMode::second << "Name will be deleted before redefining" << std::endl;
#endif
UndefineInput(Name);
@@ -737,7 +737,7 @@ bool DSP::Block::DefineInput(const string &Name,
tempIn.component=this;
if (Name.length() == 0)
{
- tempIn.set_name(to_string(DefinedInputs.size()));
+ tempIn.set_name(std::to_string(DefinedInputs.size()));
}
else
{
@@ -753,7 +753,7 @@ bool DSP::Block::DefineInput(const string &Name,
return true;
}
-DSP::output &DSP::Component::Output(const string &Name)
+DSP::output &DSP::Component::Output(const std::string &Name)
{
unsigned int ind;
@@ -765,31 +765,31 @@ DSP::output &DSP::Component::Output(const string &Name)
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::Component::Output" << DSP::e::LogMode::second
- << "Block<" << this->GetName() << "> has no output named <" << Name << ">" << endl;
- DSP::log << "DSP::Component::Output" << DSP::e::LogMode::second << "Available output names:" << endl;
+ << "Block<" << this->GetName() << "> has no output named <" << Name << ">" << std::endl;
+ DSP::log << "DSP::Component::Output" << DSP::e::LogMode::second << "Available output names:" << std::endl;
for (ind=0; ind<DefinedOutputs.size(); ind++)
{
DSP::log << "DSP::Component::Output" << DSP::e::LogMode::second
- << " \"" << DefinedOutputs[ind].get_name() << "\"" << endl;
+ << " \"" << DefinedOutputs[ind].get_name() << "\"" << std::endl;
}
DSP::log << DSP::e::LogMode::Error << "DSP::Component::Output" << DSP::e::LogMode::second
- << "Use one of defined outputs or define new one using DSP::Component::DefineOutput function" << endl;
+ << "Use one of defined outputs or define new one using DSP::Component::DefineOutput function" << std::endl;
#endif
return DSP::output::null();
}
-DSP::input &DSP::Component::Input(const string &Name)
+DSP::input &DSP::Component::Input(const std::string &Name)
{
UNUSED_ARGUMENT(Name);
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::Block::Input";
- DSP::log << DSP::e::LogMode::second << "Block<" << this->GetName() << "> should not have Input() method called." << endl;
+ DSP::log << DSP::e::LogMode::second << "Block<" << this->GetName() << "> should not have Input() method called." << std::endl;
#endif
return DSP::input::null();
}
-DSP::input &DSP::Block::Input(const string &Name)
+DSP::input &DSP::Block::Input(const std::string &Name)
{
unsigned int ind;
@@ -801,15 +801,15 @@ DSP::input &DSP::Block::Input(const string &Name)
#ifdef __DEBUG__
DSP::log << "DSP::Block::Input" << DSP::e::LogMode::second
- << "Block<" << this->GetName() << "> has no input named <" << Name << ">" << endl;
- DSP::log << "DSP::Block::Input" << DSP::e::LogMode::second << "Available input names:" << endl;
+ << "Block<" << this->GetName() << "> has no input named <" << Name << ">" << std::endl;
+ DSP::log << "DSP::Block::Input" << DSP::e::LogMode::second << "Available input names:" << std::endl;
for (ind=0; ind<DefinedInputs.size(); ind++)
{
DSP::log << "DSP::Block::Input" << DSP::e::LogMode::second
- << " \"" << DefinedInputs[ind].get_name() << "\"" << endl;
+ << " \"" << DefinedInputs[ind].get_name() << "\"" << std::endl;
}
DSP::log << DSP::e::LogMode::Error << "DSP::Block::Input" << DSP::e::LogMode::second
- << "Use one of defined inputs or define new one using DSP::Block::DefineInput function" << endl;
+ << "Use one of defined inputs or define new one using DSP::Block::DefineInput function" << std::endl;
#endif
return DSP::input::null();
}
@@ -832,7 +832,7 @@ bool DSP::_connect_class::connect(const DSP::output &output, const DSP::input &i
if (output.is_null() || input.is_null())
{
#ifdef __DEBUG__
- stringstream tekst;
+ std::stringstream tekst;
if (output.is_null() && input.is_null())
tekst << "NULL output -> NULL input";
if (output.is_null() && (!input.is_null()))
@@ -846,8 +846,8 @@ bool DSP::_connect_class::connect(const DSP::output &output, const DSP::input &i
<< ", output:" << output.get_name() << "(" << output.Outputs.size() << ") -> NULL input";
}
- DSP::log << "DSP::_connect_class::connect" << DSP::e::LogMode::second << tekst.str() << endl;
- DSP::log << DSP::e::LogMode::Error << "DSP::_connect_class::connect" << DSP::e::LogMode::second << "At least one of the input parameters is NULL" << endl;
+ DSP::log << "DSP::_connect_class::connect" << DSP::e::LogMode::second << tekst.str() << std::endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::_connect_class::connect" << DSP::e::LogMode::second << "At least one of the input parameters is NULL" << std::endl;
#endif
return false;
}
@@ -860,7 +860,7 @@ bool DSP::_connect_class::connect(const DSP::output &output, const DSP::input &i
<< "> has output <" << output.get_name()
<< "> with different number of output lines (=" << output.Outputs.size()
<< ") from block <" << input.component->GetName()
- << "> input <" << input.get_name() << "> (=" << input.Inputs.size() << ")" << endl;
+ << "> input <" << input.get_name() << "> (=" << input.Inputs.size() << ")" << std::endl;
#endif
return false;
}
@@ -914,7 +914,7 @@ bool DSP::_connect_class::splitconnect(const DSP::output &output, const DSP::inp
<< "< has output >" << output.get_name()
<< "< with different number of output lines (" << output.Outputs.size()
<< ") from block >" << input.component->GetName()
- << "< output >" << input.get_name() << "< (" << input.Inputs.size() << ")" << endl;
+ << "< output >" << input.get_name() << "< (" << input.Inputs.size() << ")" << std::endl;
#endif
return false;
}
@@ -1580,7 +1580,7 @@ void DSP::Component::UnregisterComponent(void)
else
{
DSP::log << DSP::e::LogMode::Error << "UnregisterComponent" << DSP::e::LogMode::second
- << "WARNING: trying unregister component (" << this->GetName() << ") which is not in the ComponentsTable." << endl;
+ << "WARNING: trying unregister component (" << this->GetName() << ") which is not in the ComponentsTable." << std::endl;
}
#endif
@@ -1647,7 +1647,7 @@ unsigned int DSP::Block::GetNoOfInputs(void)
/* Indicates given input as constant value (no coutput can
* be connected to it)
*/
-bool DSP::Block::SetConstInput(const string &InputName, DSP::Float value)
+bool DSP::Block::SetConstInput(const std::string &InputName, DSP::Float value)
//bool DSP::Block::SetConstInput(int InputNo, DSP::Float value)
{
unsigned int ind;
@@ -1657,7 +1657,7 @@ bool DSP::Block::SetConstInput(const string &InputName, DSP::Float value)
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::Block::SetConstInput" << DSP::e::LogMode::second
- << "Block >>" << GetName() << "<< doesn't support constant inputs !!!" << endl;
+ << "Block >>" << GetName() << "<< doesn't support constant inputs !!!" << std::endl;
#endif
return false;
}
@@ -1703,7 +1703,7 @@ bool DSP::Block::SetConstInput(const string &InputName, DSP::Float value)
* InputNo+1 -> imag_value
* (no coutput can be connected to it)
*/
-bool DSP::Block::SetConstInput(const string &InputName, DSP::Float real_value, DSP::Float imag_value)
+bool DSP::Block::SetConstInput(const std::string &InputName, DSP::Float real_value, DSP::Float imag_value)
{
unsigned int ind;
unsigned int InputNo;
@@ -1712,7 +1712,7 @@ bool DSP::Block::SetConstInput(const string &InputName, DSP::Float real_value, D
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::Block::SetConstInput" << DSP::e::LogMode::second
- << "Block >>" << GetName() << "<< doesn't support for constant inputs !!!" << endl;
+ << "Block >>" << GetName() << "<< doesn't support for constant inputs !!!" << std::endl;
#endif
return false;
}
@@ -1905,7 +1905,7 @@ void DSP::Source::RegisterOutputClock(DSP::Clock_ptr OutputClock, unsigned int o
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::Source::RegisterOutputClock" << DSP::e::LogMode::second
<< "Attempt to register source <" << GetName()
- << "> to NULL clock (output_index = " << output_index << ")" << endl;
+ << "> to NULL clock (output_index = " << output_index << ")" << std::endl;
#endif
return;
}
@@ -1913,7 +1913,7 @@ void DSP::Source::RegisterOutputClock(DSP::Clock_ptr OutputClock, unsigned int o
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::Source::RegisterOutputClock" << DSP::e::LogMode::second
- << "Attempt to register source output with index out of range = " << output_index << endl;
+ << "Attempt to register source output with index out of range = " << output_index << std::endl;
#endif
return;
}
@@ -1944,7 +1944,7 @@ void DSP::Component::RegisterForNotification(DSP::Clock_ptr NotifyClock)
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::Source::RegisterClockForNotification" << DSP::e::LogMode::second
- << "Attempt to register source <" << GetName() << "> to NULL clock" << endl;
+ << "Attempt to register source <" << GetName() << "> to NULL clock" << std::endl;
#endif
return;
}
@@ -1976,7 +1976,7 @@ bool DSP::Component::SetOutput(unsigned int OutputNo, DSP::Component_ptr compone
DSP::log << DSP::e::LogMode::Error << "DSP::Component::SetOutput" << DSP::e::LogMode::second
<< "Can't connect output (" << GetName() << ":" << OutputNo
<< ") to input (" << component->GetName() << ":" << InputNo << "). "
- "Such an output doesn't exist - too large output number." << endl;
+ "Such an output doesn't exist - too large output number." << std::endl;
#endif
return false;
}
@@ -1984,7 +1984,7 @@ bool DSP::Component::SetOutput(unsigned int OutputNo, DSP::Component_ptr compone
if (component == NULL)
{
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::Component::SetOutput" << DSP::e::LogMode::second << "Can't connect to input. Output block not specified (NULL)." << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Component::SetOutput" << DSP::e::LogMode::second << "Can't connect to input. Output block not specified (NULL)." << std::endl;
#endif
return false;
}
@@ -1993,7 +1993,7 @@ bool DSP::Component::SetOutput(unsigned int OutputNo, DSP::Component_ptr compone
if (tempBlock == NULL)
{
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::Component::SetOutput" << DSP::e::LogMode::second << "Can't connect to input. Output component is the source (no inputs)." << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Component::SetOutput" << DSP::e::LogMode::second << "Can't connect to input. Output component is the source (no inputs)." << std::endl;
#endif
return false;
}
@@ -2005,7 +2005,7 @@ bool DSP::Component::SetOutput(unsigned int OutputNo, DSP::Component_ptr compone
<< "Can't connect output (" << component->GetName() << ":" << InputNo
<< ") to input (" << GetName() << ":"<< OutputNo
<< "). Input (" << component->GetName() << ":" << InputNo
- << ") does not exist - too large input number." << endl;
+ << ") does not exist - too large input number." << std::endl;
#endif
return false;
}
@@ -2022,7 +2022,7 @@ bool DSP::Component::SetOutput(unsigned int OutputNo, DSP::Component_ptr compone
<< "Can't connect output (" << GetName() << ":" << OutputNo
<< ") to input(DSP::u::Copy) (" << component->GetName() << ":" << InputNo
<< "). DSP::u::Copy Output (" << tempCopy->GetName() << ":" << InputNo
- << ") is already connected to (" << output_block->GetName() << ":" << output_block_input_no << ")." << endl;
+ << ") is already connected to (" << output_block->GetName() << ":" << output_block_input_no << ")." << std::endl;
#endif
}
}
@@ -2034,7 +2034,7 @@ bool DSP::Component::SetOutput(unsigned int OutputNo, DSP::Component_ptr compone
<< ") to input (" << component->GetName() << ":" << InputNo
<< "). Output (" << GetName() << ":" << OutputNo
<< ") is already connected to ("
- << OutputBlocks[OutputNo]->GetName() << ":" << OutputBlocks_InputNo[OutputNo] << ")." << endl;
+ << OutputBlocks[OutputNo]->GetName() << ":" << OutputBlocks_InputNo[OutputNo] << ")." << std::endl;
#endif
return false;
}
@@ -2046,7 +2046,7 @@ bool DSP::Component::SetOutput(unsigned int OutputNo, DSP::Component_ptr compone
DSP::log << DSP::e::LogMode::Error << "DSP::Component::SetOutput" << DSP::e::LogMode::second
<< "Cant't connect output (" << GetName() << ":" << OutputNo
<< ") to input (" << component->GetName() << ":" << InputNo << "). "
- "Destination component has no inputs!" << endl;
+ "Destination component has no inputs!" << std::endl;
#endif
return false;
}
@@ -2058,7 +2058,7 @@ bool DSP::Component::SetOutput(unsigned int OutputNo, DSP::Component_ptr compone
<< "Cant't connect output (" << GetName() << ":" << OutputNo
<< ") to input (" << component->GetName() << ":" << InputNo
<< "). Something is already connected to input ("
- << component->GetName() << ":" << InputNo << ")." << endl;
+ << component->GetName() << ":" << InputNo << ")." << std::endl;
#endif
return false;
}
@@ -2078,7 +2078,7 @@ bool DSP::Component::SetOutput(unsigned int OutputNo, DSP::Component_ptr compone
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::Component::SetOutput" << DSP::e::LogMode::second
- << "GetCopyInput(" << tempCopy->GetName() << ":" << InputNo << ") failed!" << endl;
+ << "GetCopyInput(" << tempCopy->GetName() << ":" << InputNo << ") failed!" << std::endl;
#endif
return false;
}
@@ -2099,7 +2099,7 @@ bool DSP::Component::SetOutput(unsigned int OutputNo, DSP::Component_ptr compone
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::Component::SetOutput" << DSP::e::LogMode::second
- << "GetCopyOutput(" << tempCopy->GetName() << ":" << OutputNo << ") failed!" << endl;
+ << "GetCopyOutput(" << tempCopy->GetName() << ":" << OutputNo << ") failed!" << std::endl;
#endif
return false;
}
@@ -2133,7 +2133,7 @@ bool DSP::Block::ClearInput(unsigned int InputNo)
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::Block::ClearInput" << DSP::e::LogMode::second
- << "ClearInput: Input (" << GetName() << ":" << InputNo << ") must have already been cleared !!!" << endl;
+ << "ClearInput: Input (" << GetName() << ":" << InputNo << ") must have already been cleared !!!" << std::endl;
#endif
}
else
@@ -2233,7 +2233,7 @@ DSP::Clock_ptr DSP::clock_groups::FindClock4Input(const std::string &group_name,
if (L == 0)
{
DSP::log << DSP::e::LogMode::Error << "DSP::clock_groups::FindClock4Input" << DSP::e::LogMode::second
- << "there is no clocks' groups relation defined for given reference group and input index" << endl;
+ << "there is no clocks' groups relation defined for given reference group and input index" << std::endl;
return NULL;
}
@@ -2273,7 +2273,7 @@ DSP::Clock_ptr DSP::clock_groups::FindClock4Output(const std::string &group_name
if (L == 0)
{
DSP::log << DSP::e::LogMode::Error << "DSP::clock_groups::FindClock4Input" << DSP::e::LogMode::second
- << "there is no clocks' groups relation defined for given reference group and input index" << endl;
+ << "there is no clocks' groups relation defined for given reference group and input index" << std::endl;
return reference_clock;
}
@@ -2475,7 +2475,7 @@ void DSP::Block::SetBlockInputClock(unsigned int InputNo, DSP::Clock_ptr InputCl
{ // create group "all" containing all blocks' inputs and outputs
#ifdef __DEBUG__
DSP::log << "DSP::Block::SetBlockInputClock" << DSP::e::LogMode::second
- << "creating clock group >>all<< for block " << GetName() << endl;
+ << "creating clock group >>all<< for block " << GetName() << std::endl;
#endif // __DEBUG__
if (NoOfInputs > 0)
{
@@ -2538,7 +2538,7 @@ void DSP::Block::SetBlockInputClock(unsigned int InputNo, DSP::Clock_ptr InputCl
#ifdef __DEBUG__
if (InputClocks[InputNo] != NULL)
{
- DSP::log << DSP::e::LogMode::Error << "Input clock has been already set" << endl;
+ DSP::log << DSP::e::LogMode::Error << "Input clock has been already set" << std::endl;
}
#endif // __DEBUG__
@@ -2553,7 +2553,7 @@ void DSP::Block::SetBlockInputClock(unsigned int InputNo, DSP::Clock_ptr InputCl
#ifdef __DEBUG__
if (ClockGroups.groups[reference_input_group_name].GroupClock != InputClock)
{
- DSP::log << DSP::e::LogMode::Error << GetName() << DSP::e::LogMode::second << "Group clock has been already set to different value." << endl;
+ DSP::log << DSP::e::LogMode::Error << GetName() << DSP::e::LogMode::second << "Group clock has been already set to different value." << std::endl;
}
#endif
}
@@ -2589,7 +2589,7 @@ void DSP::Block::SetBlockInputClock(unsigned int InputNo, DSP::Clock_ptr InputCl
else
{
DSP::log << "DSP::Block::SetBlockInputClock" << DSP::e::LogMode::second
- << "In block <" << GetName() << "> There is no group defined for input number " << ind << endl;
+ << "In block <" << GetName() << "> There is no group defined for input number " << ind << std::endl;
tmp_InputClock = InputClock;
}
}
@@ -2604,7 +2604,7 @@ void DSP::Block::SetBlockInputClock(unsigned int InputNo, DSP::Clock_ptr InputCl
{
DSP::log << DSP::e::LogMode::Error << "SetBlockInputClock" << DSP::e::LogMode::second
<< "Input clocks mismatch in block (" << GetName()
- << ") possibly at input (" << InputNo << ")" << endl;
+ << ") possibly at input (" << InputNo << ")" << std::endl;
}
#endif
@@ -2624,7 +2624,7 @@ void DSP::Block::SetBlockInputClock(unsigned int InputNo, DSP::Clock_ptr InputCl
else
{
DSP::log << "DSP::Block::SetBlockInputClock" << DSP::e::LogMode::second
- << "In block <" << GetName() << "> There is no group defined for output number " << ind << endl;
+ << "In block <" << GetName() << "> There is no group defined for output number " << ind << std::endl;
tmp_OutputClock = InputClock;
}
@@ -2640,7 +2640,7 @@ void DSP::Block::SetBlockInputClock(unsigned int InputNo, DSP::Clock_ptr InputCl
DSP::log << DSP::e::LogMode::Error << "SetBlockInputClock" << DSP::e::LogMode::second
<< "Input clock differs from output clock for ("
<< GetName() << ":" << ind << ") probably at input ("
- << InputNo << ")!!!" << endl;
+ << InputNo << ")!!!" << std::endl;
#endif
}
else
@@ -2679,7 +2679,7 @@ void DSP::Block::SetBlockInputClock(unsigned int InputNo, DSP::Clock_ptr InputCl
" >> Master clock index: " << tmp_OutputClock->MasterClockIndex
<< "; Output clock cycle_length based on input clock: " << tmp_OutputClock->cycle_length << "\n"
" >> Master clock index: " << OutputClocks[0]->MasterClockIndex
- << "; Actual output clock cycle_length: " << OutputClocks[0]->cycle_length << endl;
+ << "; Actual output clock cycle_length: " << OutputClocks[0]->cycle_length << std::endl;
#endif
}
else
@@ -2741,7 +2741,7 @@ bool DSP::Block::IsInputAvailable(unsigned int InputNo)
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "IsInputAvailable" << DSP::e::LogMode::second
<< "tried to connect to constant input ("
- << this->GetName() << ":" << InputNo << ")" << endl;
+ << this->GetName() << ":" << InputNo << ")" << std::endl;
#endif
return false;
}
@@ -2755,7 +2755,7 @@ bool DSP::Block::IsInputAvailable(unsigned int InputNo)
DSP::log << DSP::e::LogMode::Error << "IsInputAvailable" << DSP::e::LogMode::second
<< "There is output (" << tempComponent->GetName()
<< ":" << tempNo << ") already connected to this input ("
- << this->GetName() << ":" << InputNo << ")" << endl;
+ << this->GetName() << ":" << InputNo << ")" << std::endl;
#endif
return false;
}
@@ -2995,7 +2995,7 @@ bool DSP::Block::GetMultirateFactorsFromClocks(
if (ClocksShouldBeSynchronous == true)
{
DSP::log << DSP::e::LogMode::Error << "DSP::Block::GetMultirateFactorsFromClocks" << DSP::e::LogMode::second
- << "Detected asynchronous clock in component >>" << GetName() << "<< !!!" << endl;
+ << "Detected asynchronous clock in component >>" << GetName() << "<< !!!" << std::endl;
}
#endif
}
@@ -3044,8 +3044,8 @@ DSP::u::LoopDelay::LoopDelay(DSP::Clock_ptr ParentClock, unsigned int delay, uns
: DSP::Block(), DSP::Source()
{
unsigned int ind;
- string temp;
- vector<unsigned int> indexes;
+ std::string temp;
+ std::vector<unsigned int> indexes;
SetName("LoopDelay", false);
@@ -3066,9 +3066,9 @@ DSP::u::LoopDelay::LoopDelay(DSP::Clock_ptr ParentClock, unsigned int delay, uns
indexes.resize(NoOfInputs);
for (ind=0; ind<NoOfInputs; ind++)
{
- temp = "in" + to_string(ind+1);
+ temp = "in" + std::to_string(ind+1);
DefineInput(temp, ind);
- temp = "out" + to_string(ind+1);
+ temp = "out" + std::to_string(ind+1);
DefineOutput(temp, ind);
indexes[ind] = ind;
@@ -3118,11 +3118,11 @@ DSP::u::LoopDelay::LoopDelay(DSP::Clock_ptr ParentClock, unsigned int delay, uns
}
}
-bool DSP::u::LoopDelay::SetState(const string &InputName, DSP::Float state_buffer_value)
+bool DSP::u::LoopDelay::SetState(const std::string &InputName, DSP::Float state_buffer_value)
{
return SetState(InputName, 1, &state_buffer_value);
}
-bool DSP::u::LoopDelay::SetState(const string &InputName, unsigned int size, DSP::Float_ptr state_buffer)
+bool DSP::u::LoopDelay::SetState(const std::string &InputName, unsigned int size, DSP::Float_ptr state_buffer)
{
unsigned int InputNo;
@@ -3144,7 +3144,7 @@ bool DSP::u::LoopDelay::SetState(const string &InputName, unsigned int size, DSP
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::u::LoopDelay::SetState" << DSP::e::LogMode::second
- << "Block >>" << GetName() << "<< - state buffer == NULL" << endl;
+ << "Block >>" << GetName() << "<< - state buffer == NULL" << std::endl;
#endif
return false;
}
@@ -3153,7 +3153,7 @@ bool DSP::u::LoopDelay::SetState(const string &InputName, unsigned int size, DSP
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::u::LoopDelay::SetState" << DSP::e::LogMode::second
- << "Block >>" << GetName() << "<< - wrong state buffer size: " << size << " instead of " << Delay[InputNo] << endl;
+ << "Block >>" << GetName() << "<< - wrong state buffer size: " << size << " instead of " << Delay[InputNo] << std::endl;
#endif
return false;
}
@@ -3164,7 +3164,7 @@ bool DSP::u::LoopDelay::SetState(const string &InputName, unsigned int size, DSP
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::u::LoopDelay::SetState" << DSP::e::LogMode::second
- << "Block >>" << GetName() << "<< doesn't support input >>" << InputName << "<< !!!" << endl;
+ << "Block >>" << GetName() << "<< doesn't support input >>" << InputName << "<< !!!" << std::endl;
#endif
return false;
}
@@ -3314,8 +3314,8 @@ bool DSP::u::LoopDelay::OutputExecute_multi(OUTPUT_EXECUTE_ARGS)
DSP::u::Delay::Delay(unsigned int delay_in, unsigned int InputsNo, bool IsBufferCyclic) : DSP::Block()
{
unsigned int ind;
- string temp;
- vector<unsigned int> indexes;
+ std::string temp;
+ std::vector<unsigned int> indexes;
if (IsBufferCyclic == true)
SetName("Delay(cyclic)", false);
@@ -3339,9 +3339,9 @@ DSP::u::Delay::Delay(unsigned int delay_in, unsigned int InputsNo, bool IsBuffer
indexes.resize(NoOfInputs);
for (ind=0; ind<NoOfInputs; ind++)
{
- temp = "in" + to_string(ind+1);
+ temp = "in" + std::to_string(ind+1);
DefineInput(temp, ind);
- temp = "out" + to_string(ind+1);
+ temp = "out" + std::to_string(ind+1);
DefineOutput(temp, ind);
indexes[ind] = ind;
@@ -3618,7 +3618,7 @@ DSP::u::Addition::~Addition(void)
// Standard initialisation
void DSP::u::Addition::Init(unsigned int NoOfRealInputs_in, unsigned int NoOfComplexInputs_in, bool ForceCplxOutput)
{
- string temp;
+ std::string temp;
unsigned int ind;
SetName("Addition", false);
@@ -3640,27 +3640,27 @@ void DSP::u::Addition::Init(unsigned int NoOfRealInputs_in, unsigned int NoOfCom
SetNoOfInputs(NoOfRealInputs_in, NoOfComplexInputs_in, true);
for (ind=0; ind<NoOfRealInputs_in; ind++)
{
- temp = "real_in" + to_string(ind+1);
+ temp = "real_in" + std::to_string(ind+1);
DefineInput(temp, ind);
- temp = "in" + to_string(ind+1);
+ temp = "in" + std::to_string(ind+1);
DefineInput(temp, ind);
- temp = "in" + to_string(ind+1) + ".re";
+ temp = "in" + std::to_string(ind+1) + ".re";
DefineInput(temp, ind);
}
for (ind=0; ind<NoOfComplexInputs_in; ind++)
{
- temp = "cplx_in" + to_string(ind+1);
+ temp = "cplx_in" + std::to_string(ind+1);
DefineInput(temp, NoOfRealInputs_in+ind*2, NoOfRealInputs_in+ind*2+1);
- temp = "in" + to_string(NoOfRealInputs_in+ind+1);
+ temp = "in" + std::to_string(NoOfRealInputs_in+ind+1);
DefineInput(temp, NoOfRealInputs_in+ind*2, NoOfRealInputs_in+ind*2+1);
- temp = "cplx_in" + to_string(ind+1) + ".re";
+ temp = "cplx_in" + std::to_string(ind+1) + ".re";
DefineInput(temp, NoOfRealInputs_in+ind*2);
- temp = "cplx_in" + to_string(ind+1) + ".im";
+ temp = "cplx_in" + std::to_string(ind+1) + ".im";
DefineInput(temp, NoOfRealInputs_in+ind*2+1);
- temp = "in" + to_string(NoOfRealInputs_in+ind+1) + ".re";
+ temp = "in" + std::to_string(NoOfRealInputs_in+ind+1) + ".re";
DefineInput(temp, NoOfRealInputs_in+ind*2);
- temp = "in" + to_string(NoOfRealInputs_in+ind+1) + ".im";
+ temp = "in" + std::to_string(NoOfRealInputs_in+ind+1) + ".im";
DefineInput(temp, NoOfRealInputs_in+ind*2+1);
}
@@ -3885,7 +3885,7 @@ void DSP::u::Addition::RecalculateInitials(void)
DSP::u::Multiplication::Multiplication(unsigned int NoOfRealInputs_in, unsigned int NoOfComplexInputs_in)
: DSP::Block()
{
- string temp;
+ std::string temp;
unsigned int ind;
SetName("Multiplication", false);
@@ -3906,29 +3906,29 @@ DSP::u::Multiplication::Multiplication(unsigned int NoOfRealInputs_in, unsigned
SetNoOfInputs(NoOfRealInputs_in, NoOfComplexInputs_in, true);
for (ind=0; ind<NoOfRealInputs_in; ind++)
{
- temp = "real_in" + to_string(ind+1);
+ temp = "real_in" + std::to_string(ind+1);
DefineInput(temp, ind);
- temp = "in" + to_string(ind+1);
+ temp = "in" + std::to_string(ind+1);
DefineInput(temp, ind);
- temp = "in" + to_string(ind+1) + ".re";
+ temp = "in" + std::to_string(ind+1) + ".re";
DefineInput(temp, ind);
}
for (ind=0; ind<NoOfComplexInputs_in; ind++)
{
- temp = "cplx_in" + to_string(ind+1);
+ temp = "cplx_in" + std::to_string(ind+1);
DefineInput(temp, NoOfRealInputs_in+ind*2, NoOfRealInputs_in+ind*2+1);
- temp = "in" + to_string(NoOfRealInputs_in+ind+1);
+ temp = "in" + std::to_string(NoOfRealInputs_in+ind+1);
DefineInput(temp, NoOfRealInputs_in+ind*2, NoOfRealInputs_in+ind*2+1);
- temp = "cplx_in" + to_string(ind+1) + ".re";
+ temp = "cplx_in" + std::to_string(ind+1) + ".re";
DefineInput(temp, NoOfRealInputs_in+ind*2);
- temp = "cplx_in" + to_string(ind+1)+ ".im";
+ temp = "cplx_in" + std::to_string(ind+1)+ ".im";
DefineInput(temp, NoOfRealInputs_in+ind*2+1);
- temp = "in" + to_string(NoOfRealInputs_in+ind+1) + ".re";
+ temp = "in" + std::to_string(NoOfRealInputs_in+ind+1) + ".re";
DefineInput(temp, NoOfRealInputs_in+ind*2);
- temp = "in" + to_string(NoOfRealInputs_in+ind+1) + ".im";
+ temp = "in" + std::to_string(NoOfRealInputs_in+ind+1) + ".im";
DefineInput(temp, NoOfRealInputs_in+ind*2+1);
}
@@ -4041,7 +4041,7 @@ void DSP::u::Multiplication::InputExecute(INPUT_EXECUTE_ARGS)
DSP::u::RealMultiplication::RealMultiplication(unsigned int NoOfRealInputs_in)
: DSP::Block()
{
- string temp;
+ std::string temp;
unsigned int ind;
SetName("Real multiplication", false);
@@ -4051,9 +4051,9 @@ DSP::u::RealMultiplication::RealMultiplication(unsigned int NoOfRealInputs_in)
SetNoOfInputs(NoOfRealInputs_in, 0, true);
for (ind=0; ind<NoOfRealInputs_in; ind++)
{
- temp = "in" + to_string(ind+1);
+ temp = "in" + std::to_string(ind+1);
DefineInput(temp, ind);
- temp = "real_in" + to_string(ind+1);
+ temp = "real_in" + std::to_string(ind+1);
DefineInput(temp, ind);
}
@@ -4116,9 +4116,9 @@ void DSP::u::RealMultiplication::InputExecute(INPUT_EXECUTE_ARGS)
DSP::u::Amplifier::Amplifier(DSP::Float alfa, unsigned int NoOfInputs_in, bool AreInputsComplex)
: DSP::Block()
{
- vector <unsigned int> indexes;
+ std::vector <unsigned int> indexes;
//unsigned int ind;
- string temp;
+ std::string temp;
IsGainComplex = false;
SetName("Amplifier", false);
@@ -4139,17 +4139,17 @@ DSP::u::Amplifier::Amplifier(DSP::Float alfa, unsigned int NoOfInputs_in, bool A
}
for (ind=0; ind<NoOfInputs_in; ind++)
{
- temp = "in" + to_string(ind+1);
+ temp = "in" + std::to_string(ind+1);
DefineInput(temp, 2*ind, 2*ind+1);
- temp = "in" + to_string(ind+1) + ".re";
+ temp = "in" + std::to_string(ind+1) + ".re";
DefineInput(temp, 2*ind);
- temp = "in" + to_string(ind+1) + ".im";
+ temp = "in" + std::to_string(ind+1) + ".im";
DefineInput(temp, 2*ind+1);
- temp = "out" + to_string(ind+1);
+ temp = "out" + std::to_string(ind+1);
DefineOutput(temp, 2*ind, 2*ind+1);
- temp = "out" + to_string(ind+1) + ".re";
+ temp = "out" + std::to_string(ind+1) + ".re";
DefineOutput(temp, 2*ind);
- temp = "out" + to_string(ind+1) + ".im";
+ temp = "out" + std::to_string(ind+1) + ".im";
DefineOutput(temp, 2*ind+1);
}
}
@@ -4167,13 +4167,13 @@ DSP::u::Amplifier::Amplifier(DSP::Float alfa, unsigned int NoOfInputs_in, bool A
}
for (ind=0; ind<NoOfInputs_in; ind++)
{
- temp = "in" + to_string(ind+1);
+ temp = "in" + std::to_string(ind+1);
DefineInput(temp, ind);
- temp = "in" + to_string(ind+1) + ".re";
+ temp = "in" + std::to_string(ind+1) + ".re";
DefineInput(temp, ind);
- temp = "out" + to_string(ind+1);
+ temp = "out" + std::to_string(ind+1);
DefineOutput(temp, ind);
- temp = "out" + to_string(ind+1) + ".re";
+ temp = "out" + std::to_string(ind+1) + ".re";
DefineOutput(temp, ind);
}
}
@@ -4201,9 +4201,9 @@ DSP::u::Amplifier::Amplifier(DSP::Float alfa, unsigned int NoOfInputs_in, bool A
DSP::u::Amplifier::Amplifier(DSP::Complex alfa, unsigned int NoOfInputs_in, bool AreInputsComplex)
: DSP::Block()
{
- vector <unsigned int> indexes;
+ std::vector <unsigned int> indexes;
//unsigned int ind;
- string temp;
+ std::string temp;
SetName("Amplifier", false);
@@ -4220,16 +4220,16 @@ DSP::u::Amplifier::Amplifier(DSP::Float alfa, unsigned int NoOfInputs_in, bool A
DefineOutput("out.im", 1);
for (ind=0; ind<NoOfInputs_in; ind++)
{
- temp = "in" + to_string(ind+1);
+ temp = "in" + std::to_string(ind+1);
DefineInput(temp, ind);
- temp = "in" + to_string(ind+1) + ".re";
+ temp = "in" + std::to_string(ind+1) + ".re";
DefineInput(temp, ind);
- temp = "out" + to_string(ind+1);
+ temp = "out" + std::to_string(ind+1);
DefineOutput(temp, 2*ind, 2*ind+1);
- temp = "out" + to_string(ind+1) + ".re";
+ temp = "out" + std::to_string(ind+1) + ".re";
DefineOutput(temp, 2*ind);
- temp = "out" + to_string(ind+1) + ".im";
+ temp = "out" + std::to_string(ind+1) + ".im";
DefineOutput(temp, 2*ind+1);
}
}
@@ -4246,18 +4246,18 @@ DSP::u::Amplifier::Amplifier(DSP::Float alfa, unsigned int NoOfInputs_in, bool A
DefineOutput("out.im", 1);
for (ind=0; ind<NoOfInputs_in; ind++)
{
- temp = "in" + to_string(ind+1);
+ temp = "in" + std::to_string(ind+1);
DefineInput(temp, 2*ind, 2*ind+1);
- temp = "in" + to_string(ind+1) + ".re";
+ temp = "in" + std::to_string(ind+1) + ".re";
DefineInput(temp, 2*ind);
- temp = "in" + to_string(ind+1) + ".im";
+ temp = "in" + std::to_string(ind+1) + ".im";
DefineInput(temp, 2*ind+1);
- temp = "out" + to_string(ind+1);
+ temp = "out" + std::to_string(ind+1);
DefineOutput(temp, 2*ind, 2*ind+1);
- temp = "out" + to_string(ind+1) + ".re";
+ temp = "out" + std::to_string(ind+1) + ".re";
DefineOutput(temp, 2*ind);
- temp = "out" + to_string(ind+1) + ".im";
+ temp = "out" + std::to_string(ind+1) + ".im";
DefineOutput(temp, 2*ind+1);
}
}
@@ -4314,7 +4314,7 @@ void DSP::u::Amplifier::SetGain(DSP::Complex gain)
else
{
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::u::Amplifier::SetGain" << DSP::e::LogMode::second << "Attemt to set complex gain factor for block with real gain factor" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::Amplifier::SetGain" << DSP::e::LogMode::second << "Attemt to set complex gain factor for block with real gain factor" << std::endl;
#endif
Coeficient=gain.re;
}
@@ -4474,7 +4474,7 @@ DSP::u::Power::Power(bool IsComplex, int factor)
{
factor = 0;
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::u::Power::Power(true,int)" << DSP::e::LogMode::second << "negative power factor not allowed" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::Power::Power(true,int)" << DSP::e::LogMode::second << "negative power factor not allowed" << std::endl;
#endif
}
@@ -4548,7 +4548,7 @@ DSP::u::Power::Power(bool IsComplex, DSP::Float factor)
ClockGroups.AddOutputs2Group("all", 0, NoOfOutputs-1);
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::u::Power::Power(true,DSP::Float)" << DSP::e::LogMode::second << "real power factor for complex input is not allowed" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::Power::Power(true,DSP::Float)" << DSP::e::LogMode::second << "real power factor for complex input is not allowed" << std::endl;
#endif
IntFactor = (int)factor;
@@ -4656,7 +4656,7 @@ void DSP::u::Power::InputExecute_PowerReal_real(INPUT_EXECUTE_ARGS)
// splits one input to several outputs
DSP::u::Splitter::Splitter(unsigned int No) : DSP::Block()
{
- string temp;
+ std::string temp;
unsigned int ind;
SetName("Splitter", false);
@@ -4665,9 +4665,9 @@ DSP::u::Splitter::Splitter(unsigned int No) : DSP::Block()
SetNoOfInputs(1,false);
for (ind=0; ind<No; ind++)
{
- temp = "out" + to_string(ind+1);
+ temp = "out" + std::to_string(ind+1);
DefineOutput(temp, ind);
- temp = "out" + to_string(ind+1) + ".re";
+ temp = "out" + std::to_string(ind+1) + ".re";
DefineOutput(temp, ind);
}
DefineInput("in", 0);
@@ -4683,7 +4683,7 @@ DSP::u::Splitter::Splitter(bool IsInputComplex, unsigned int No)
: DSP::Block()
{
unsigned int ind;
- string temp;
+ std::string temp;
SetName("Splitter", false);
@@ -4693,11 +4693,11 @@ DSP::u::Splitter::Splitter(bool IsInputComplex, unsigned int No)
SetNoOfInputs(2,false);
for (ind=0; ind<No; ind++)
{
- temp = "out" + to_string(ind+1);
+ temp = "out" + std::to_string(ind+1);
DefineOutput(temp, 2*ind, 2*ind+1);
- temp = "out" + to_string(ind+1) + ".re";
+ temp = "out" + std::to_string(ind+1) + ".re";
DefineOutput(temp, 2*ind);
- temp = "out" + to_string(ind+1) + ".im";
+ temp = "out" + std::to_string(ind+1) + ".im";
DefineOutput(temp, 2*ind+1);
}
DefineInput("in.re", 0);
@@ -4710,9 +4710,9 @@ DSP::u::Splitter::Splitter(bool IsInputComplex, unsigned int No)
SetNoOfInputs(1,false);
for (ind=0; ind<No; ind++)
{
- temp = "out" + to_string(ind+1);
+ temp = "out" + std::to_string(ind+1);
DefineOutput(temp, ind);
- temp = "out" + to_string(ind+1) + ".re";
+ temp = "out" + std::to_string(ind+1) + ".re";
DefineOutput(temp, ind);
}
DefineInput("in.re", 0);
@@ -4774,7 +4774,7 @@ void DSP::u::Switch::Init(bool IsInputComplex,
unsigned int InputsNo, unsigned int OutputsNo)
{
unsigned int ind;
- string temp;
+ std::string temp;
SetName("Switch", false);
@@ -4835,16 +4835,16 @@ void DSP::u::Switch::Init(bool IsInputComplex,
{
for (ind=0; ind<InputsNo; ind++)
{
- temp = "in" + to_string(ind+1);
+ temp = "in" + std::to_string(ind+1);
DefineOutput(temp, ind);
- temp = "in" + to_string(ind+1) + ".re";
+ temp = "in" + std::to_string(ind+1) + ".re";
DefineOutput(temp, ind);
}
for (ind=0; ind<OutputsNo; ind++)
{
- temp = "out" + to_string(ind+1);
+ temp = "out" + std::to_string(ind+1);
DefineOutput(temp, ind);
- temp = "out" + to_string(ind+1) + ".re";
+ temp = "out" + std::to_string(ind+1) + ".re";
DefineOutput(temp, ind);
}
}
@@ -4852,20 +4852,20 @@ void DSP::u::Switch::Init(bool IsInputComplex,
{
for (ind=0; ind<InputsNo; ind++)
{
- temp = "in" + to_string(ind+1);
+ temp = "in" + std::to_string(ind+1);
DefineOutput(temp, 2*ind, 2*ind+1);
- temp = "in" + to_string(ind+1) + ".re";
+ temp = "in" + std::to_string(ind+1) + ".re";
DefineOutput(temp, 2*ind);
- temp = "in" + to_string(ind+1) + ".im";
+ temp = "in" + std::to_string(ind+1) + ".im";
DefineOutput(temp, 2*ind+1);
}
for (ind=0; ind<OutputsNo; ind++)
{
- temp = "out" + to_string(ind+1);
+ temp = "out" + std::to_string(ind+1);
DefineOutput(temp, 2*ind, 2*ind+1);
- temp = "out" + to_string(ind+1) + ".re";
+ temp = "out" + std::to_string(ind+1) + ".re";
DefineOutput(temp, 2*ind);
- temp = "out" + to_string(ind+1) + ".im";
+ temp = "out" + std::to_string(ind+1) + ".im";
DefineOutput(temp, 2*ind+1);
}
}
@@ -4968,8 +4968,8 @@ DSP::u::RawDecimator::RawDecimator(DSP::Clock_ptr ParentClock,
: DSP::Block(), DSP::Source()
{
unsigned int ind;
- vector <unsigned int> inds;
- string temp;
+ std::vector <unsigned int> inds;
+ std::string temp;
SetName("Raw decimator", false);
@@ -4980,9 +4980,9 @@ DSP::u::RawDecimator::RawDecimator(DSP::Clock_ptr ParentClock,
inds.resize(InputsNo);
for (ind=0; ind<InputsNo; ind++)
{
- temp = "in" + to_string(ind+1);
+ temp = "in" + std::to_string(ind+1);
DefineInput(temp, ind);
- temp = "out" + to_string(ind+1);
+ temp = "out" + std::to_string(ind+1);
DefineOutput(temp, ind);
inds[ind]=ind;
}
@@ -5007,7 +5007,7 @@ DSP::u::RawDecimator::RawDecimator(DSP::Clock_ptr ParentClock,
}
else
{
- DSP::log << DSP::e::LogMode::Error << "DSP::u::RawDecimator" << DSP::e::LogMode::second << "Undefined ParentClock" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::RawDecimator" << DSP::e::LogMode::second << "Undefined ParentClock" << std::endl;
return;
}
@@ -5132,7 +5132,7 @@ void DSP::u::Zeroinserter::Init(bool IsInputComplex, DSP::Clock_ptr ParentClock,
else
{
// OutputClocks[0]=DSP::Clock::GetClock(L, 1);
- DSP::log << DSP::e::LogMode::Error << "DSP::u::Zeroinserter" << DSP::e::LogMode::second << "Undefined ParentClock" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::Zeroinserter" << DSP::e::LogMode::second << "Undefined ParentClock" << std::endl;
return;
}
@@ -5363,9 +5363,9 @@ DSP::u::Const::Const(DSP::Clock_ptr ParentClock,
unsigned int NoOfOutputs_in, DSP::Float_ptr values)
: DSP::Source()
{
- string tekst;
+ std::string tekst;
unsigned int ind;
- vector <unsigned int> temp_int;
+ std::vector <unsigned int> temp_int;
SetName("Const", false);
@@ -5373,9 +5373,9 @@ DSP::u::Const::Const(DSP::Clock_ptr ParentClock,
temp_int.resize(NoOfOutputs_in);
for (ind = 0; ind < NoOfOutputs_in; ind++)
{
- tekst = "out" + to_string(ind+1);
+ tekst = "out" + std::to_string(ind+1);
DefineOutput(tekst, ind);
- tekst = "out" + to_string(ind+1) + ".re";
+ tekst = "out" + std::to_string(ind+1) + ".re";
DefineOutput(tekst, ind);
temp_int[ind] = ind;
@@ -5399,9 +5399,9 @@ DSP::u::Const::Const(DSP::Clock_ptr ParentClock,
unsigned int NoOfOutputs_in, DSP::Complex_ptr values)
: DSP::Source()
{
- string tekst;
+ std::string tekst;
unsigned int ind;
- vector <unsigned int> temp_int;
+ std::vector <unsigned int> temp_int;
SetName("Const", false);
@@ -5409,11 +5409,11 @@ DSP::u::Const::Const(DSP::Clock_ptr ParentClock,
temp_int.resize(2*NoOfOutputs_in);
for (ind = 0; ind < NoOfOutputs_in; ind++)
{
- tekst = "out" + to_string(ind+1);
+ tekst = "out" + std::to_string(ind+1);
DefineOutput(tekst, 2*ind, 2*ind+1);
- tekst = "out" + to_string(ind+1) + ".re";
+ tekst = "out" + std::to_string(ind+1) + ".re";
DefineOutput(tekst, 2*ind);
- tekst = "out" + to_string(ind+1) + ".im";
+ tekst = "out" + std::to_string(ind+1) + ".im";
DefineOutput(tekst, 2*ind+1);
temp_int[ind] = ind;
@@ -6078,7 +6078,7 @@ void DSP::u::FIR::Init(bool IsInputComplex, bool AreCoeficientsComplex,
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::u::FIR::Init" << DSP::e::LogMode::second
- << "n0 (=" << n0 << ") must be in range <0, N_in-1>" << endl;
+ << "n0 (=" << n0 << ") must be in range <0, N_in-1>" << std::endl;
#endif
n0 = 0;
}
@@ -6086,7 +6086,7 @@ void DSP::u::FIR::Init(bool IsInputComplex, bool AreCoeficientsComplex,
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::u::FIR::Init" << DSP::e::LogMode::second
- << "M (=" << M << ") must be in range > 0" << endl;
+ << "M (=" << M << ") must be in range > 0" << std::endl;
#endif
M = 1;
}
@@ -6110,7 +6110,7 @@ void DSP::u::FIR::Init(bool IsInputComplex, bool AreCoeficientsComplex,
{
L_step = 1;
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::u::FIR::Init" << DSP::e::LogMode::second << "L must be >= 1" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::FIR::Init" << DSP::e::LogMode::second << "L must be >= 1" << std::endl;
#endif
}
@@ -6209,7 +6209,7 @@ void DSP::u::FIR::Init(bool IsInputComplex, bool AreCoeficientsComplex,
else
{
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::u::FIR:Init" << DSP::e::LogMode::second << "unsupported shaping filter mode" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::FIR:Init" << DSP::e::LogMode::second << "unsupported shaping filter mode" << std::endl;
#endif
}
}
@@ -6877,7 +6877,7 @@ bool DSP::u::IIR::SetCoefs(DSP::Float_vector &a_in,
if (required_FilterOrder > FilterOrder)
{
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::u::IIR::SetCoefs<DSP::Float_vector>" << DSP::e::LogMode::second << "Too many coefficients for current filter order" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::IIR::SetCoefs<DSP::Float_vector>" << DSP::e::LogMode::second << "Too many coefficients for current filter order" << std::endl;
#endif
return false;
}
@@ -6923,7 +6923,7 @@ bool DSP::u::IIR::SetCoefs(DSP::Complex_vector &a_in,
if (required_FilterOrder > FilterOrder)
{
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::u::IIR::SetCoefs<DSP::Complex_vector>" << DSP::e::LogMode::second << "Too many coefficients for current filter order" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::IIR::SetCoefs<DSP::Complex_vector>" << DSP::e::LogMode::second << "Too many coefficients for current filter order" << std::endl;
#endif
return false;
}
@@ -7674,7 +7674,7 @@ void DSP::u::DDScos::SetAngularFrequency(DSP::Float omega)
}
#ifdef __DEBUG__
else
- DSP::log << "DSP::u::DDScos::SetAngularFrequency" << DSP::e::LogMode::second << "Cannot change frequency - associated with input" << endl;
+ DSP::log << "DSP::u::DDScos::SetAngularFrequency" << DSP::e::LogMode::second << "Cannot change frequency - associated with input" << std::endl;
#endif
}
@@ -7687,7 +7687,7 @@ void DSP::u::DDScos::SetAmplitude(DSP::Float amplitude)
}
#ifdef __DEBUG__
else
- DSP::log << "DSP::u::DDScos::SetAmplitude" << DSP::e::LogMode::second << "Cannot change amplitude - associated with input" << endl;
+ DSP::log << "DSP::u::DDScos::SetAmplitude" << DSP::e::LogMode::second << "Cannot change amplitude - associated with input" << std::endl;
#endif
}
@@ -7819,7 +7819,7 @@ void DSP::u::SamplingRateConversion::Init(bool IsInputComplex,
else
{
// OutputClocks[0]=DSP::Clock::GetClock(L, M);
- DSP::log << DSP::e::LogMode::Error << "DSP::u::SamplingRateConversion" << DSP::e::LogMode::second << "Undefined ParentClock" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::SamplingRateConversion" << DSP::e::LogMode::second << "Undefined ParentClock" << std::endl;
return;
}
@@ -7891,7 +7891,7 @@ void DSP::u::SamplingRateConversion::Init(bool IsInputComplex,
else
{
// OutputClocks[0]=DSP::Clock::GetClock(L, M);
- DSP::log << DSP::e::LogMode::Error << "DSP::u::SamplingRateConversion" << DSP::e::LogMode::second << "Undefined ParentClock" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::SamplingRateConversion" << DSP::e::LogMode::second << "Undefined ParentClock" << std::endl;
return;
}
@@ -8345,7 +8345,7 @@ void DSP::u::Angle::InputExecute(INPUT_EXECUTE_ARGS)
DSP::u::Maximum::Maximum(unsigned int NumberOfInputs)
: DSP::Block()
{
- string temp;
+ std::string temp;
unsigned int ind;
SetName("Maximum", false);
@@ -8353,7 +8353,7 @@ DSP::u::Maximum::Maximum(unsigned int NumberOfInputs)
SetNoOfInputs(NumberOfInputs, false);
for (ind=0; ind<NumberOfInputs; ind++)
{
- temp = "in" + to_string(ind+1);
+ temp = "in" + std::to_string(ind+1);
DefineInput(temp, ind);
}
@@ -8434,7 +8434,7 @@ void DSP::u::Selector::Init(bool AreInputsComplex,
unsigned int NumberOfInputs, int IndexOffset)
{
unsigned int ind;
- string temp;
+ std::string temp;
if (AreInputsComplex==true)
{
@@ -8442,11 +8442,11 @@ void DSP::u::Selector::Init(bool AreInputsComplex,
DefineInput("ind", 0);
for (ind=0; ind<NumberOfInputs; ind++)
{
- temp = "in" + to_string(1+ind);
+ temp = "in" + std::to_string(1+ind);
DefineInput(temp, 1+2*ind, 2+2*ind);
- temp = "in" + to_string(1+ind) + ".re";
+ temp = "in" + std::to_string(1+ind) + ".re";
DefineInput(temp, 1+2*ind);
- temp = "in" + to_string(1+ind) + ".im";
+ temp = "in" + std::to_string(1+ind) + ".im";
DefineInput(temp, 2+2*ind);
}
SetNoOfOutputs(2);
@@ -8460,9 +8460,9 @@ void DSP::u::Selector::Init(bool AreInputsComplex,
DefineInput("ind", 0);
for (ind=0; ind<NumberOfInputs; ind++)
{
- temp = "in" + to_string(1+ind);
+ temp = "in" + std::to_string(1+ind);
DefineInput(temp, 1+ind);
- temp = "in" + to_string(1+ind) + ".re";
+ temp = "in" + std::to_string(1+ind) + ".re";
DefineInput(temp, 1+ind);
}
SetNoOfOutputs(1);
@@ -8732,8 +8732,8 @@ DSP::u::MyFunction::MyFunction(unsigned int NumberOfInputs, unsigned int NumberO
: DSP::Block()
{
unsigned int ind;
- string temp;
- vector <unsigned int> indexes;
+ std::string temp;
+ std::vector <unsigned int> indexes;
SetName("MyFunction", false);
@@ -8746,7 +8746,7 @@ DSP::u::MyFunction::MyFunction(unsigned int NumberOfInputs, unsigned int NumberO
indexes.resize(NoOfInputs);
for (ind=0; ind<NoOfInputs; ind++)
{
- temp = "in" + to_string(1+ind);
+ temp = "in" + std::to_string(1+ind);
DefineInput(temp, ind);
indexes[ind] = ind;
}
@@ -8757,7 +8757,7 @@ DSP::u::MyFunction::MyFunction(unsigned int NumberOfInputs, unsigned int NumberO
indexes.resize(NoOfOutputs);
for (ind=0; ind<NoOfOutputs; ind++)
{
- temp = "out" + to_string(1+ind);
+ temp = "out" + std::to_string(1+ind);
DefineOutput(temp, ind);
indexes[ind] = ind;
}
@@ -8866,8 +8866,8 @@ void DSP::u::SampleSelector::Init(DSP::Clock_ptr ParentClock,
unsigned int NumberOfInputs)
{
unsigned int ind;
- vector <unsigned int> indexes;
- string temp;
+ std::vector <unsigned int> indexes;
+ std::string temp;
SetName("SampleSelector", false);
@@ -8897,9 +8897,9 @@ void DSP::u::SampleSelector::Init(DSP::Clock_ptr ParentClock,
indexes.resize(NoOfOutputs);
for (ind=0; ind<NoOfOutputs; ind++)
{
- temp = "in" + to_string(ind+1);
+ temp = "in" + std::to_string(ind+1);
DefineInput(temp, ind);
- temp = "out" + to_string(ind+1);
+ temp = "out" + std::to_string(ind+1);
DefineOutput(temp, ind);
indexes[ind] = ind;
@@ -8930,10 +8930,10 @@ void DSP::u::SampleSelector::Init(DSP::Clock_ptr ParentClock,
else
{
if (ActivateOutputClock == false)
- DSP::log << "DSP::u::SampleSelector" << DSP::e::LogMode::second << "Warning: undefined OutputClock" << endl;
+ DSP::log << "DSP::u::SampleSelector" << DSP::e::LogMode::second << "Warning: undefined OutputClock" << std::endl;
else
{
- DSP::log << DSP::e::LogMode::Error << "DSP::u::SampleSelector" << DSP::e::LogMode::second << "undefined OutputClock" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::SampleSelector" << DSP::e::LogMode::second << "undefined OutputClock" << std::endl;
return;
}
}
@@ -8955,7 +8955,7 @@ void DSP::u::SampleSelector::Init(DSP::Clock_ptr ParentClock,
#ifdef __DEBUG__
if (ParentClock == NULL)
{
- DSP::log << DSP::e::LogMode::Error << "DSP::u::SampleSelector" << DSP::e::LogMode::second << "undefined ParentClock" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::SampleSelector" << DSP::e::LogMode::second << "undefined ParentClock" << std::endl;
return;
}
#endif
@@ -8971,13 +8971,13 @@ void DSP::u::SampleSelector::Init(DSP::Clock_ptr ParentClock,
if (ParentClock == NULL)
{
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::u::SampleSelector" << DSP::e::LogMode::second << "undefined ParentClock" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::SampleSelector" << DSP::e::LogMode::second << "undefined ParentClock" << std::endl;
#endif
return;
}
#ifdef __DEBUG__
if (ParentClock->GetMasterClockIndex() == OutputClock->GetMasterClockIndex())
- DSP::log << "DSP::u::SampleSelector" << DSP::e::LogMode::second << "ParentClock and OutputClock have the same MasterClock" << endl;
+ DSP::log << "DSP::u::SampleSelector" << DSP::e::LogMode::second << "ParentClock and OutputClock have the same MasterClock" << std::endl;
#endif
MasterClockIndex = ParentClock->GetMasterClockIndex();
SignalActivatedClock = OutputClock;
@@ -9093,8 +9093,8 @@ DSP::u::Hold::Hold(DSP::Clock_ptr InputClock, DSP::Clock_ptr OutputClock,
bool UseZeros, unsigned int NumberOfInputs)
: DSP::Block(), DSP::Source()
{
- vector <unsigned int> indexes;
- string temp;
+ std::vector <unsigned int> indexes;
+ std::string temp;
SetName("Hold", false);
@@ -9110,9 +9110,9 @@ DSP::u::Hold::Hold(DSP::Clock_ptr InputClock, DSP::Clock_ptr OutputClock,
indexes.resize(NumberOfInputs);
for (unsigned int ind=0; ind<NumberOfInputs; ind++)
{
- temp = "in" + to_string(ind+1);
+ temp = "in" + std::to_string(ind+1);
DefineInput(temp, ind);
- temp = "out" + to_string(ind+1);
+ temp = "out" + std::to_string(ind+1);
DefineOutput(temp, ind);
indexes[ind] = ind;
@@ -9136,7 +9136,7 @@ DSP::u::Hold::Hold(DSP::Clock_ptr InputClock, DSP::Clock_ptr OutputClock,
if (InputClock == NULL)
{
- DSP::log << DSP::e::LogMode::Error << "DSP::u::Hold" << DSP::e::LogMode::second << "Undefined InputClock (AutoUpdate not implemented yet)" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::Hold" << DSP::e::LogMode::second << "Undefined InputClock (AutoUpdate not implemented yet)" << std::endl;
return;
}
else
@@ -9144,7 +9144,7 @@ DSP::u::Hold::Hold(DSP::Clock_ptr InputClock, DSP::Clock_ptr OutputClock,
if (InputClock->GetMasterClockIndex() == OutputClock->GetMasterClockIndex())
{
#ifdef __DEBUG__
- DSP::log << "DSP::u::Hold::Hold" << DSP::e::LogMode::second << "WARNING: InputClock and OutputClock have the same MasterClock" << endl;
+ DSP::log << "DSP::u::Hold::Hold" << DSP::e::LogMode::second << "WARNING: InputClock and OutputClock have the same MasterClock" << std::endl;
#endif
RegisterForNotification(InputClock);
}
@@ -9223,7 +9223,7 @@ bool DSP::u::Hold::OutputExecute(OUTPUT_EXECUTE_ARGS)
#ifdef __DEBUG__
if (clock == ((DSP::u::Hold *)source)->InputClocks[0])
{
- DSP::log << "DSP::u::Hold::Execute(DSP::Clock_ptr clock)" << DSP::e::LogMode::second << "WARNING: InputClock expected !!!" << endl;
+ DSP::log << "DSP::u::Hold::Execute(DSP::Clock_ptr clock)" << DSP::e::LogMode::second << "WARNING: InputClock expected !!!" << std::endl;
}
#endif
return true;
@@ -9269,8 +9269,8 @@ DSP::u::Demultiplexer::Demultiplexer(bool IsComplex, unsigned int OutputsNo)
* the output clock for error detection purpose
*/
unsigned int ind;
- vector <unsigned int> indexes;
- string temp;
+ std::vector <unsigned int> indexes;
+ std::string temp;
SetName("Demultiplexer", false);
if (OutputsNo < 2)
@@ -9293,9 +9293,9 @@ DSP::u::Demultiplexer::Demultiplexer(bool IsComplex, unsigned int OutputsNo)
DefineInput("in.re", 0);
for (ind=0; ind<OutputsNo; ind++)
{
- temp = "out" + to_string(ind+1);
+ temp = "out" + std::to_string(ind+1);
DefineOutput(temp, ind);
- temp = "out" + to_string(ind+1) + ".re";
+ temp = "out" + std::to_string(ind+1) + ".re";
DefineOutput(temp, ind);
}
}
@@ -9306,11 +9306,11 @@ DSP::u::Demultiplexer::Demultiplexer(bool IsComplex, unsigned int OutputsNo)
DefineInput("in.im", 1);
for (ind=0; ind<OutputsNo; ind++)
{
- temp = "out" + to_string(ind+1);
+ temp = "out" + std::to_string(ind+1);
DefineOutput(temp, 2*ind, 2*ind+1);
- temp = "out" + to_string(ind+1) + ".re";
+ temp = "out" + std::to_string(ind+1) + ".re";
DefineOutput(temp, 2*ind);
- temp = "out" + to_string(ind+1) + ".im";
+ temp = "out" + std::to_string(ind+1) + ".im";
DefineOutput(temp, 2*ind+1);
}
}
@@ -9399,8 +9399,8 @@ DSP::u::Multiplexer::Multiplexer(DSP::Clock_ptr ParentClock,
: DSP::Block(), DSP::Source()
{
unsigned int ind;
- vector <unsigned int> indexes;
- string temp;
+ std::vector <unsigned int> indexes;
+ std::string temp;
SetName("Multiplexer", false);
@@ -9416,9 +9416,9 @@ DSP::u::Multiplexer::Multiplexer(DSP::Clock_ptr ParentClock,
DefineOutput("out.re", 0);
for (ind=0; ind<InputsNo; ind++)
{
- temp = "in" + to_string(ind+1);
+ temp = "in" + std::to_string(ind+1);
DefineInput(temp, ind);
- temp = "in" + to_string(ind+1) + ".re";
+ temp = "in" + std::to_string(ind+1) + ".re";
DefineInput(temp, ind);
}
}
@@ -9432,11 +9432,11 @@ DSP::u::Multiplexer::Multiplexer(DSP::Clock_ptr ParentClock,
DefineOutput("out.im", 1);
for (ind=0; ind<InputsNo; ind++)
{
- temp = "in" + to_string(ind+1);
+ temp = "in" + std::to_string(ind+1);
DefineInput(temp, 2*ind, 2*ind+1);
- temp = "in" + to_string(ind+1) + ".re";
+ temp = "in" + std::to_string(ind+1) + ".re";
DefineInput(temp, 2*ind);
- temp = "in" + to_string(ind+1) + ".im";
+ temp = "in" + std::to_string(ind+1) + ".im";
DefineInput(temp, 2*ind+1);
}
}
@@ -9462,7 +9462,7 @@ DSP::u::Multiplexer::Multiplexer(DSP::Clock_ptr ParentClock,
else
{
// OutputClocks[0]=DSP::Clock::GetClock(L, 1);
- DSP::log << DSP::e::LogMode::Error << "DSP::u::Multiplexer" << DSP::e::LogMode::second << "Undefined ParentClock" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::Multiplexer" << DSP::e::LogMode::second << "Undefined ParentClock" << std::endl;
return;
}
@@ -9968,7 +9968,7 @@ void DSP::u::CrossSwitch::InputExecute(INPUT_EXECUTE_ARGS)
#ifdef __DEBUG__
default:
DSP::log << DSP::e::LogMode::Error << "DSP::u::CrossSwitch::Execute" << DSP::e::LogMode::second
- << "Unexpected state for block: >" << ((DSP::u::CrossSwitch *)block)->GetName() << "<" << endl;
+ << "Unexpected state for block: >" << ((DSP::u::CrossSwitch *)block)->GetName() << "<" << std::endl;
break;
#endif
}
@@ -9997,7 +9997,7 @@ DSP::u::Differator::Differator(int NoOfInputs_in, bool IsInputComplex)
: DSP::Block()
{
int ind;
- string tekst;
+ std::string tekst;
SetName("Differator", false);
@@ -10012,14 +10012,14 @@ DSP::u::Differator::Differator(int NoOfInputs_in, bool IsInputComplex)
DefineOutput("out.re", 0);
for (ind=0; ind < NoOfInputs_in; ind++)
{
- tekst = "in" + to_string(ind+1);
+ tekst = "in" + std::to_string(ind+1);
DefineInput(tekst, ind);
- tekst = "in" + to_string(ind+1) + ".re";
+ tekst = "in" + std::to_string(ind+1) + ".re";
DefineInput(tekst, ind);
- tekst = "out" + to_string(ind+1);
+ tekst = "out" + std::to_string(ind+1);
DefineOutput(tekst, ind);
- tekst = "out" + to_string(ind+1) + ".re";
+ tekst = "out" + std::to_string(ind+1) + ".re";
DefineOutput(tekst, ind);
}
}
@@ -10036,18 +10036,18 @@ DSP::u::Differator::Differator(int NoOfInputs_in, bool IsInputComplex)
DefineOutput("out.im", 1);
for (ind=0; ind < NoOfInputs_in; ind++)
{
- tekst = "in" + to_string(ind+1);
+ tekst = "in" + std::to_string(ind+1);
DefineInput(tekst, ind*2, ind*2+1);
- tekst = "in" + to_string(ind+1) + ".re";
+ tekst = "in" + std::to_string(ind+1) + ".re";
DefineInput(tekst, ind*2);
- tekst = "in" + to_string(ind+1) + ".im";
+ tekst = "in" + std::to_string(ind+1) + ".im";
DefineInput(tekst, ind*2+1);
- tekst = "out" + to_string(ind+1);
+ tekst = "out" + std::to_string(ind+1);
DefineOutput(tekst, ind*2, ind*2+1);
- tekst = "out" + to_string(ind+1) + ".re";
+ tekst = "out" + std::to_string(ind+1) + ".re";
DefineOutput(tekst, ind*2);
- tekst = "out" + to_string(ind+1) + ".im";
+ tekst = "out" + std::to_string(ind+1) + ".im";
DefineOutput(tekst, ind*2+1);
}
}
@@ -10089,7 +10089,7 @@ void DSP::u::Differator::SetInitialState(const DSP::Float_vector &State_init)
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::u::Differator::SetInitialState" << DSP::e::LogMode::second
- << "ABORDING: length(" << State_init.size() << ") > size of internal state(" << NoOfInputs << ")" << endl;
+ << "ABORDING: length(" << State_init.size() << ") > size of internal state(" << NoOfInputs << ")" << std::endl;
#endif
return;
}
@@ -10097,7 +10097,7 @@ void DSP::u::Differator::SetInitialState(const DSP::Float_vector &State_init)
{
#ifdef __DEBUG__
DSP::log << "DSP::u::Differator::SetInitialState" << DSP::e::LogMode::second
- << "length(" << State_init.size() << ") < size of internal state(" << NoOfInputs << ")" << endl;
+ << "length(" << State_init.size() << ") < size of internal state(" << NoOfInputs << ")" << std::endl;
#endif
}
@@ -10168,7 +10168,7 @@ DSP::u::Accumulator::Accumulator(DSP::Float lambda_in, int NoOfInputs_in, bool I
void DSP::u::Accumulator::Init(int NoOfInputs_in, DSP::Float lambda_in, bool IsInputComplex)
{
int ind;
- string tekst;
+ std::string tekst;
SetName("Accumulator", false);
@@ -10183,14 +10183,14 @@ void DSP::u::Accumulator::Init(int NoOfInputs_in, DSP::Float lambda_in, bool IsI
DefineOutput("out.re", 0);
for (ind=0; ind < NoOfInputs_in; ind++)
{
- tekst = "in" + to_string(ind+1);
+ tekst = "in" + std::to_string(ind+1);
DefineInput(tekst, ind);
- tekst = "in" + to_string(ind+1) + ".re";
+ tekst = "in" + std::to_string(ind+1) + ".re";
DefineInput(tekst, ind);
- tekst = "out" + to_string(ind+1);
+ tekst = "out" + std::to_string(ind+1);
DefineOutput(tekst, ind);
- tekst = "out" + to_string(ind+1) + ".re";
+ tekst = "out" + std::to_string(ind+1) + ".re";
DefineOutput(tekst, ind);
}
}
@@ -10207,18 +10207,18 @@ void DSP::u::Accumulator::Init(int NoOfInputs_in, DSP::Float lambda_in, bool IsI
DefineOutput("out.im", 1);
for (ind=0; ind < NoOfInputs_in; ind++)
{
- tekst = "in" + to_string(ind+1);
+ tekst = "in" + std::to_string(ind+1);
DefineInput(tekst, ind*2, ind*2+1);
- tekst = "in" + to_string(ind+1) + ".re";
+ tekst = "in" + std::to_string(ind+1) + ".re";
DefineInput(tekst, ind*2);
- tekst = "in" + to_string(ind+1) + ".im";
+ tekst = "in" + std::to_string(ind+1) + ".im";
DefineInput(tekst, ind*2+1);
- tekst = "out" + to_string(ind+1);
+ tekst = "out" + std::to_string(ind+1);
DefineOutput(tekst, ind*2, ind*2+1);
- tekst = "out" + to_string(ind+1) + ".re";
+ tekst = "out" + std::to_string(ind+1) + ".re";
DefineOutput(tekst, ind*2);
- tekst = "out" + to_string(ind+1) + ".im";
+ tekst = "out" + std::to_string(ind+1) + ".im";
DefineOutput(tekst, ind*2+1);
}
}
@@ -10261,7 +10261,7 @@ void DSP::u::Accumulator::SetInitialState(const DSP::Float_vector &State_init)
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::u::Accumulator::SetInitialState"<< DSP::e::LogMode::second
- << "ABORTING: length(" << State_init.size() << ") > size of internal state(" << NoOfInputs << ")" << endl;
+ << "ABORTING: length(" << State_init.size() << ") > size of internal state(" << NoOfInputs << ")" << std::endl;
#endif
return;
}
@@ -10269,7 +10269,7 @@ void DSP::u::Accumulator::SetInitialState(const DSP::Float_vector &State_init)
{
#ifdef __DEBUG__
DSP::log << "DSP::u::Accumulator::SetInitialState" << DSP::e::LogMode::second
- << "length(" << State_init.size() << ") < size of internal state(" << NoOfInputs << ")" << endl;
+ << "length(" << State_init.size() << ") < size of internal state(" << NoOfInputs << ")" << std::endl;
#endif
}
@@ -10337,17 +10337,17 @@ DSP::u::ClockTrigger::ClockTrigger(DSP::Clock_ptr ParentClock, DSP::Clock_ptr Si
#ifdef __DEBUG__
if (ParentClock == NULL)
{
- DSP::log << DSP::e::LogMode::Error << "DSP::u::ClockTrigger::ClockTrigger" << DSP::e::LogMode::second << "ParentClock is NULL" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::ClockTrigger::ClockTrigger" << DSP::e::LogMode::second << "ParentClock is NULL" << std::endl;
return;
}
if (SignalActivatedClock_in == NULL)
{
- DSP::log << DSP::e::LogMode::Error << "DSP::u::ClockTrigger::ClockTrigger" << DSP::e::LogMode::second << "SignalActivatedClock is NULL" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::ClockTrigger::ClockTrigger" << DSP::e::LogMode::second << "SignalActivatedClock is NULL" << std::endl;
return;
}
if (NoOfCycles_in <= 0)
{
- DSP::log << "DSP::u::ClockTrigger::ClockTrigger" << DSP::e::LogMode::second << "NoOfCycles <= 0 - \"act\" signal determines number of cycles of activated clock" << endl;
+ DSP::log << "DSP::u::ClockTrigger::ClockTrigger" << DSP::e::LogMode::second << "NoOfCycles <= 0 - \"act\" signal determines number of cycles of activated clock" << std::endl;
}
#endif
MasterClockIndex = ParentClock->GetMasterClockIndex();
@@ -10376,7 +10376,7 @@ void DSP::u::ClockTrigger::InputExecute(INPUT_EXECUTE_ARGS)
#ifdef __DEBUG__
if (THIS->InputClocks[0]->GetMasterClockIndex() != THIS->MasterClockIndex)
{
- DSP::log << DSP::e::LogMode::Error << "DSP::u::ClockTrigger::Execute" << DSP::e::LogMode::second << "Declared MasterClock and actual MasterClock are different" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::ClockTrigger::Execute" << DSP::e::LogMode::second << "Declared MasterClock and actual MasterClock are different" << std::endl;
}
#endif
DSP::Clock::AddSignalActivatedClock(
@@ -10397,7 +10397,7 @@ void DSP::u::ClockTrigger::InputExecute_multivalue(INPUT_EXECUTE_ARGS)
#ifdef __DEBUG__
if (THIS->InputClocks[0]->GetMasterClockIndex() != THIS->MasterClockIndex)
{
- DSP::log << DSP::e::LogMode::Error << "DSP::u::ClockTrigger::Execute" << DSP::e::LogMode::second << "Declared MasterClock and actual MasterClock are different" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::ClockTrigger::Execute" << DSP::e::LogMode::second << "Declared MasterClock and actual MasterClock are different" << std::endl;
}
#endif
DSP::Clock::AddSignalActivatedClock(
@@ -10446,7 +10446,7 @@ void DSP::Component::ListComponents(void)
#ifdef __DEBUG__
for (int ind = 0; ind < NoOfComponentsInTable; ind++)
{
- DSP::log << ComponentsTable[ind]->GetName() << endl;
+ DSP::log << ComponentsTable[ind]->GetName() << std::endl;
}
#endif
}
@@ -10476,7 +10476,7 @@ void DSP::Component::ListComponents(DSP::Clock_ptr InputClock)
if (ComponentsTable[ind]->Convert2Block()->IsConstantInput[ind2] == false)
{
if (ComponentsTable[ind]->Convert2Block()->InputClocks[ind2] == InputClock)
- DSP::log << " >>block" << DSP::e::LogMode::second << ComponentsTable[ind]->GetName() << endl;
+ DSP::log << " >>block" << DSP::e::LogMode::second << ComponentsTable[ind]->GetName() << std::endl;
break;
}
}
@@ -10485,7 +10485,7 @@ void DSP::Component::ListComponents(DSP::Clock_ptr InputClock)
{
//! \bug problem if inputs work with different clocks
if (ComponentsTable[ind]->Convert2Block()->InputClocks[0] == InputClock)
- DSP::log << " >>block" << DSP::e::LogMode::second << ComponentsTable[ind]->GetName() << endl;
+ DSP::log << " >>block" << DSP::e::LogMode::second << ComponentsTable[ind]->GetName() << std::endl;
}
}
}
@@ -10499,9 +10499,9 @@ void DSP::Component::ListOfAllComponents(bool list_outputs)
#ifdef __DEBUG__
DSP::Block_ptr temp;
- string tekst;
+ std::string tekst;
- DSP::log << " Number of components" << DSP::e::LogMode::second << (NoOfComponentsInTable - 1) << endl;
+ DSP::log << " Number of components" << DSP::e::LogMode::second << (NoOfComponentsInTable - 1) << std::endl;
for (int ind = 0; ind < NoOfComponentsInTable; ind++)
{
@@ -10512,24 +10512,24 @@ void DSP::Component::ListOfAllComponents(bool list_outputs)
{
if (temp->IsAutoSplit == true)
{
- DSP::log << setw(3) << ind << ": >>auto(inputs=" << temp->NoOfInputs << ",outputs=" << temp->NoOfOutputs << ")"
- << DSP::e::LogMode::second << temp->GetName() << endl;
+ DSP::log << std::setw(3) << ind << ": >>auto(inputs=" << temp->NoOfInputs << ",outputs=" << temp->NoOfOutputs << ")"
+ << DSP::e::LogMode::second << temp->GetName() << std::endl;
}
else
{
if (temp->Convert2Copy() != NULL)
{
- DSP::log << setw(3) << ind << ": >>copy(inputs=" << temp->NoOfInputs << ",outputs=" << temp->NoOfOutputs << ")"
- << DSP::e::LogMode::second << temp->GetName() << endl;
+ DSP::log << std::setw(3) << ind << ": >>copy(inputs=" << temp->NoOfInputs << ",outputs=" << temp->NoOfOutputs << ")"
+ << DSP::e::LogMode::second << temp->GetName() << std::endl;
}
else
{
- DSP::log << setw(3) << ind << ": >>block(inputs=" << temp->NoOfInputs << ",outputs=" << temp->NoOfOutputs << ")"
- << DSP::e::LogMode::second << temp->GetName() << endl;
+ DSP::log << std::setw(3) << ind << ": >>block(inputs=" << temp->NoOfInputs << ",outputs=" << temp->NoOfOutputs << ")"
+ << DSP::e::LogMode::second << temp->GetName() << std::endl;
}
}
{
- stringstream ss;
+ std::stringstream ss;
if (temp->InputClocks[0] == NULL)
{
ss << "<" << static_cast<void*>(ComponentsTable[ind]) << "> = " << static_cast<void*>(temp->InputClocks[0])
@@ -10540,7 +10540,7 @@ void DSP::Component::ListOfAllComponents(bool list_outputs)
ss << "<" << static_cast<void*>(ComponentsTable[ind]) << "> = " << static_cast<void*>(temp->InputClocks[0])
<< "; Master Clock index = " << (int)(temp->InputClocks[0]->GetMasterClockIndex());
}
- DSP::log << " InputClocks[0]" << DSP::e::LogMode::second << ss.str() << endl;
+ DSP::log << " InputClocks[0]" << DSP::e::LogMode::second << ss.str() << std::endl;
}
}
}
@@ -10548,11 +10548,11 @@ void DSP::Component::ListOfAllComponents(bool list_outputs)
if (ComponentsTable[ind]->Convert2Block() == NULL)
{
{
- DSP::log << setw(3) << ind << ": >>source(outputs=" << ComponentsTable[ind]->Convert2Source()->NoOfOutputs << ")"
- << DSP::e::LogMode::second << ComponentsTable[ind]->GetName() << endl;
+ DSP::log << std::setw(3) << ind << ": >>source(outputs=" << ComponentsTable[ind]->Convert2Source()->NoOfOutputs << ")"
+ << DSP::e::LogMode::second << ComponentsTable[ind]->GetName() << std::endl;
}
{
- stringstream ss;
+ std::stringstream ss;
if (ComponentsTable[ind]->Convert2Source()->OutputClocks[0] == NULL)
{
ss << " = " << static_cast<void*>(ComponentsTable[ind]->Convert2Source()->OutputClocks[0])
@@ -10563,7 +10563,7 @@ void DSP::Component::ListOfAllComponents(bool list_outputs)
ss << " = " << static_cast<void*>(ComponentsTable[ind]->Convert2Source()->OutputClocks[0])
<< "; Master Clock index = " << (int)(ComponentsTable[ind]->Convert2Source()->OutputClocks[0]->GetMasterClockIndex());
}
- DSP::log << " OutputClocks[0]" << DSP::e::LogMode::second << ss.str() << endl;
+ DSP::log << " OutputClocks[0]" << DSP::e::LogMode::second << ss.str() << std::endl;
}
}
else
@@ -10571,29 +10571,29 @@ void DSP::Component::ListOfAllComponents(bool list_outputs)
{
temp = ComponentsTable[ind]->Convert2Block();
- DSP::log << setw(3) << ind << ": >>mixed(inputs=" << temp->NoOfInputs << ",outputs=" << temp->NoOfOutputs << ")"
- << DSP::e::LogMode::second << temp->GetName() << endl;
+ DSP::log << std::setw(3) << ind << ": >>mixed(inputs=" << temp->NoOfInputs << ",outputs=" << temp->NoOfOutputs << ")"
+ << DSP::e::LogMode::second << temp->GetName() << std::endl;
}
if (temp->NoOfInputs > 0)
{
if (temp->InputClocks[0] == NULL)
{
- stringstream ss;
+ std::stringstream ss;
ss << " = " << static_cast<void*>(temp->InputClocks[0])
<< "; Master Clock index = ?";
tekst = ss.str();
}
else
{
- stringstream ss;
+ std::stringstream ss;
ss << " = " << static_cast<void*>(temp->InputClocks[0])
<< "; Master Clock index = " << (int)(temp->InputClocks[0]->GetMasterClockIndex());
tekst = ss.str();
}
- DSP::log << " InputClocks[0]" << DSP::e::LogMode::second << tekst << endl;
+ DSP::log << " InputClocks[0]" << DSP::e::LogMode::second << tekst << std::endl;
}
if (temp->NoOfOutputs > 0) {
- stringstream ss;
+ std::stringstream ss;
if (ComponentsTable[ind]->Convert2Source()->OutputClocks[0] == NULL)
{
ss << "<" << static_cast<void*>(ComponentsTable[ind]) << "> = " << static_cast<void*>(ComponentsTable[ind]->Convert2Source()->OutputClocks[0])
@@ -10604,10 +10604,10 @@ void DSP::Component::ListOfAllComponents(bool list_outputs)
ss << "<" << static_cast<void*>(ComponentsTable[ind]) << "> = " << static_cast<void*>(ComponentsTable[ind]->Convert2Source()->OutputClocks[0])
<< "; Master Clock index = " << (int)((int)(ComponentsTable[ind]->Convert2Source()->OutputClocks[0]->GetMasterClockIndex()));
}
- DSP::log << " OutputClocks[0]" << DSP::e::LogMode::second << ss.str() << endl;
+ DSP::log << " OutputClocks[0]" << DSP::e::LogMode::second << ss.str() << std::endl;
}
else {
- DSP::log << " OutputClocks[0]" << DSP::e::LogMode::second << "undefined (NoOfOutputs == 0)!" << endl;
+ DSP::log << " OutputClocks[0]" << DSP::e::LogMode::second << "undefined (NoOfOutputs == 0)!" << std::endl;
}
}
@@ -10615,15 +10615,15 @@ void DSP::Component::ListOfAllComponents(bool list_outputs)
{
for (unsigned int ind2 = 0; ind2 < ComponentsTable[ind]->NoOfOutputs; ind2++)
{
- DSP::log << "out" << setw(3) << ind2 << " ==> <" << static_cast<void*>(ComponentsTable[ind]->OutputBlocks[ind2])
- << ">[" << setw(3) << ComponentsTable[ind]->OutputBlocks_InputNo[ind2] << "]"
+ DSP::log << "out" << std::setw(3) << ind2 << " ==> <" << static_cast<void*>(ComponentsTable[ind]->OutputBlocks[ind2])
+ << ">[" << std::setw(3) << ComponentsTable[ind]->OutputBlocks_InputNo[ind2] << "]"
<< DSP::e::LogMode::second
- << ComponentsTable[ind]->OutputBlocks[ind2]->GetName() << endl;
+ << ComponentsTable[ind]->OutputBlocks[ind2]->GetName() << std::endl;
}
}
}
if (NoOfComponentsInTable > 1)
- DSP::log << endl;
+ DSP::log << std::endl;
#endif
}
@@ -10636,7 +10636,7 @@ void DSP::Component::CheckInputsOfAllComponents(void)
unsigned int NoOfCopyBlocks;
unsigned int NoOfAutoSplitBlocks;
- DSP::log << "DSP::Component::CheckInputsOfAllComponents" << DSP::e::LogMode::second << "Start" << endl;
+ DSP::log << "DSP::Component::CheckInputsOfAllComponents" << DSP::e::LogMode::second << "Start" << std::endl;
NoOfCopyBlocks = 0; NoOfAutoSplitBlocks = 0;
for (int ind = 0; ind < NoOfComponentsInTable; ind++)
@@ -10653,10 +10653,10 @@ void DSP::Component::CheckInputsOfAllComponents(void)
{
if ((temp->NoOfInputsConnected + temp->InitialNoOfInputsProcessed) != temp->NoOfInputs)
{
- DSP::log << " >>block (" << ComponentsTable[ind]->GetName() << "): NoOfInputsConnected + InitialNoOfInputsProcessed != NoOfInputs" << endl;
- DSP::log << " NoOfInputs = " << temp->NoOfInputs << endl;
- DSP::log << " NoOfInputsConnected = " << temp->NoOfInputsConnected << endl;
- DSP::log << DSP::e::LogMode::Error << " InitialNoOfInputsProcessed = " << temp->InitialNoOfInputsProcessed << endl;
+ DSP::log << " >>block (" << ComponentsTable[ind]->GetName() << "): NoOfInputsConnected + InitialNoOfInputsProcessed != NoOfInputs" << std::endl;
+ DSP::log << " NoOfInputs = " << temp->NoOfInputs << std::endl;
+ DSP::log << " NoOfInputsConnected = " << temp->NoOfInputsConnected << std::endl;
+ DSP::log << DSP::e::LogMode::Error << " InitialNoOfInputsProcessed = " << temp->InitialNoOfInputsProcessed << std::endl;
}
}
@@ -10665,7 +10665,7 @@ void DSP::Component::CheckInputsOfAllComponents(void)
if (IsOutputConnectedToThisInput(temp, ind2, tempBlock, tempNo) == false)
{
DSP::log << DSP::e::LogMode::Error << " Block >>" << temp->GetName() << "<< input "
- << setw(2) << setfill('0') << ind2 << " UNCONNECTED" << endl;
+ << std::setw(2) << std::setfill('0') << ind2 << " UNCONNECTED" << std::endl;
}
else
{
@@ -10674,9 +10674,9 @@ void DSP::Component::CheckInputsOfAllComponents(void)
if ((temp->Convert2Copy() == NULL) && (tempBlock->Convert2Copy() != NULL))
{ // Copy ==> Copy chains are ignored
DSP::log << DSP::e::LogMode::Error << " Block >>" << temp->GetName()
- << "<< input " << setw(2) << setfill('0') << ind2
+ << "<< input " << std::setw(2) << std::setfill('0') << ind2
<< " connected only to DSP::u::Copy >>" << tempBlock->GetName()
- << "<< input " << setw(2) << setfill('0') << tempNo << endl;
+ << "<< input " << std::setw(2) << std::setfill('0') << tempNo << std::endl;
}
}
}
@@ -10688,12 +10688,12 @@ void DSP::Component::CheckInputsOfAllComponents(void)
DSP::log << " Number of checked components" << DSP::e::LogMode::second
<< (NoOfComponentsInTable - 1) << " (" << NoOfCopyBlocks
- << " copy blocks & " << NoOfAutoSplitBlocks << " autosplitters)" << endl;
+ << " copy blocks & " << NoOfAutoSplitBlocks << " autosplitters)" << std::endl;
if (NoOfComponentsInTable > 1)
- DSP::log << endl;
+ DSP::log << std::endl;
- DSP::log << "DSP::Component::CheckInputsOfAllComponents" << DSP::e::LogMode::second << "End" << endl;
+ DSP::log << "DSP::Component::CheckInputsOfAllComponents" << DSP::e::LogMode::second << "End" << std::endl;
#endif
}
@@ -10704,7 +10704,7 @@ void DSP::Component::CheckInputsOfAllComponents(void)
DSP::u::Copy::Copy(unsigned int NoOfInputs_in)
: DSP::Block()
{
- vector <unsigned int> indexes;
+ std::vector <unsigned int> indexes;
unsigned int ind;
SetName("Copy", false);
@@ -10935,7 +10935,7 @@ bool DSP::u::Copy::SetCopyInput(unsigned int InputNo, DSP::Component_ptr block,
#ifdef __DEBUG__
if (current->NoOfInputsConnected > current->NoOfInputs)
- DSP::log << DSP::e::LogMode::Error << "DSP::u::Copy::SetCopyInput" << DSP::e::LogMode::second << "NoOfInputsConnected > NoOfInputs" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::Copy::SetCopyInput" << DSP::e::LogMode::second << "NoOfInputsConnected > NoOfInputs" << std::endl;
#endif
// return true if there is output block connected already
@@ -11018,7 +11018,7 @@ void DSP::MacroStack::RemoveMacroFromStack(DSP::Macro_ptr macro)
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::MacroStack::RemoveMacroFromStack" << DSP::e::LogMode::second
- << "Stack empty. No macro:>>" << macro->GetName() << "<< on the list!" << endl;
+ << "Stack empty. No macro:>>" << macro->GetName() << "<< on the list!" << std::endl;
#endif
return;
}
@@ -11042,15 +11042,15 @@ void DSP::MacroStack::RemoveMacroFromStack(DSP::Macro_ptr macro)
#ifdef __DEBUG__
else
{
- DSP::log << "DSP::MacroStack::RemoveMacroFromStack" << DSP::e::LogMode::second << "Current macro stack:" << endl;
+ DSP::log << "DSP::MacroStack::RemoveMacroFromStack" << DSP::e::LogMode::second << "Current macro stack:" << std::endl;
for (unsigned int ind = 0; ind < Length; ind++)
{
- DSP::log << " >>" << DSP::e::LogMode::second << Stack[ind]->GetName() << endl;
+ DSP::log << " >>" << DSP::e::LogMode::second << Stack[ind]->GetName() << std::endl;
}
- DSP::log << endl;
+ DSP::log << std::endl;
DSP::log << DSP::e::LogMode::Error << "DSP::MacroStack::RemoveMacroFromStack" << DSP::e::LogMode::second
- << "Macro:>>" << macro->GetName() << "<< not found at the bottom of the stack!" << endl;
+ << "Macro:>>" << macro->GetName() << "<< not found at the bottom of the stack!" << std::endl;
}
#endif
}
@@ -11064,7 +11064,7 @@ unsigned int DSP::MacroStack::GetCurrentMacroStack(DSP::Macro_ptr *&MacrosStack)
return Length;
}
-unsigned int DSP::MacroStack::GetCurrentMacroList(vector<DSP::Macro_ptr> &MacrosList)
+unsigned int DSP::MacroStack::GetCurrentMacroList(std::vector<DSP::Macro_ptr> &MacrosList)
{
MacrosList.resize(ListLength);
//! \TODO convert DSP::MacroStack::List into vector and copy vectors instead of using memcpy
@@ -11099,7 +11099,7 @@ void DSP::MacroStack::RemoveMacroFromList(DSP::Macro_ptr macro)
{
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::MacroStack::RemoveMacroFromList" << DSP::e::LogMode::second
- << "List empty. No macro:>>" << macro->GetName() << "<< on the list!" << endl;
+ << "List empty. No macro:>>" << macro->GetName() << "<< on the list!" << std::endl;
#endif
return;
}
@@ -11132,21 +11132,21 @@ void DSP::MacroStack::RemoveMacroFromList(DSP::Macro_ptr macro)
#ifdef __DEBUG__
if (ind >= ListLength)
{
- DSP::log << "DSP::MacroStack::RemoveMacroFromList" << DSP::e::LogMode::second << "Current macro list:" << endl;
+ DSP::log << "DSP::MacroStack::RemoveMacroFromList" << DSP::e::LogMode::second << "Current macro list:" << std::endl;
for (ind = 0; ind < ListLength; ind++)
{
- DSP::log << " >>" << DSP::e::LogMode::second << List[ind]->GetName() << endl;
+ DSP::log << " >>" << DSP::e::LogMode::second << List[ind]->GetName() << std::endl;
}
- DSP::log << endl;
+ DSP::log << std::endl;
DSP::log << DSP::e::LogMode::Error << "DSP::MacroStack::RemoveMacroFromList" << DSP::e::LogMode::second
- << "Macro:>>" << macro->GetName() << "<< not found on the list!" << endl;
+ << "Macro:>>" << macro->GetName() << "<< not found on the list!" << std::endl;
}
#endif
}
-bool DSP::Macro::DefineInput(const string &Name, const unsigned int &InputNo)
+bool DSP::Macro::DefineInput(const std::string &Name, const unsigned int &InputNo)
{
if (MacroInput_block != NULL)
{
@@ -11158,7 +11158,7 @@ bool DSP::Macro::DefineInput(const string &Name, const unsigned int &InputNo)
}
return false;
}
-bool DSP::Macro::DefineInput(const string &Name, const unsigned int &InputNo_re, const unsigned int &InputNo_im)
+bool DSP::Macro::DefineInput(const std::string &Name, const unsigned int &InputNo_re, const unsigned int &InputNo_im)
{
if (MacroInput_block != NULL)
{
@@ -11170,7 +11170,7 @@ bool DSP::Macro::DefineInput(const string &Name, const unsigned int &InputNo_re,
}
return false;
}
-bool DSP::Macro::DefineInput(const string &Name, const vector<unsigned int> &Inputs)
+bool DSP::Macro::DefineInput(const std::string &Name, const std::vector<unsigned int> &Inputs)
{
if (MacroInput_block != NULL)
{
@@ -11182,7 +11182,7 @@ bool DSP::Macro::DefineInput(const string &Name, const vector<unsigned int> &Inp
}
return false;
}
-bool DSP::Macro::UndefineInput(const string &Name)
+bool DSP::Macro::UndefineInput(const std::string &Name)
{
if (MacroInput_block != NULL)
{
@@ -11196,7 +11196,7 @@ bool DSP::Macro::UndefineInput(const string &Name)
}
-bool DSP::Macro::DefineOutput(const string &Name, const unsigned int &OutputNo)
+bool DSP::Macro::DefineOutput(const std::string &Name, const unsigned int &OutputNo)
{
if (MacroOutput_block != NULL)
{
@@ -11208,7 +11208,7 @@ bool DSP::Macro::DefineOutput(const string &Name, const unsigned int &OutputNo)
}
return false;
}
-bool DSP::Macro::DefineOutput(const string &Name, const unsigned int &OutputNo_re, const unsigned int &OutputNo_im)
+bool DSP::Macro::DefineOutput(const std::string &Name, const unsigned int &OutputNo_re, const unsigned int &OutputNo_im)
{
if (MacroOutput_block != NULL)
{
@@ -11220,7 +11220,7 @@ bool DSP::Macro::DefineOutput(const string &Name, const unsigned int &OutputNo_r
}
return false;
}
-bool DSP::Macro::DefineOutput(const string &Name, vector<unsigned int> &Outputs)
+bool DSP::Macro::DefineOutput(const std::string &Name, std::vector<unsigned int> &Outputs)
{
if (MacroOutput_block != NULL)
{
@@ -11232,7 +11232,7 @@ bool DSP::Macro::DefineOutput(const string &Name, vector<unsigned int> &Outputs)
}
return false;
}
-bool DSP::Macro::UndefineOutput(const string &Name)
+bool DSP::Macro::UndefineOutput(const std::string &Name)
{
if (MacroOutput_block != NULL)
{
@@ -11247,23 +11247,23 @@ bool DSP::Macro::UndefineOutput(const string &Name)
// returns internal output of the macro input of the given name
-DSP::output &DSP::Macro::MacroInput(const string &Name)
+DSP::output &DSP::Macro::MacroInput(const std::string &Name)
{
return MacroInput_block->Output(Name);
}
// returns internal input of the macro output of the given name
-DSP::input &DSP::Macro::MacroOutput(const string &Name)
+DSP::input &DSP::Macro::MacroOutput(const std::string &Name)
{
return MacroOutput_block->Input(Name);
}
// returns external macro output of the given name
-DSP::output &DSP::Macro::Output(const string &Name)
+DSP::output &DSP::Macro::Output(const std::string &Name)
{
return MacroOutput_block->Output(Name); // external outputs
}
// returns external macro input of the given name
-DSP::input &DSP::Macro::Input(const string &Name)
+DSP::input &DSP::Macro::Input(const std::string &Name)
{
return MacroInput_block->Input(Name); // external inputs
}
@@ -11284,7 +11284,7 @@ unsigned int DSP::Macro::GetMacroInputNo(DSP::Component_ptr output_block, unsign
if (output_block->Convert2Copy() != NULL)
{
- DSP::log << DSP::e::LogMode::Error << "DSP::Macro::GetMacroInputNo" << DSP::e::LogMode::second << "Encountered unrecognized copy block" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Macro::GetMacroInputNo" << DSP::e::LogMode::second << "Encountered unrecognized copy block" << std::endl;
}
for (ind = 0; ind < NoOfInputs; ind++)
@@ -11329,8 +11329,8 @@ DSP::Clock_ptr DSP::Macro::GetOutputClock(unsigned int OutputNo)
void DSP::Macro::MacroInitStarted(void)
{
- vector <unsigned int> indexes;
- string temp;
+ std::vector <unsigned int> indexes;
+ std::string temp;
DSP::MacroStack::AddMacroToStack(this);
@@ -11356,7 +11356,7 @@ void DSP::Macro::MacroInitStarted(void)
indexes.resize(NoOfInputs);
for (unsigned int ind=0; ind<NoOfInputs; ind++)
{
- temp = "in" + to_string(ind+1);
+ temp = "in" + std::to_string(ind+1);
DefineInput(temp, ind);
indexes[ind] = ind;
@@ -11375,7 +11375,7 @@ void DSP::Macro::MacroInitStarted(void)
indexes.resize(NoOfOutputs);
for (unsigned int ind=0; ind<NoOfOutputs; ind++)
{
- temp = "ou" + to_string(ind+1);
+ temp = "ou" + std::to_string(ind+1);
DefineOutput(temp, ind);
indexes[ind] = ind;
@@ -11397,7 +11397,7 @@ void DSP::Macro::MacroInitFinished(void)
/* Creates MacroInput and MacroOutput objects
* with given input and output lines number.
*/
-DSP::Macro::Macro(const string ¯o_name,
+DSP::Macro::Macro(const std::string ¯o_name,
unsigned int NoOfInputs_in, unsigned int NoOfOutputs_in)
: DSP::name(macro_name)
{
diff --git a/src/cpp/DSP_modules2.cpp b/src/cpp/DSP_modules2.cpp
index 668b9c5..bba270b 100644
--- a/src/cpp/DSP_modules2.cpp
+++ b/src/cpp/DSP_modules2.cpp
@@ -269,21 +269,21 @@ DSP::u::DynamicCompressor::DynamicCompressor(
if (BufferSize_in <= 0)
{
#ifdef __DEBUG__
- DSP::log << "DSP::u::DynamicCompressor::DynamicCompressor" << DSP::e::LogMode::second << "BufferSize_in <= 0" << endl;
+ DSP::log << "DSP::u::DynamicCompressor::DynamicCompressor" << DSP::e::LogMode::second << "BufferSize_in <= 0" << std::endl;
#endif
BufferSize_in = 1;
}
if (OutputDelay_in < -1)
{
#ifdef __DEBUG__
- DSP::log << "DSP::u::DynamicCompressor::DynamicCompressor" << DSP::e::LogMode::second << "OutputDelay_in < -1" << endl;
+ DSP::log << "DSP::u::DynamicCompressor::DynamicCompressor" << DSP::e::LogMode::second << "OutputDelay_in < -1" << std::endl;
#endif
OutputDelay_in = 0;
}
if (OutputDelay_in >= BufferSize_in)
{
#ifdef __DEBUG__
- DSP::log << "DSP::u::DynamicCompressor::DynamicCompressor" << DSP::e::LogMode::second << "OutputDelay_in >= BufferSize_in" << endl;
+ DSP::log << "DSP::u::DynamicCompressor::DynamicCompressor" << DSP::e::LogMode::second << "OutputDelay_in >= BufferSize_in" << std::endl;
#endif
OutputDelay_in = BufferSize_in - 1;
}
@@ -579,7 +579,7 @@ void DSP::u::DynamicCompressor::InputExecute_complex(INPUT_EXECUTE_ARGS)
// OutputExecute_ptr = &OutputExecute;
//}
-DSP::u::Farrow::Farrow(const bool& IsComplex, const vector<DSP::Float_vector>& Farrow_coefs_in,
+DSP::u::Farrow::Farrow(const bool& IsComplex, const std::vector<DSP::Float_vector>& Farrow_coefs_in,
const DSP::Clock_ptr& InputClock, const DSP::Clock_ptr& OutputClock)
: DSP::Block(), DSP::Source()
{
@@ -617,7 +617,7 @@ DSP::u::Farrow::Farrow(const bool& IsComplex, const vector<DSP::Float_vector>& F
if (InputClock == NULL)
{
- DSP::log << DSP::e::LogMode::Error << "DSP::u::Farrow" << DSP::e::LogMode::second << "Undefined InputClock (AutoUpdate not implemented yet)" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::Farrow" << DSP::e::LogMode::second << "Undefined InputClock (AutoUpdate not implemented yet)" << std::endl;
return;
}
else
@@ -756,11 +756,11 @@ bool DSP::u::Farrow::OutputExecute(OUTPUT_EXECUTE_ARGS)
{ // This is InputClock calling ;-)
if (clock == THIS->InputClocks[0])
{
- DSP::log << DSP::e::LogMode::Error << "DSP::u::Farrow::OutputExecute" << DSP::e::LogMode::second << "WARNING: InputClock not expected !!!" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::Farrow::OutputExecute" << DSP::e::LogMode::second << "WARNING: InputClock not expected !!!" << std::endl;
}
else
{
- DSP::log << DSP::e::LogMode::Error << "DSP::u::Farrow::OutputExecute" << DSP::e::LogMode::second << "WARNING: Unexpected clock called !!!" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::Farrow::OutputExecute" << DSP::e::LogMode::second << "WARNING: Unexpected clock called !!!" << std::endl;
}
return true;
}
@@ -930,7 +930,7 @@ void DSP::u::GardnerSampling::Init(
DSP::e::GardnerSamplingOptions options_in)
{
unsigned int ind;
- string tekst;
+ std::string tekst;
SetName("GardnerSampling", false);
@@ -958,11 +958,11 @@ void DSP::u::GardnerSampling::Init(
DefineInput("in.im", 1);
for (ind=0; ind < NoOfChannels; ind++)
{
- tekst = "in" + to_string(ind+1);
+ tekst = "in" + std::to_string(ind+1);
DefineInput(tekst, ind*2, ind*2+1);
- tekst = "in" + to_string(ind+1) + ".re";
+ tekst = "in" + std::to_string(ind+1) + ".re";
DefineInput(tekst, ind*2);
- tekst = "in" + to_string(ind+1) + ".im";
+ tekst = "in" + std::to_string(ind+1) + ".im";
DefineInput(tekst, ind*2+1);
}
@@ -972,11 +972,11 @@ void DSP::u::GardnerSampling::Init(
DefineOutput("out.im", 1);
for (ind=0; ind < NoOfChannels; ind++)
{
- tekst = "out" + to_string(ind+1);
+ tekst = "out" + std::to_string(ind+1);
DefineOutput(tekst, ind*2, ind*2+1);
- tekst = "out" + to_string(ind+1) + ".re";
+ tekst = "out" + std::to_string(ind+1) + ".re";
DefineOutput(tekst, ind*2);
- tekst = "out" + to_string(ind+1) + ".im";
+ tekst = "out" + std::to_string(ind+1) + ".im";
DefineOutput(tekst, ind*2+1);
}
@@ -984,9 +984,9 @@ void DSP::u::GardnerSampling::Init(
// ClockGroups.AddOutput2Group("output", Output("out"));
for (ind=0; ind < NoOfChannels; ind++)
{
- tekst = "in" + to_string(ind+1);
+ tekst = "in" + std::to_string(ind+1);
ClockGroups.AddInput2Group("input", Input(tekst));
- tekst = "out" + to_string(ind+1);
+ tekst = "out" + std::to_string(ind+1);
ClockGroups.AddOutput2Group("output", Output(tekst));
}
@@ -1046,7 +1046,7 @@ void DSP::u::GardnerSampling::Init(
{ //activate output clock
if ((InputClock == NULL) || (OutputClock == NULL))
{
- DSP::log << DSP::e::LogMode::Error << "DSP::u::GardnerSampling::Init" << DSP::e::LogMode::second << "Can't activate output clock: InputClock or OutputClock is NULL" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::GardnerSampling::Init" << DSP::e::LogMode::second << "Can't activate output clock: InputClock or OutputClock is NULL" << std::endl;
return;
}
MasterClockIndex = InputClock->GetMasterClockIndex();
@@ -1547,7 +1547,7 @@ DSP::u::PSKencoder::PSKencoder(DSP::e::PSK_type type) : DSP::Block()
break;
default:
- DSP::log << DSP::e::LogMode::Error << "DSP::u::PSKencoder::PSKencoder" << DSP::e::LogMode::second << "Unsupported modulation type, falling back to BPSK" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::PSKencoder::PSKencoder" << DSP::e::LogMode::second << "Unsupported modulation type, falling back to BPSK" << std::endl;
Type = DSP::e::PSK_type::BPSK;
Execute_ptr = &InputExecute_BPSK;
break;
@@ -1754,10 +1754,10 @@ DSP::u::SymbolMapper::SymbolMapper(
}
SetNoOfInputs(bits_per_symbol_in,false);
- vector<unsigned int> inds;
+ std::vector<unsigned int> inds;
for (auto ind = 0U; ind < NoOfInputs; ind++) {
inds.push_back(ind);
- DefineInput("in"+to_string(ind+1), ind);
+ DefineInput("in"+std::to_string(ind+1), ind);
}
DefineInput("in", inds);
@@ -1796,7 +1796,7 @@ unsigned int getConstellation(
constellation[ind].im = static_cast<DSP::Float>(sin(constellation_phase_offset+(DSP::M_PIx2*n)/DSP::Float(M)));
// stringstream ss;
-// ss << "constellation[" << ind << "]={" << setprecision(2) << constellation[ind].re << "," << constellation[ind].im << "}; n=" << n;
+// ss << "constellation[" << ind << "]={" << std::setprecision(2) << constellation[ind].re << "," << constellation[ind].im << "}; n=" << n;
// DSP::f::InfoMessage(ss.str());
n ^= mask;
@@ -1837,7 +1837,7 @@ unsigned int getConstellation(
case DSP::e::ModulationType::QAM: {
// to convert number into gray, take the number and perform XOR after shifting the number 1 bit to the right.
// x_gray = x ^ (x >> 1);
- DSP::Float component_offset = (sqrt(DSP::Float(M))-1)/2;
+ DSP::Float component_offset = (sqrtf(DSP::Float(M))-1)/2;
if ((bits_per_symbol % 2) == 0) {
unsigned int mask = 0x00;
for (unsigned int ind = 0; ind < bits_per_symbol/2; ind++) {
@@ -1861,13 +1861,13 @@ unsigned int getConstellation(
}
else {
//! \TODO for odd bits_per_symbol generate QAM constellation for bits_per_symbol+1 and next remove half of the symbols with larger magnitude ???
- DSP::log << DSP::e::LogMode::Error << "getConstellation" << DSP::e::LogMode::second << "Unsupported modulation QAM bits_per_symbol value " << endl;
+ DSP::log << DSP::e::LogMode::Error << "getConstellation" << DSP::e::LogMode::second << "Unsupported modulation QAM bits_per_symbol value " << std::endl;
}
}
break;
default:
- DSP::log << DSP::e::LogMode::Error << "getConstellation" << DSP::e::LogMode::second << "Unsupported modulation type" << endl;
+ DSP::log << DSP::e::LogMode::Error << "getConstellation" << DSP::e::LogMode::second << "Unsupported modulation type" << std::endl;
break;
}
@@ -1932,10 +1932,10 @@ void DSP::u::SymbolMapper::InputExecute_bits(INPUT_EXECUTE_ARGS)
DSP::u::Serial2Parallel::Serial2Parallel(const DSP::Clock_ptr &InputClock,
const unsigned int &NoOfParallelOutputs,
const unsigned int &NoOfLinesPerInput,
- const vector<DSP::Float> &first_output_vector)
+ const std::vector<DSP::Float> &first_output_vector)
: DSP::Block(), DSP::Source()
{
- string tekst;
+ std::string tekst;
SetName("Serial2Parallel", false);
@@ -1943,7 +1943,7 @@ DSP::u::Serial2Parallel::Serial2Parallel(const DSP::Clock_ptr &InputClock,
// ++++++++++++++++++++++++++++++++++++++++++++++++++ //
// Inputs definitions
- vector <unsigned int> inds;
+ std::vector <unsigned int> inds;
SetNoOfInputs(NoOfLinesPerInput,false);
DefineInput("in.re", 0);
if (NoOfInputs >= 2) {
@@ -1952,7 +1952,7 @@ DSP::u::Serial2Parallel::Serial2Parallel(const DSP::Clock_ptr &InputClock,
inds.clear();
for (auto ind = 0U; ind < NoOfInputs; ind++) {
inds.push_back(ind);
- tekst = "in" + to_string(ind+1);
+ tekst = "in" + std::to_string(ind+1);
DefineInput(tekst, ind);
}
DefineInput("in", inds);
@@ -1971,19 +1971,19 @@ DSP::u::Serial2Parallel::Serial2Parallel(const DSP::Clock_ptr &InputClock,
inds.push_back(ind*NoOfInputs+ind2);
// # "out1[1]", "out1[2]", ... - first, second, ... line of output first output sample ...
- tekst = "out" + to_string(ind+1) + "[" + to_string(ind2+1) + "]";
+ tekst = "out" + std::to_string(ind+1) + "[" + std::to_string(ind2+1) + "]";
DefineOutput(tekst, ind*NoOfInputs+ind2);
}
// # "out1.re", "out2.re", ... - real part (first line) of output samples
- tekst = "out" + to_string(ind+1) + ".re";
+ tekst = "out" + std::to_string(ind+1) + ".re";
DefineOutput(tekst, ind*NoOfInputs+0);
// # "out1.im", "out2.im", ... - imag part (second line) of output samples (available only if NoOfInputs > 1)
if (NoOfInputs >= 2) {
- tekst = "out" + to_string(ind+1) + ".im";
+ tekst = "out" + std::to_string(ind+1) + ".im";
DefineOutput(tekst, ind*NoOfInputs+1);
}
// # "out1", "out2", ... first,second, ... output sample (each with NoOfInputs lines)
- tekst = "out" + to_string(ind+1);
+ tekst = "out" + std::to_string(ind+1);
DefineOutput(tekst, inds);
}
@@ -2011,7 +2011,7 @@ DSP::u::Serial2Parallel::Serial2Parallel(const DSP::Clock_ptr &InputClock,
if (first_output_vector.size() != NoOfOutputs) {
outputs.resize(NoOfOutputs, 0.0);
if (first_output_vector.size() > 0) {
- DSP::log << DSP::e::LogMode::Error << "DSP::u::Serial2Parallel" << DSP::e::LogMode::second << "Wrong size of first_output_vector" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::Serial2Parallel" << DSP::e::LogMode::second << "Wrong size of first_output_vector" << std::endl;
}
}
else {
@@ -2076,7 +2076,7 @@ DSP::u::Parallel2Serial::Parallel2Serial(const DSP::Clock_ptr &InputClock,
const bool &reversed_order)
: DSP::Block(), DSP::Source()
{
- string tekst;
+ std::string tekst;
SetName("Parallel2Serial", false);
@@ -2084,7 +2084,7 @@ DSP::u::Parallel2Serial::Parallel2Serial(const DSP::Clock_ptr &InputClock,
// ++++++++++++++++++++++++++++++++++++++++++++++++++ //
// Outputs definitions
- vector <unsigned int> inds;
+ std::vector <unsigned int> inds;
SetNoOfOutputs(NoOfLinesPerInput);
DefineOutput("out.re", 0);
if (NoOfOutputs >= 2) {
@@ -2093,7 +2093,7 @@ DSP::u::Parallel2Serial::Parallel2Serial(const DSP::Clock_ptr &InputClock,
inds.clear();
for (auto ind = 0U; ind < NoOfOutputs; ind++) {
inds.push_back(ind);
- tekst = "out" + to_string(ind+1);
+ tekst = "out" + std::to_string(ind+1);
DefineOutput(tekst, ind);
}
DefineOutput("out", inds);
@@ -2114,19 +2114,19 @@ DSP::u::Parallel2Serial::Parallel2Serial(const DSP::Clock_ptr &InputClock,
inds.push_back(ind*NoOfOutputs+ind2);
// # "in1[1]", "in1[2]", ... - first, second, ... line of input of first input sample ...
- tekst = "in" + to_string(ind+1) + "[" + to_string(ind2+1) + "]";
+ tekst = "in" + std::to_string(ind+1) + "[" + std::to_string(ind2+1) + "]";
DefineInput(tekst, ind*NoOfOutputs+ind2);
}
// # "in1.re", "in2.re", ... - real part (first line) of input samples
- tekst = "in" + to_string(ind+1) + ".re";
+ tekst = "in" + std::to_string(ind+1) + ".re";
DefineInput(tekst, ind*NoOfOutputs+0);
// "in1.im", "in2.im", ... - imag part (second line) of input samples (available only if NoOfLinesPerInput > 1)
if (NoOfOutputs >= 2) {
- tekst = "in" + to_string(ind+1) + ".im";
+ tekst = "in" + std::to_string(ind+1) + ".im";
DefineInput(tekst, ind*NoOfOutputs+1);
}
// "in1", "in2", ... first,second, ... input sample (each with NoOfLinesPerInput lines)
- tekst = "in" + to_string(ind+1);
+ tekst = "in" + std::to_string(ind+1);
DefineInput(tekst, inds);
}
}
@@ -2147,19 +2147,19 @@ DSP::u::Parallel2Serial::Parallel2Serial(const DSP::Clock_ptr &InputClock,
inds.push_back((NoOfParallelInputs-1-ind)*NoOfOutputs+ind2);
// # "in1[1]", "in1[2]", ... - first, second, ... line of input of first input sample ...
- tekst = "in" + to_string(ind+1) + "[" + to_string(ind2+1) + "]";
+ tekst = "in" + std::to_string(ind+1) + "[" + std::to_string(ind2+1) + "]";
DefineInput(tekst, (NoOfParallelInputs-1-ind)*NoOfOutputs+ind2);
}
// # "in1.re", "in2.re", ... - real part (first line) of input samples
- tekst = "in" + to_string(ind+1) + ".re";
+ tekst = "in" + std::to_string(ind+1) + ".re";
DefineInput(tekst, (NoOfParallelInputs-1-ind)*NoOfOutputs+0);
// "in1.im", "in2.im", ... - imag part (second line) of input samples (available only if NoOfLinesPerInput > 1)
if (NoOfOutputs >= 2) {
- tekst = "in" + to_string(ind+1) + ".im";
+ tekst = "in" + std::to_string(ind+1) + ".im";
DefineInput(tekst, (NoOfParallelInputs-1-ind)*NoOfOutputs+1);
}
// "in1", "in2", ... first,second, ... input sample (each with NoOfLinesPerInput lines)
- tekst = "in" + to_string(ind+1);
+ tekst = "in" + std::to_string(ind+1);
DefineInput(tekst, inds);
}
}
@@ -2250,10 +2250,10 @@ DSP::u::SymbolDemapper::SymbolDemapper( DSP::e::ModulationType type,
Execute_ptr = &InputExecute_constellation;
SetNoOfOutputs(bits_per_symbol_in);
- vector<unsigned int> inds;
+ std::vector<unsigned int> inds;
for (auto ind=0U; ind<NoOfOutputs; ind++) {
inds.push_back(ind);
- DefineOutput("out"+to_string(ind+1), ind);
+ DefineOutput("out"+std::to_string(ind+1), ind);
}
DefineOutput("out", inds);
@@ -2325,7 +2325,7 @@ void DSP::u::SymbolDemapper::InputExecute_constellation(INPUT_EXECUTE_ARGS)
}
// stringstream ss;
-// ss << setprecision(2) << "input={" << THIS_->input.re << "," << THIS_->input.im << "}\n";
+// ss << std::setprecision(2) << "input={" << THIS_->input.re << "," << THIS_->input.im << "}\n";
// ss << "min_squared_dist=" << min_squared_dist << ",symbol_index=" << symbol_index <<"\n";
// ss << "bits:";
unsigned int mask = 0x01;
@@ -2443,7 +2443,7 @@ DSP::u::PSKdecoder::PSKdecoder(DSP::e::PSK_type type) : DSP::Block()
break;
default:
- DSP::log << DSP::e::LogMode::Error << "DSP::u::PSKdecoder::PSKdecoder" << DSP::e::LogMode::second << "Unsupported modulation type, falling back to BPSK" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::PSKdecoder::PSKdecoder" << DSP::e::LogMode::second << "Unsupported modulation type, falling back to BPSK" << std::endl;
Execute_ptr = &InputExecute_BPSK;
break;
}
@@ -2589,7 +2589,7 @@ void DSP::u::PSKdecoder::InputExecute_QPSK_A(INPUT_EXECUTE_ARGS)
DSP::u::FFT::FFT(unsigned int K_in, bool AreInputsComplex)
: DSP::Block()
{
- string temp;
+ std::string temp;
unsigned int ind;
K = K_in;
@@ -2602,12 +2602,12 @@ DSP::u::FFT::FFT(unsigned int K_in, bool AreInputsComplex)
for (ind=0; ind<K; ind++)
{
- temp = "in" + to_string(ind+1);
+ temp = "in" + std::to_string(ind+1);
DefineInput(temp, ind*2, ind*2+1);
- temp = "in" + to_string(ind+1) + ".re";
+ temp = "in" + std::to_string(ind+1) + ".re";
DefineInput(temp, ind*2);
- temp = "in" + to_string(ind+1) + ".im";
+ temp = "in" + std::to_string(ind+1) + ".im";
DefineInput(temp, ind*2+1);
}
}
@@ -2616,9 +2616,9 @@ DSP::u::FFT::FFT(unsigned int K_in, bool AreInputsComplex)
SetNoOfInputs(K, true); // allow for constant inputs
for (ind=0; ind<K; ind++)
{
- temp = "in" + to_string(ind+1);
+ temp = "in" + std::to_string(ind+1);
DefineInput(temp, ind);
- temp = "in" + to_string(ind+1) + ".re";
+ temp = "in" + std::to_string(ind+1) + ".re";
DefineInput(temp, ind);
}
}
@@ -2626,12 +2626,12 @@ DSP::u::FFT::FFT(unsigned int K_in, bool AreInputsComplex)
SetNoOfOutputs(2*K);
for (ind=0; ind<K; ind++)
{
- temp = "out" + to_string(ind+1);
+ temp = "out" + std::to_string(ind+1);
DefineOutput(temp, ind*2, ind*2+1);
- temp = "out" + to_string(ind+1) + ".re";
+ temp = "out" + std::to_string(ind+1) + ".re";
DefineOutput(temp, ind*2);
- temp = "out" + to_string(ind+1) + ".im";
+ temp = "out" + std::to_string(ind+1) + ".im";
DefineOutput(temp, ind*2+1);
}
diff --git a/src/cpp/DSP_modules_misc.cpp b/src/cpp/DSP_modules_misc.cpp
index f2ec364..b67ccfe 100644
--- a/src/cpp/DSP_modules_misc.cpp
+++ b/src/cpp/DSP_modules_misc.cpp
@@ -22,7 +22,7 @@
int DSP::TMorseTable::TablesNo=0;
DSP::TMorseTable *DSP::TMorseTable::FirstTable=NULL;
DSP::TMorseTable *DSP::TMorseTable::Current=NULL;
-const string &DSP::TMorseTable::BaseDirectory="./";
+const std::string &DSP::TMorseTable::BaseDirectory="./";
DSP::TMorseTable::TMorseTable(void)
{
@@ -315,7 +315,7 @@ uint32_t DSP::TMorseTable::Ind2FontCharset(int ind)
}
-const string DSP::TMorseTable::Ind2AnsiString(int ind)
+const std::string DSP::TMorseTable::Ind2AnsiString(int ind)
{
switch (Ind2FontCharset(ind))
{
@@ -347,7 +347,7 @@ const string DSP::TMorseTable::Ind2AnsiString(int ind)
}
}
-uint32_t DSP::TMorseTable::MorseCodeText2Number(const string &dot_dash_text)
+uint32_t DSP::TMorseTable::MorseCodeText2Number(const std::string &dot_dash_text)
{
uint32_t weigth;
uint32_t Number;
@@ -372,9 +372,9 @@ uint32_t DSP::TMorseTable::MorseCodeText2Number(const string &dot_dash_text)
return Number;
}
-string DSP::TMorseTable::Number2MorseCodeText(uint32_t Number)
+std::string DSP::TMorseTable::Number2MorseCodeText(uint32_t Number)
{
- string dash_dot_text = "";
+ std::string dash_dot_text = "";
while (Number!=0)
{
@@ -393,7 +393,7 @@ string DSP::TMorseTable::Number2MorseCodeText(uint32_t Number)
return dash_dot_text;
}
-int DSP::TMorseTable::MorseCodeText2LetterInd(const string &dot_dash_text)
+int DSP::TMorseTable::MorseCodeText2LetterInd(const std::string &dot_dash_text)
{
uint32_t number;
int ind;
@@ -428,10 +428,10 @@ uint32_t DSP::TMorseTable::Char2Number(char znak)
return 0;
}
-void DSP::TMorseTable::Save2File(const string &Name)
+void DSP::TMorseTable::Save2File(const std::string &Name)
{
#if _DEMO_ == 0
- string Dir_FileName;
+ std::string Dir_FileName;
unsigned char pomB;
uint16_t pom;
unsigned long ind;
@@ -482,9 +482,9 @@ void DSP::TMorseTable::Save2File(const string &Name)
//---------------------------------------------------------------------------
-bool DSP::TMorseTable::LoadFromFile(const string &Name)
+bool DSP::TMorseTable::LoadFromFile(const std::string &Name)
{
- string Dir_FileName;
+ std::string Dir_FileName;
uint8_t IleFONT;
uint8_t ver;
FILE *plik;
@@ -525,7 +525,7 @@ bool DSP::TMorseTable::LoadFromFile(const string &Name)
fread(&pom, sizeof(uint16_t), 1, plik);
if (pom!=0)
{
- vector<char> buffer(pom+1);
+ std::vector<char> buffer(pom+1);
fread(buffer.data(), 1, pom, plik);
buffer[pom] = 0x00;
FontName[ind] = buffer.data();
@@ -537,7 +537,7 @@ bool DSP::TMorseTable::LoadFromFile(const string &Name)
fread(&pom, sizeof(uint16_t), 1, plik);
if (pom!=0)
{
- vector<char> buffer(pom+1);
+ std::vector<char> buffer(pom+1);
fread(buffer.data(), 1, pom, plik);
buffer[pom] = 0x00;
TestText[ind] = buffer.data();
@@ -610,7 +610,7 @@ void DSP::TMorseTable::FreeTables(void)
}
//! \warning Not yet implemented
-void DSP::TMorseTable::LoadTables(const string &BaseDir)
+void DSP::TMorseTable::LoadTables(const std::string &BaseDir)
{
UNUSED_ARGUMENT(BaseDir);
//! \todo convert to gcc
@@ -680,7 +680,7 @@ void DSP::TMorseTable::NewTable(void)
{
//TSearchRec F;
TMorseTable *pom;
- string Dir_FileName;
+ std::string Dir_FileName;
int ind_;
pom=FirstTable;
@@ -757,7 +757,7 @@ void DSP::TMorseTable::SaveCurrent(void)
}
//! \todo convert to gcc
-bool DSP::TMorseTable::RenameCurrentTable(const string &NewName)
+bool DSP::TMorseTable::RenameCurrentTable(const std::string &NewName)
{
UNUSED_ARGUMENT(NewName);
/*
@@ -794,7 +794,7 @@ bool DSP::TMorseTable::RenameCurrentTable(const string &NewName)
return true;
}
-const string DSP::TMorseTable::Description(void)
+const std::string DSP::TMorseTable::Description(void)
{
return TableDescription;
}
@@ -929,7 +929,7 @@ void DSP::u::MORSEkey::Init(DSP::Clock_ptr ParentClock)
RegisterOutputClock(ParentClock);
};
-bool DSP::u::MORSEkey::LoadCodeTable(const string &filename)
+bool DSP::u::MORSEkey::LoadCodeTable(const std::string &filename)
{
return MorseTable.LoadFromFile(filename);
}
@@ -983,7 +983,7 @@ void DSP::u::MORSEkey::SetKeyingSpeed(float WPM_in, long sampling_rate_in,
space_len = (int)(space2dot_ratio * dot_len_float+0.5);
}
-void DSP::u::MORSEkey::AddString(string AsciiText_in)
+void DSP::u::MORSEkey::AddString(std::string AsciiText_in)
{
//! TODO mutex
AsciiText += AsciiText_in;
diff --git a/src/cpp/DSP_sockets.cpp b/src/cpp/DSP_sockets.cpp
index 036d80c..02fc532 100644
--- a/src/cpp/DSP_sockets.cpp
+++ b/src/cpp/DSP_sockets.cpp
@@ -32,7 +32,7 @@ DSP::e::SocketStatus& DSP::e::operator&= (DSP::e::SocketStatus& left,
// Basic sockets support
bool DSP::Socket::winsock_initialized = false;
int DSP::Socket::NoOfSocketObjects = 0;
-const string DSP::Socket::DEFAULT_PORT = "27027";
+const std::string DSP::Socket::DEFAULT_PORT = "27027";
#ifndef __NO_WINSOCK__
WSADATA DSP::Socket::wsaData;
#endif
@@ -46,7 +46,7 @@ bool DSP::Socket::listen_ready = false;
int DSP::Socket::no_of_server_objects = 0;
std::vector<DSP::Socket *> DSP::Socket::server_objects_list;
-DSP::Socket::Socket(const string &address_with_port, bool run_as_client, uint32_t ServerObjectID_in)
+DSP::Socket::Socket(const std::string &address_with_port, bool run_as_client, uint32_t ServerObjectID_in)
{
result = NULL;
ptr = NULL;
@@ -120,7 +120,7 @@ int DSP::Socket::GetLastError() {
#endif
}
-bool DSP::Socket::InitServer_ListenSocket(const string & address_with_port)
+bool DSP::Socket::InitServer_ListenSocket(const std::string & address_with_port)
{
int res;
@@ -129,7 +129,7 @@ bool DSP::Socket::InitServer_ListenSocket(const string & address_with_port)
if (listen_ready == true)
{
- DSP::log << "DSP::Socket::InitServer_ListenSocket" << DSP::e::LogMode::second << "already initialized" << endl;
+ DSP::log << "DSP::Socket::InitServer_ListenSocket" << DSP::e::LogMode::second << "already initialized" << std::endl;
return false;
}
@@ -144,8 +144,8 @@ bool DSP::Socket::InitServer_ListenSocket(const string & address_with_port)
hints.ai_flags = AI_PASSIVE;
// Resolve the server address and port
- string hostname = extract_hostname(address_with_port);
- string port = extract_port(address_with_port, DEFAULT_PORT);
+ std::string hostname = extract_hostname(address_with_port);
+ std::string port = extract_port(address_with_port, DEFAULT_PORT);
iResult = getaddrinfo(hostname.c_str(), port.c_str(), &hints, &result);
if ( iResult != 0 )
{
@@ -153,7 +153,7 @@ bool DSP::Socket::InitServer_ListenSocket(const string & address_with_port)
//iResult = getaddrinfo(address, DEFAULT_PORT, &hints, &result);
//if ( iResult != 0 )
//{
- DSP::log << DSP::e::LogMode::Error << "DSP::Socket::InitServer" << DSP::e::LogMode::second << "getaddrinfo failed" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Socket::InitServer" << DSP::e::LogMode::second << "getaddrinfo failed" << std::endl;
listen_ready = false;
return false;
//}
@@ -168,7 +168,7 @@ bool DSP::Socket::InitServer_ListenSocket(const string & address_with_port)
if (is_socket_valid(ListenSocket) == false)
{
res = DSP::Socket::GetLastError();
- DSP::log << DSP::e::LogMode::Error << "DSP::Socket::InitServer" << DSP::e::LogMode::second << "Error at socket(): " << res << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Socket::InitServer" << DSP::e::LogMode::second << "Error at socket(): " << res << std::endl;
freeaddrinfo(result);
result = NULL;
listen_ready = false;
@@ -185,7 +185,7 @@ bool DSP::Socket::InitServer_ListenSocket(const string & address_with_port)
#endif
if (DSP::Socket::is_socket_error(iResult))
{
- DSP::log << DSP::e::LogMode::Error << "DSP::Socket::InitServer" << DSP::e::LogMode::second << "ioctlsocket failed to set non-blocking mode" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Socket::InitServer" << DSP::e::LogMode::second << "ioctlsocket failed to set non-blocking mode" << std::endl;
}
// Setup the TCP listening socket
@@ -193,7 +193,7 @@ bool DSP::Socket::InitServer_ListenSocket(const string & address_with_port)
result->ai_addr, (int)result->ai_addrlen);
if (DSP::Socket::is_socket_error(iResult))
{
- DSP::log << DSP::e::LogMode::Error << "DSP::Socket::InitServer" << DSP::e::LogMode::second << "bind failed" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Socket::InitServer" << DSP::e::LogMode::second << "bind failed" << std::endl;
//printf("bind failed: %d\n", WSAGetLastError());
freeaddrinfo(result);
result = NULL;
@@ -205,7 +205,7 @@ bool DSP::Socket::InitServer_ListenSocket(const string & address_with_port)
// support multiple outgoing connections
if ( DSP::Socket::is_socket_error(listen( ListenSocket, SOMAXCONN )) )
{
- DSP::log << DSP::e::LogMode::Error << "DSP::Socket::InitServer" << DSP::e::LogMode::second << "listen failed" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Socket::InitServer" << DSP::e::LogMode::second << "listen failed" << std::endl;
//printf("listen failed: %d\n", WSAGetLastError());
freeaddrinfo(result);
result = NULL;
@@ -245,7 +245,7 @@ bool DSP::Socket::TryAcceptConnection(void)
unsigned long in_counter;
uint32_t temp_ServerObjectID;
SOCKET temp_socket;
- string text;
+ std::string text;
if (DSP::Socket::is_socket_valid(ListenSocket) == false)
return false;
@@ -266,7 +266,7 @@ bool DSP::Socket::TryAcceptConnection(void)
//current_socket_state &= DSP::e::SocketStatus::timeout_mask; // no object
if (DSP::Socket::is_socket_error(res) == true)
{
- DSP::log << "DSP::Socket::TryAcceptConnection" << DSP::e::LogMode::second << "SOCKET_ERROR" << endl;
+ DSP::log << "DSP::Socket::TryAcceptConnection" << DSP::e::LogMode::second << "SOCKET_ERROR" << std::endl;
DSP::Socket::close_socket();
// current_socket_state |= DSP::e::SocketStatus::error; no object
return false;
@@ -276,7 +276,7 @@ bool DSP::Socket::TryAcceptConnection(void)
temp_socket = accept(ListenSocket, NULL, NULL);
if (DSP::Socket::is_socket_valid(temp_socket) == false)
{
- DSP::log << DSP::e::LogMode::Error << "DSP::Socket::TryAcceptConnection" << DSP::e::LogMode::second << "accept failed" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Socket::TryAcceptConnection" << DSP::e::LogMode::second << "accept failed" << std::endl;
//printf("accept failed: %d\n", WSAGetLastError());
DSP::Socket::close_socket();
listen_ready = false;
@@ -303,12 +303,12 @@ bool DSP::Socket::TryAcceptConnection(void)
* ?!? this might block other connections ?!?
*/
DSP::Socket::close_socket(temp_socket);
- DSP::log << "DSP::Socket::TryAcceptConnection" << DSP::e::LogMode::second << "socket ID data has not been received (timeout - connection closed)" << endl;
+ DSP::log << "DSP::Socket::TryAcceptConnection" << DSP::e::LogMode::second << "socket ID data has not been received (timeout - connection closed)" << std::endl;
return false;
}
if (DSP::Socket::is_socket_error( res ) == true)
{
- DSP::log << "DSP::Socket::TryAcceptConnection" << DSP::e::LogMode::second << "error reading socket ID data" << endl;
+ DSP::log << "DSP::Socket::TryAcceptConnection" << DSP::e::LogMode::second << "error reading socket ID data" << std::endl;
// current_socket_state |= DSP::e::SocketStatus::error; // no object
return false;
}
@@ -321,18 +321,18 @@ bool DSP::Socket::TryAcceptConnection(void)
if (in_counter == 0)
{
// connection has been closed
- DSP::log << "DSP::Socket::TryAcceptConnection" << DSP::e::LogMode::second << "connection has been closed" << endl;
+ DSP::log << "DSP::Socket::TryAcceptConnection" << DSP::e::LogMode::second << "connection has been closed" << std::endl;
return false;
}
if (in_counter < sizeof(uint32_t))
{
- DSP::log << "DSP::Socket::TryAcceptConnection" << DSP::e::LogMode::second << "error reading socket ID data (not enough data)" << endl;
+ DSP::log << "DSP::Socket::TryAcceptConnection" << DSP::e::LogMode::second << "error reading socket ID data (not enough data)" << std::endl;
// current_socket_state |= DSP::e::SocketStatus::error; // no object
return false;
}
in_counter = recv(temp_socket, (char *)(&temp_ServerObjectID), sizeof(uint32_t), 0);
- DSP::log << "DSP::Socket::TryAcceptConnection" << DSP::e::LogMode::second << "ServerObjectID = " << (int)temp_ServerObjectID << endl;
+ DSP::log << "DSP::Socket::TryAcceptConnection" << DSP::e::LogMode::second << "ServerObjectID = " << (int)temp_ServerObjectID << std::endl;
// update ConnectSocket in according socket object
for (ind = 0; ind < no_of_server_objects; ind++)
@@ -346,7 +346,7 @@ bool DSP::Socket::TryAcceptConnection(void)
{
DSP::log << "DSP::Socket::TryAcceptConnection" << DSP::e::LogMode::second
<< "server_objects_list[" << ind
- << "]ServerObjectID = " << (unsigned int)server_objects_list[ind]->ServerObjectID << endl;
+ << "]ServerObjectID = " << (unsigned int)server_objects_list[ind]->ServerObjectID << std::endl;
server_objects_list[ind]->ConnectSocket = temp_socket;
server_objects_list[ind]->socket_ready = true;
@@ -358,14 +358,14 @@ bool DSP::Socket::TryAcceptConnection(void)
}
}
// current_socket_state |= DSP::e::SocketStatus::error; // no object
- DSP::log << DSP::e::LogMode::Error << "DSP::Socket::TryAcceptConnection" << DSP::e::LogMode::second << "Unexpected incoming connection" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Socket::TryAcceptConnection" << DSP::e::LogMode::second << "Unexpected incoming connection" << std::endl;
return false;
}
-string DSP::Socket::extract_hostname(const string &address_with_port) {
- string hostname;
+std::string DSP::Socket::extract_hostname(const std::string &address_with_port) {
+ std::string hostname;
size_t found = address_with_port.find_first_of(":");
- if (found != string::npos) {
+ if (found != std::string::npos) {
hostname = address_with_port.substr(0, found);
}
else {
@@ -374,10 +374,10 @@ string DSP::Socket::extract_hostname(const string &address_with_port) {
return hostname;
}
-string DSP::Socket::extract_port(const string& address_with_port, const string &default_port) {
- string port;
+std::string DSP::Socket::extract_port(const std::string& address_with_port, const std::string &default_port) {
+ std::string port;
size_t found = address_with_port.find_first_of(":");
- if (found != string::npos) {
+ if (found != std::string::npos) {
port = address_with_port.substr(found+1);
}
else {
@@ -400,7 +400,7 @@ void DSP::Socket::close_socket(SOCKET &socket_to_close) {
#endif
}
-bool DSP::Socket::InitClient(const string & address_with_port)
+bool DSP::Socket::InitClient(const std::string & address_with_port)
{
bool ready;
@@ -421,12 +421,12 @@ bool DSP::Socket::InitClient(const string & address_with_port)
// Resolve the server address and port
ready = true;
- string hostname = extract_hostname(address_with_port);
- string port = extract_port(address_with_port, DEFAULT_PORT);
+ std::string hostname = extract_hostname(address_with_port);
+ std::string port = extract_port(address_with_port, DEFAULT_PORT);
iResult = getaddrinfo(hostname.c_str(), port.c_str(), &hints, &result);
if ( iResult != 0 )
{
- DSP::log << DSP::e::LogMode::Error << "DSP::Socket::InitClient" << DSP::e::LogMode::second << "getaddrinfo failed" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Socket::InitClient" << DSP::e::LogMode::second << "getaddrinfo failed" << std::endl;
current_socket_state |= DSP::e::SocketStatus::error;
return false;
}
@@ -440,7 +440,7 @@ bool DSP::Socket::InitClient(const string & address_with_port)
ConnectSocket = socket(ptr->ai_family, ptr->ai_socktype, ptr->ai_protocol);
if (DSP::Socket::is_socket_valid(ConnectSocket) == false)
{
- DSP::log << DSP::e::LogMode::Error << "DSP::Socket::InitClient" << DSP::e::LogMode::second << "Error at socket()" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Socket::InitClient" << DSP::e::LogMode::second << "Error at socket()" << std::endl;
//printf("Error at socket(): %ld\n", WSAGetLastError());
freeaddrinfo(result);
result = NULL;
@@ -456,7 +456,7 @@ bool DSP::Socket::InitClient(const string & address_with_port)
#endif
if (DSP::Socket::is_socket_error(iResult) == true)
{
- DSP::log << DSP::e::LogMode::Error << "DSP::Socket::InitClient" << DSP::e::LogMode::second << "ioctlsocket failed to set non-blocking mode" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Socket::InitClient" << DSP::e::LogMode::second << "ioctlsocket failed to set non-blocking mode" << std::endl;
current_socket_state |= DSP::e::SocketStatus::error;
}
}
@@ -469,7 +469,7 @@ bool DSP::Socket::TryConnect(uint32_t SerwerObjectID)
{
unsigned long out_counter;
#ifdef __DEBUG__
- string text;
+ std::string text;
#endif
int err;
@@ -501,7 +501,7 @@ bool DSP::Socket::TryConnect(uint32_t SerwerObjectID)
current_socket_state &= DSP::e::SocketStatus::timeout_mask;
socket_ready = true;
#ifdef __DEBUG__
- DSP::log << "DSP::Socket::TryConnect" << DSP::e::LogMode::second << "connection established (" << err << ")" << endl;
+ DSP::log << "DSP::Socket::TryConnect" << DSP::e::LogMode::second << "connection established (" << err << ")" << std::endl;
#endif
break;
@@ -537,11 +537,11 @@ bool DSP::Socket::TryConnect(uint32_t SerwerObjectID)
#ifdef __DEBUG__
if (res == 0)
{
- DSP::log << DSP::e::LogMode::Error << "DSP::Socket::TryConnect" << DSP::e::LogMode::second << "connected but not ready to write (" << res << ")" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Socket::TryConnect" << DSP::e::LogMode::second << "connected but not ready to write (" << res << ")" << std::endl;
}
else
{
- DSP::log << "DSP::Socket::TryConnect" << DSP::e::LogMode::second << "connected and ready to write (" << res << ")" << endl;
+ DSP::log << "DSP::Socket::TryConnect" << DSP::e::LogMode::second << "connected and ready to write (" << res << ")" << std::endl;
}
#endif
@@ -552,13 +552,13 @@ bool DSP::Socket::TryConnect(uint32_t SerwerObjectID)
if (out_counter < sizeof(uint32_t))
{
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::Socket::TryConnect" << DSP::e::LogMode::second << "failed to send expected server object data" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Socket::TryConnect" << DSP::e::LogMode::second << "failed to send expected server object data" << std::endl;
#endif
current_socket_state |= DSP::e::SocketStatus::error;
return false;
}
#ifdef __DEBUG__
- DSP::log << "DSP::Socket::TryConnect" << DSP::e::LogMode::second << "SerwerObjectID has been sent" << endl;
+ DSP::log << "DSP::Socket::TryConnect" << DSP::e::LogMode::second << "SerwerObjectID has been sent" << std::endl;
#endif
return socket_ready;
}
@@ -572,7 +572,7 @@ bool DSP::Socket::Init_socket(void)
if (iResult != 0)
{
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::Socket::Init_socket" << DSP::e::LogMode::second << "WSAStartup failed" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Socket::Init_socket" << DSP::e::LogMode::second << "WSAStartup failed" << std::endl;
#endif
current_socket_state |= DSP::e::SocketStatus::error;
return false;
@@ -657,7 +657,7 @@ DSP::Socket::~Socket(void)
/* ***************************************** */
/* ***************************************** */
DSP::u::SocketInput::SocketInput(DSP::Clock_ptr ParentClock,
- const string &address_with_port, bool run_as_client,
+ const std::string &address_with_port, bool run_as_client,
uint32_t ServerObjectID_in,
unsigned int NoOfChannels,
DSP::e::SampleType sample_type)
@@ -680,7 +680,7 @@ void DSP::u::SocketInput::Init(DSP::Clock_ptr ParentClock,
unsigned int OutputsNo, //just one channel
DSP::e::SampleType sample_type)
{
- string temp;
+ std::string temp;
Fp = -1;
Offset = 0;
@@ -702,7 +702,7 @@ void DSP::u::SocketInput::Init(DSP::Clock_ptr ParentClock,
}
for (unsigned int ind=0; ind<NoOfOutputs; ind++)
{
- temp = "out" + to_string(ind+1);
+ temp = "out" + std::to_string(ind+1);
DefineOutput(temp, ind);
}
@@ -749,7 +749,7 @@ bool DSP::u::SocketInput::SetSkip(long long Offset_in)
UNUSED_ARGUMENT(Offset_in);
#ifdef __DEBUG__
- DSP::log << "DSP::u::SocketInput::SetSkip" << DSP::e::LogMode::second << "Offset setting not yet supported" << endl;
+ DSP::log << "DSP::u::SocketInput::SetSkip" << DSP::e::LogMode::second << "Offset setting not yet supported" << std::endl;
#endif
return false;
}
@@ -805,7 +805,7 @@ bool DSP::u::SocketInput::OutputExecute(OUTPUT_EXECUTE_ARGS)
}
if (THIS->SocketInfoData_received == false)
{
- DSP::log << "DSP::u::SocketInput::OutputExecute" << DSP::e::LogMode::second << "THIS->ReadConnectionData" << endl;
+ DSP::log << "DSP::u::SocketInput::OutputExecute" << DSP::e::LogMode::second << "THIS->ReadConnectionData" << std::endl;
THIS->SocketInfoData_received = THIS->ReadConnectionData();
}
@@ -860,7 +860,7 @@ bool DSP::u::SocketInput::OutputExecute(OUTPUT_EXECUTE_ARGS)
THIS->current_socket_state &= DSP::e::SocketStatus::timeout_mask;
if (DSP::Socket::is_socket_error(res) == true)
{
- DSP::log << "DSP::u::SocketInput::OutputExecute" << DSP::e::LogMode::second << "SOCKET_ERROR" << endl;
+ DSP::log << "DSP::u::SocketInput::OutputExecute" << DSP::e::LogMode::second << "SOCKET_ERROR" << std::endl;
// close socket
DSP::Socket::close_socket(THIS->ConnectSocket);
@@ -882,7 +882,7 @@ bool DSP::u::SocketInput::OutputExecute(OUTPUT_EXECUTE_ARGS)
if (in_counter == 0)
{
// connection has been closed
- DSP::log << "DSP::u::SocketInput::OutputExecute" << DSP::e::LogMode::second << "connection has been closed" << endl;
+ DSP::log << "DSP::u::SocketInput::OutputExecute" << DSP::e::LogMode::second << "connection has been closed" << std::endl;
// close socket
close_socket(THIS->ConnectSocket);
@@ -897,7 +897,7 @@ bool DSP::u::SocketInput::OutputExecute(OUTPUT_EXECUTE_ARGS)
if (in_counter < THIS->inbuffer_size)
{
#ifdef __DEBUG__
- DSP::log << "DSP::u::SocketInput::OutputExecute" << DSP::e::LogMode::second << "more data expected" << endl;
+ DSP::log << "DSP::u::SocketInput::OutputExecute" << DSP::e::LogMode::second << "more data expected" << std::endl;
#endif // __DEBUG__
DSP::Clock::InputNeedsMoreTime[THIS->my_clock->MasterClockIndex] = true;
@@ -1012,7 +1012,7 @@ bool DSP::u::SocketInput::ReadConnectionData(void)
if (DSP::Socket::is_socket_error(res) == true)
{
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::u::SocketInput::ReadConnectionData" << DSP::e::LogMode::second << "SOCKET_ERROR" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::SocketInput::ReadConnectionData" << DSP::e::LogMode::second << "SOCKET_ERROR" << std::endl;
#endif
// close socket
socket_ready = false;
@@ -1031,7 +1031,7 @@ bool DSP::u::SocketInput::ReadConnectionData(void)
{
// connection has been closed
#ifdef __DEBUG__
- DSP::log << "DSP::u::SocketInput::ReadConnectionData" << DSP::e::LogMode::second << "connection has been closed" << endl;
+ DSP::log << "DSP::u::SocketInput::ReadConnectionData" << DSP::e::LogMode::second << "connection has been closed" << std::endl;
#endif
// close socket
socket_ready = false;
@@ -1046,7 +1046,7 @@ bool DSP::u::SocketInput::ReadConnectionData(void)
{
DSP::log << "DSP::u::SocketInput::ReadConnectionData" << DSP::e::LogMode::second
<< "more data expected: in_counter = " << in_counter
- << "; expected_data_size = " << expected_data_size << endl;
+ << "; expected_data_size = " << expected_data_size << std::endl;
}
#endif
continue;
@@ -1057,7 +1057,7 @@ bool DSP::u::SocketInput::ReadConnectionData(void)
{
DSP::log << "DSP::u::SocketInput::ReadConnectionData" << DSP::e::LogMode::second
<< "in_counter_recv = " << in_counter_recv << "; state = " << state
- << "; expected_data_size = " << expected_data_size << endl;
+ << "; expected_data_size = " << expected_data_size << std::endl;
}
#endif
@@ -1067,7 +1067,7 @@ bool DSP::u::SocketInput::ReadConnectionData(void)
if (buffer[0] != 0xffff)
{
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::u::SocketInput::ReadConnectionData" << DSP::e::LogMode::second << "unexpected marker" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::SocketInput::ReadConnectionData" << DSP::e::LogMode::second << "unexpected marker" << std::endl;
#endif
data_type = DSP::e::SocketInfoDataType::end;
}
@@ -1087,7 +1087,7 @@ bool DSP::u::SocketInput::ReadConnectionData(void)
{
case DSP::e::SocketInfoDataType::Fp:
#ifdef __DEBUG__
- DSP::log << "DSP::u::SocketInput::ReadConnectionData" << DSP::e::LogMode::second << "DSP::e::SocketInfoDataType::Fp" << endl;
+ DSP::log << "DSP::u::SocketInput::ReadConnectionData" << DSP::e::LogMode::second << "DSP::e::SocketInfoDataType::Fp" << std::endl;
#endif
state = 3; // waiting for Fp data
expected_data_size = sizeof(long);
@@ -1095,7 +1095,7 @@ bool DSP::u::SocketInput::ReadConnectionData(void)
case DSP::e::SocketInfoDataType::Offset:
#ifdef __DEBUG__
- DSP::log << "DSP::u::SocketInput::ReadConnectionData" << DSP::e::LogMode::second << "DSP::e::SocketInfoDataType::Offset" << endl;
+ DSP::log << "DSP::u::SocketInput::ReadConnectionData" << DSP::e::LogMode::second << "DSP::e::SocketInfoDataType::Offset" << std::endl;
#endif
state = 3; // waiting for Offset data
expected_data_size = sizeof(long);
@@ -1103,7 +1103,7 @@ bool DSP::u::SocketInput::ReadConnectionData(void)
case DSP::e::SocketInfoDataType::UserData:
#ifdef __DEBUG__
- DSP::log << "DSP::u::SocketInput::ReadConnectionData" << DSP::e::LogMode::second << "DSP::e::SocketInfoDataType::UserData" << endl;
+ DSP::log << "DSP::u::SocketInput::ReadConnectionData" << DSP::e::LogMode::second << "DSP::e::SocketInfoDataType::UserData" << std::endl;
#endif
state = 3; // waiting for user data
// expected_data_size = *((long *)buffer);
@@ -1111,7 +1111,7 @@ bool DSP::u::SocketInput::ReadConnectionData(void)
break;
case DSP::e::SocketInfoDataType::end:
#ifdef __DEBUG__
- DSP::log << "DSP::u::SocketInput::ReadConnectionData" << DSP::e::LogMode::second << "DSP::e::SocketInfoDataType::end" << endl;
+ DSP::log << "DSP::u::SocketInput::ReadConnectionData" << DSP::e::LogMode::second << "DSP::e::SocketInfoDataType::end" << std::endl;
#endif
// ignore: transmission finished
break;
@@ -1120,7 +1120,7 @@ bool DSP::u::SocketInput::ReadConnectionData(void)
// expected_data_size = *((long *)buffer);
memcpy(&expected_data_size,buffer, sizeof(long));
#ifdef __DEBUG__
- DSP::log << "DSP::u::SocketInput::ReadConnectionData" << DSP::e::LogMode::second << "unexpected field type" << endl;
+ DSP::log << "DSP::u::SocketInput::ReadConnectionData" << DSP::e::LogMode::second << "unexpected field type" << std::endl;
#endif
current_socket_state |= DSP::e::SocketStatus::error;
break;
@@ -1143,7 +1143,7 @@ bool DSP::u::SocketInput::ReadConnectionData(void)
break;
default:
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::u::SocketInput::ReadConnectionData" << DSP::e::LogMode::second << "unexpected data type" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::SocketInput::ReadConnectionData" << DSP::e::LogMode::second << "unexpected data type" << std::endl;
#endif
current_socket_state |= DSP::e::SocketStatus::error;
break;
@@ -1154,7 +1154,7 @@ bool DSP::u::SocketInput::ReadConnectionData(void)
default:
data_type = DSP::e::SocketInfoDataType::end;
#ifdef __DEBUG__
- DSP::log << DSP::e::LogMode::Error << "DSP::u::SocketInput::ReadConnectionData" << DSP::e::LogMode::second << "unexpected state" << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::u::SocketInput::ReadConnectionData" << DSP::e::LogMode::second << "unexpected state" << std::endl;
#endif
current_socket_state |= DSP::e::SocketStatus::error;
break;
@@ -1165,7 +1165,7 @@ bool DSP::u::SocketInput::ReadConnectionData(void)
#ifdef __DEBUG__
{
DSP::log << "DSP::u::SocketInput::ReadConnectionData" << DSP::e::LogMode::second
- << "in_counter_recv = " << in_counter_recv << endl;
+ << "in_counter_recv = " << in_counter_recv << std::endl;
}
#endif
return true;
@@ -1173,7 +1173,7 @@ bool DSP::u::SocketInput::ReadConnectionData(void)
/* ***************************************** */
/* ***************************************** */
DSP::u::SocketOutput::SocketOutput(
- const string &address_with_port, bool run_as_client,
+ const std::string &address_with_port, bool run_as_client,
uint32_t ServerObjectID_in,
unsigned int NoOfChannels,
DSP::e::SampleType sample_type)
@@ -1187,7 +1187,7 @@ DSP::u::SocketOutput::SocketOutput(
void DSP::u::SocketOutput::Init(unsigned int InputsNo,
DSP::e::SampleType sample_type)
{
- string temp;
+ std::string temp;
SocketInfoData_sent = false;
@@ -1207,7 +1207,7 @@ void DSP::u::SocketOutput::Init(unsigned int InputsNo,
}
for (unsigned int ind=0; ind<NoOfInputs; ind++)
{
- temp = "in" + to_string(ind+1);
+ temp = "in" + std::to_string(ind+1);
DefineInput(temp, ind);
}
@@ -1346,7 +1346,7 @@ bool DSP::u::SocketOutput::SendConnectionData(void)
unsigned short buffer[1024];
unsigned long out_counter;
#ifdef __DEBUG__
- string text;
+ std::string text;
#endif
fd_set writefds;
@@ -1369,7 +1369,7 @@ bool DSP::u::SocketOutput::SendConnectionData(void)
if (DSP::Socket::is_socket_error(res) == true)
{
#ifdef __DEBUG__
- DSP::log << "DSP::Socket::TryAcceptConnection" << DSP::e::LogMode::second << "SOCKET_ERROR" << endl;
+ DSP::log << "DSP::Socket::TryAcceptConnection" << DSP::e::LogMode::second << "SOCKET_ERROR" << std::endl;
#endif
close_socket(ConnectSocket);
current_socket_state |= DSP::e::SocketStatus::closed;
@@ -1383,17 +1383,17 @@ bool DSP::u::SocketOutput::SendConnectionData(void)
out_counter = send(ConnectSocket, (char *)buffer, sizeof(unsigned short), 0);
#ifdef __DEBUG__
DSP::log << "DSP::u::SocketOutput::SendConnectionData" << DSP::e::LogMode::second
- << "marker(end) out_counter = " << out_counter << endl;
+ << "marker(end) out_counter = " << out_counter << std::endl;
#endif
// version
buffer[0] = 0x0001;
out_counter += send(ConnectSocket, (char *)buffer, sizeof(unsigned short), 0);
#ifdef __DEBUG__
DSP::log << "DSP::u::SocketOutput::SendConnectionData" << DSP::e::LogMode::second
- << "version(end) out_counter = " << out_counter << endl;
+ << "version(end) out_counter = " << out_counter << std::endl;
DSP::log << "DSP::u::SocketOutput::SendConnectionData" << DSP::e::LogMode::second
- << "DSP::e::SocketInfoDataType::Fp(start) out_counter = " << out_counter << endl;
+ << "DSP::e::SocketInfoDataType::Fp(start) out_counter = " << out_counter << std::endl;
#endif
// field type
@@ -1408,9 +1408,9 @@ bool DSP::u::SocketOutput::SendConnectionData(void)
out_counter += send(ConnectSocket, (char *)buffer, sizeof(long), 0);
#ifdef __DEBUG__
DSP::log << "DSP::u::SocketOutput::SendConnectionData" << DSP::e::LogMode::second
- << "DSP::e::SocketInfoDataType::Fp(end) out_counter = " << out_counter << endl;
+ << "DSP::e::SocketInfoDataType::Fp(end) out_counter = " << out_counter << std::endl;
DSP::log << "DSP::u::SocketOutput::SendConnectionData" << DSP::e::LogMode::second
- << "DSP::e::SocketInfoDataType::Offset(start) out_counter = " << out_counter << endl;
+ << "DSP::e::SocketInfoDataType::Offset(start) out_counter = " << out_counter << std::endl;
#endif
// field type
@@ -1427,7 +1427,7 @@ bool DSP::u::SocketOutput::SendConnectionData(void)
#ifdef __DEBUG__
DSP::log << "DSP::u::SocketOutput::SendConnectionData" << DSP::e::LogMode::second
- << "DSP::e::SocketInfoDataType::Offset(end) out_counter = " << out_counter << endl;
+ << "DSP::e::SocketInfoDataType::Offset(end) out_counter = " << out_counter << std::endl;
#endif
// field type
@@ -1466,7 +1466,7 @@ void DSP::u::SocketOutput::InputExecute(INPUT_EXECUTE_ARGS)
}
if (THIS->SocketInfoData_sent == false)
{
- DSP::log << "DSP::u::SocketOutput::InputExecute" << DSP::e::LogMode::second << "THIS->SendConnectionData" << endl;
+ DSP::log << "DSP::u::SocketOutput::InputExecute" << DSP::e::LogMode::second << "THIS->SendConnectionData" << std::endl;
THIS->SocketInfoData_sent = THIS->SendConnectionData();
}
diff --git a/src/cpp/WMM_support.cpp b/src/cpp/WMM_support.cpp
index 44042e5..484964b 100644
--- a/src/cpp/WMM_support.cpp
+++ b/src/cpp/WMM_support.cpp
@@ -49,7 +49,7 @@ void CALLBACK DSP::WMM_object_t::waveOutProc(HWAVEOUT hwo, UINT uMsg,
DSP::u::AudioOutput *Current;
bool AllDone;
int ind;
- string tekst;
+ std::string tekst;
Current = AudioObjects[dwInstance];
@@ -57,19 +57,19 @@ void CALLBACK DSP::WMM_object_t::waveOutProc(HWAVEOUT hwo, UINT uMsg,
{
case WOM_OPEN:
DSP::log << "DSP::WMM_object_t::waveOutProc" << DSP::e::LogMode::second
- << "WOM_OPEN(" << (int)dwInstance << ")" << endl;
+ << "WOM_OPEN(" << (int)dwInstance << ")" << std::endl;
break;
case WOM_CLOSE:
DSP::log << "DSP::WMM_object_t::waveOutProc" << DSP::e::LogMode::second
- << "WOM_CLOSE(" << (int)dwInstance << ")" << endl;
+ << "WOM_CLOSE(" << (int)dwInstance << ")" << std::endl;
break;
case WOM_DONE:
DSP::log << "DSP::WMM_object_t::waveOutProc" << DSP::e::LogMode::second
- << "WOM_DONE(" << (int)dwInstance << ")" << endl;
+ << "WOM_DONE(" << (int)dwInstance << ")" << std::endl;
if (Current->StopPlayback)
{
- DSP::log << "DSP::WMM_object_t::waveOutProc" << DSP::e::LogMode::second << "StopPlayback is set" << endl;
+ DSP::log << "DSP::WMM_object_t::waveOutProc" << DSP::e::LogMode::second << "StopPlayback is set" << std::endl;
return;
}
else
@@ -78,7 +78,7 @@ void CALLBACK DSP::WMM_object_t::waveOutProc(HWAVEOUT hwo, UINT uMsg,
for (ind=0; ind < DSP_NoOfAudioOutputBuffers; ind++)
AllDone &= (Current->waveHeaderOut[ind].dwFlags & WHDR_DONE);
if (AllDone)
- DSP::log << "DSP::WMM_object_t::waveOutProc" << DSP::e::LogMode::second << "All buffers had been used - nothing to play" << endl;
+ DSP::log << "DSP::WMM_object_t::waveOutProc" << DSP::e::LogMode::second << "All buffers had been used - nothing to play" << std::endl;
}
break;
}
@@ -91,35 +91,35 @@ void DSP::WMM_object_t::log_driver_data() {
/*
int val;
- DSP::log << "WMM library version: " << SND_LIB_VERSION_STR << endl;
+ DSP::log << "WMM library version: " << SND_LIB_VERSION_STR << std::endl;
- DSP::log << endl;
- DSP::log << "PCM stream types:" << endl;
+ DSP::log << std::endl;
+ DSP::log << "PCM stream types:" << std::endl;
for (val = 0; val <= SND_PCM_STREAM_LAST; val++)
- DSP::log << " " << snd_pcm_stream_name((snd_pcm_stream_t)val) << endl;
+ DSP::log << " " << snd_pcm_stream_name((snd_pcm_stream_t)val) << std::endl;
- DSP::log << endl;
- DSP::log << "PCM access types:" << endl;
+ DSP::log << std::endl;
+ DSP::log << "PCM access types:" << std::endl;
for (val = 0; val <= SND_PCM_ACCESS_LAST; val++)
- DSP::log << " " << snd_pcm_access_name((snd_pcm_access_t)val) << endl;
+ DSP::log << " " << snd_pcm_access_name((snd_pcm_access_t)val) << std::endl;
- DSP::log << endl;
- DSP::log << "PCM formats:" << endl;
+ DSP::log << std::endl;
+ DSP::log << "PCM formats:" << std::endl;
for (val = 0; val <= SND_PCM_FORMAT_LAST; val++)
if (snd_pcm_format_name((snd_pcm_format_t)val) != NULL)
DSP::log << " " << snd_pcm_format_name((snd_pcm_format_t)val) <<
- "(" << snd_pcm_format_description((snd_pcm_format_t)val) << ")" << endl;
+ "(" << snd_pcm_format_description((snd_pcm_format_t)val) << ")" << std::endl;
- DSP::log << endl;
- DSP::log << "PCM subformats:" << endl;
+ DSP::log << std::endl;
+ DSP::log << "PCM subformats:" << std::endl;
for (val = 0; val <= SND_PCM_SUBFORMAT_LAST; val++)
DSP::log << " " << snd_pcm_subformat_name((snd_pcm_subformat_t)val) <<
- "(" << snd_pcm_subformat_description((snd_pcm_subformat_t)val) << ")" << endl;
+ "(" << snd_pcm_subformat_description((snd_pcm_subformat_t)val) << ")" << std::endl;
- DSP::log << endl;
- DSP::log << "PCM states:" << endl;
+ DSP::log << std::endl;
+ DSP::log << "PCM states:" << std::endl;
for (val = 0; val <= SND_PCM_STATE_LAST; val++)
- DSP::log << " " << snd_pcm_state_name((snd_pcm_state_t)val) << endl;
+ DSP::log << " " << snd_pcm_state_name((snd_pcm_state_t)val) << std::endl;
*/
}
@@ -176,7 +176,7 @@ bool DSP::WMM_object_t::is_device_recording(void) {
long DSP::WMM_object_t::open_PCM_device_4_input(const int &no_of_channels, int no_of_bits, const long &sampling_rate, const long &audio_inbuffer_size) {
if (is_device_input_open)
{
- DSP::log << "DSP::WMM_object_t::open_PCM_device_4_input" << DSP::e::LogMode::second << "Device has been already opened: closing device before reopening" << endl;
+ DSP::log << "DSP::WMM_object_t::open_PCM_device_4_input" << DSP::e::LogMode::second << "Device has been already opened: closing device before reopening" << std::endl;
close_PCM_device_input();
}
@@ -282,7 +282,7 @@ long DSP::WMM_object_t::open_PCM_device_4_input(const int &no_of_channels, int n
long DSP::WMM_object_t::open_PCM_device_4_output(const int &no_of_channels, int no_of_bits, const long &sampling_rate, const long &audio_outbuffer_size) {
if (is_device_output_open)
{
- DSP::log << "DSP::WMM_object_t::open_PCM_device_4_output" << DSP::e::LogMode::second << "Device has been already opened: closing device before reopening" << endl;
+ DSP::log << "DSP::WMM_object_t::open_PCM_device_4_output" << DSP::e::LogMode::second << "Device has been already opened: closing device before reopening" << std::endl;
close_PCM_device_output(false);
}
@@ -377,7 +377,7 @@ bool DSP::WMM_object_t::close_PCM_device_input(void) {
DSP::f::AudioCheckError(result);
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "DSP::u::AudioInput" << DSP::e::LogMode::second << "Closing DSP::u::AudioInput" << endl;
+ DSP::log << "DSP::u::AudioInput" << DSP::e::LogMode::second << "Closing DSP::u::AudioInput" << std::endl;
#endif
result=waveInClose(hWaveIn);
while (result==WAVERR_STILLPLAYING)
@@ -388,7 +388,7 @@ bool DSP::WMM_object_t::close_PCM_device_input(void) {
// sleep(100);
// #endif
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "DSP::u::AudioInput" << DSP::e::LogMode::second << "Closing DSP::u::AudioInput" << endl;
+ DSP::log << "DSP::u::AudioInput" << DSP::e::LogMode::second << "Closing DSP::u::AudioInput" << std::endl;
#endif
result=waveInClose(hWaveIn);
}
@@ -439,14 +439,14 @@ bool DSP::WMM_object_t::close_PCM_device_output(const bool &do_drain) {
}
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "DSP::u::AudioOutput" << DSP::e::LogMode::second << "Closing DSP::u::AudioOutput" << endl;
+ DSP::log << "DSP::u::AudioOutput" << DSP::e::LogMode::second << "Closing DSP::u::AudioOutput" << std::endl;
#endif
result=waveOutClose(hWaveOut);
while (result==WAVERR_STILLPLAYING)
{
DSP::f::Sleep(100);
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "DSP::u::AudioOutput" << DSP::e::LogMode::second << "Closing DSP::u::AudioOutput" << endl;
+ DSP::log << "DSP::u::AudioOutput" << DSP::e::LogMode::second << "Closing DSP::u::AudioOutput" << std::endl;
#endif
result=waveOutClose(hWaveOut);
}
@@ -461,7 +461,7 @@ bool DSP::WMM_object_t::close_PCM_device_output(const bool &do_drain) {
#endif
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "WMM PCM sound closed" << endl;
+ DSP::log << "WMM PCM sound closed" << std::endl;
#endif
is_device_input_open = false;
@@ -474,11 +474,11 @@ bool DSP::WMM_object_t::close_PCM_device_output(const bool &do_drain) {
bool DSP::WMM_object_t::start_recording(void) {
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "DSP::u::AudioInput::Execute" << DSP::e::LogMode::second << "Starting recording using two wave buffers" << endl;
+ DSP::log << "DSP::u::AudioInput::Execute" << DSP::e::LogMode::second << "Starting recording using two wave buffers" << std::endl;
#endif
// if (get_input_callback_object() == NULL) {
- // DSP::log << DSP::e::LogMode::Error << "DSP::WMM_object_t::start_recording" << DSP::e::LogMode::second << "No AudioInput object registered for callbacks" << endl;
+ // DSP::log << DSP::e::LogMode::Error << "DSP::WMM_object_t::start_recording" << DSP::e::LogMode::second << "No AudioInput object registered for callbacks" << std::endl;
// return false;
// }
@@ -533,7 +533,7 @@ bool DSP::WMM_object_t::get_wave_in_raw_buffer(DSP::e::SampleType &InSampleType_
{
#ifdef __DEBUG__
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "DSP::WMM_object_t::get_wave_in_raw_buffer" << DSP::e::LogMode::second << "Wrong audio frame ready or other unexpected error" << endl;
+ DSP::log << "DSP::WMM_object_t::get_wave_in_raw_buffer" << DSP::e::LogMode::second << "Wrong audio frame ready or other unexpected error" << std::endl;
#endif
#endif
return false;
@@ -552,7 +552,7 @@ long DSP::WMM_object_t::append_playback_buffer(DSP::Float_vector &float_buffer)
// Send float_buffer to the audio device
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "DSP::WMM_object_t::append_playback_buffer" << DSP::e::LogMode::second << "Flushing output buffer" << endl;
+ DSP::log << "DSP::WMM_object_t::append_playback_buffer" << DSP::e::LogMode::second << "Flushing output buffer" << std::endl;
#endif
while (1)
@@ -642,7 +642,7 @@ long DSP::WMM_object_t::append_playback_buffer(DSP::Float_vector &float_buffer)
{
// Sleep(10);
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "DSP::WMM_object_t::append_playback_buffer" << DSP::e::LogMode::second << "Waiting for free output buffer" << endl;
+ DSP::log << "DSP::WMM_object_t::append_playback_buffer" << DSP::e::LogMode::second << "Waiting for free output buffer" << std::endl;
#endif
DSP::f::Sleep(0);
}
@@ -665,7 +665,7 @@ void CALLBACK DSP::WMM_object_t::waveInProc(HWAVEIN hwi, UINT uMsg,
DSP::WMM_object_t *Current;
#ifdef __DEBUG__
#ifdef AUDIO_DEBUG_MESSAGES_ON
- stringstream tekst;
+ std::stringstream tekst;
#endif
#endif
@@ -679,11 +679,11 @@ void CALLBACK DSP::WMM_object_t::waveInProc(HWAVEIN hwi, UINT uMsg,
#ifdef AUDIO_DEBUG_MESSAGES_ON
case WIM_OPEN:
DSP::log << "DSP::u::AudioInput::waveInProc" << DSP::e::LogMode::second
- << "WIM_OPEN(" << (int)dwInstance << ")" << endl;
+ << "WIM_OPEN(" << (int)dwInstance << ")" << std::endl;
break;
case WIM_CLOSE:
DSP::log << "DSP::u::AudioInput::waveInProc" << DSP::e::LogMode::second
- << "WIM_CLOSE(" << (int)dwInstance << ")" << endl;
+ << "WIM_CLOSE(" << (int)dwInstance << ")" << std::endl;
break;
#endif
#endif
@@ -692,7 +692,7 @@ void CALLBACK DSP::WMM_object_t::waveInProc(HWAVEIN hwi, UINT uMsg,
#ifdef __DEBUG__
#ifdef AUDIO_DEBUG_MESSAGES_ON
DSP::log << "DSP::u::AudioInput::waveInProc" << DSP::e::LogMode::second
- << "WIM_DATA(" << (int)dwInstance << ")" << endl;
+ << "WIM_DATA(" << (int)dwInstance << ")" << std::endl;
#endif
#endif
if (Current->StopRecording)
@@ -711,7 +711,7 @@ void CALLBACK DSP::WMM_object_t::waveInProc(HWAVEIN hwi, UINT uMsg,
// ignore data
#ifdef __DEBUG__
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "DSP::u::AudioInput::waveInProc" << DSP::e::LogMode::second << "All buffers had been used - skipping input audio frame" << endl;
+ DSP::log << "DSP::u::AudioInput::waveInProc" << DSP::e::LogMode::second << "All buffers had been used - skipping input audio frame" << std::endl;
#endif
#endif
}
@@ -730,7 +730,7 @@ void CALLBACK DSP::WMM_object_t::waveInProc(HWAVEIN hwi, UINT uMsg,
{
#ifdef __DEBUG__
#ifdef AUDIO_DEBUG_MESSAGES_ON
- DSP::log << "DSP::u::AudioInput::waveInProc" << DSP::e::LogMode::second << "Wrong audio frame ready or other unexpected error" << endl;
+ DSP::log << "DSP::u::AudioInput::waveInProc" << DSP::e::LogMode::second << "Wrong audio frame ready or other unexpected error" << std::endl;
#endif
#endif
}
diff --git a/src/include/DSP_AudioMixer.h b/src/include/DSP_AudioMixer.h
index 5807843..16bf3ea 100644
--- a/src/include/DSP_AudioMixer.h
+++ b/src/include/DSP_AudioMixer.h
@@ -26,7 +26,6 @@
#endif
#include <string>
-using namespace std;
//---------------------------------------------------------------------------
#include <DSP_setup.h>
@@ -59,26 +58,26 @@ class TAudioMixer
public:
//! returns number of currently available WaveIn devices or -1 if not supported in current configuration
static long GetNoOfWaveInDevices(void);
- static string GetWaveInDevName(UINT DevNo=WAVE_MAPPER );
+ static std::string GetWaveInDevName(UINT DevNo=WAVE_MAPPER );
//! returns number of currently available WaveOut devices or -1 if not supported in current configuration
static long GetNoOfWaveOutDevices(void);
- static string GetWaveOutDevName(UINT DevNo=WAVE_MAPPER );
+ static std::string GetWaveOutDevName(UINT DevNo=WAVE_MAPPER );
bool MixerSupported;
//! true if there is global mixer or multiplexer for input lines
bool InputMixer_support;
- static const string PCMwaveFileName;
+ static const std::string PCMwaveFileName;
static const DWORD Types[];
- static const string TypesNames[];
- static const string ComponentNames[];
+ static const std::string TypesNames[];
+ static const std::string ComponentNames[];
static const DWORD ComponentTypes[];
// AnsiString MixerName;
- string Input_MixerName;
- string Output_MixerName;
- string Input_Output_MixerName;
+ std::string Input_MixerName;
+ std::string Output_MixerName;
+ std::string Input_Output_MixerName;
int Mixer_InputLinesNumber; //! Number of input lines supported by soundcard
@@ -144,8 +143,8 @@ class TAudioMixer
bool MixerSettingsMemorized_WAVEIN;
bool MixerSettingsMemorized_OUT;
- static const string GetMixerControlType(DWORD dwControlType);
- static const string GetMixerComponentType(DWORD dwComponentType);
+ static const std::string GetMixerControlType(DWORD dwControlType);
+ static const std::string GetMixerComponentType(DWORD dwComponentType);
bool PCMwaveFileActive;
double PCMwaveFileActiveValue;
@@ -160,21 +159,21 @@ class TAudioMixer
// void TestInfo(TStrings *Lines);
// AnsiString GetMixerName(void);
- string GetMixerName(void);
+ std::string GetMixerName(void);
- //! Returns empty string on failure
- string GetSourceLineName(int ind);
+ //! Returns empty std::string on failure
+ std::string GetSourceLineName(int ind);
DWORD GetSourceLineType(int ind);
int GetNumberOfSourceLines(void);
- //! Returns empty string on failure
- string GetDestLineName(int ind);
+ //! Returns empty std::string on failure
+ std::string GetDestLineName(int ind);
DWORD GetDestLineType(int ind);
int GetNumberOfDestLines(void);
int GetActiveSourceLine(void);
void SetActiveSourceLine(int ActiveNo);
- void SetActiveSourceLine(string ActiveName);
+ void SetActiveSourceLine(std::string ActiveName);
void SetSourceLineState(int LineNo, bool IsActive);
//! gets active source line volume
/*! - returns vol in range [0, 1] on success
diff --git a/src/include/DSP_IO.h b/src/include/DSP_IO.h
index d87e1ae..9fec38b 100644
--- a/src/include/DSP_IO.h
+++ b/src/include/DSP_IO.h
@@ -69,18 +69,18 @@ namespace DSP {
//! DSPElib sub-namespace for special functions
namespace f {
- unsigned long ReadCoefficientsFromFile(DSP::Float_vector &Buffer, unsigned long N, const string &FileName, const string &FileDir, DSP::e::SampleType type, unsigned long offset);
- unsigned long ReadCoefficientsFromFile(DSP::Complex_vector &Buffer, unsigned long N, const string &FileName, const string &FileDir, DSP::e::SampleType type, unsigned long offset);
- bool GetWAVEfileParams(const string &FileName, const string &FileDir, T_WAVEchunk_ptr WAVEparams);
+ unsigned long ReadCoefficientsFromFile(DSP::Float_vector &Buffer, unsigned long N, const std::string &FileName, const std::string &FileDir, DSP::e::SampleType type, unsigned long offset);
+ unsigned long ReadCoefficientsFromFile(DSP::Complex_vector &Buffer, unsigned long N, const std::string &FileName, const std::string &FileDir, DSP::e::SampleType type, unsigned long offset);
+ bool GetWAVEfileParams(const std::string &FileName, const std::string &FileDir, T_WAVEchunk_ptr WAVEparams);
//! Determines file type by filename extension
- DSP::e::FileType FileExtToFileType(const string &filename);
+ DSP::e::FileType FileExtToFileType(const std::string &filename);
//! This function adds the ability to get wav file params before DSP::Block creation
/*! Returns false if the file cannot be opened.
*
* \ingroup load_func
*/
- bool GetWAVEfileParams(const string &FileName, const string &FileDir, T_WAVEchunk_ptr WAVEparams);
+ bool GetWAVEfileParams(const std::string &FileName, const std::string &FileDir, T_WAVEchunk_ptr WAVEparams);
//! returns audio buffer size for given Fs based on reference values given for DSP::ReferenceFs
uint32_t GetAudioBufferSize(const unsigned long &SamplingFreq, const DSP::e::AudioBufferType &type);
@@ -125,7 +125,7 @@ namespace DSP {
* \ingroup load_func
*/
unsigned long DSP::f::ReadCoefficientsFromFile(DSP::Float_vector &Buffer, unsigned long N,
- const string &FileName, const string &FileDir,
+ const std::string &FileName, const std::string &FileDir,
DSP::e::SampleType type=DSP::e::SampleType::ST_float,
unsigned long offset=0);
@@ -169,7 +169,7 @@ namespace DSP {
// zeruj stan
void clear();
- friend bool DSP::f::GetWAVEfileParams(const string &FileName, const string &FileDir, T_WAVEchunk_ptr WAVEparams);
+ friend bool DSP::f::GetWAVEfileParams(const std::string &FileName, const std::string &FileDir, T_WAVEchunk_ptr WAVEparams);
private:
int strncmpi(const char* str1, const char* str2, int N);
@@ -332,8 +332,8 @@ class DSP::u::WaveInput : public DSP::File, public DSP::Source//: public CAudioI
//FILE *hIn;
bool FileEnd;
DSP::T_WAVEchunk WAVEchunk;
- string FileName;
- string FileDir;
+ std::string FileName;
+ std::string FileDir;
uint32_t ReadBufferLen; // in bytes
std::vector<char> ReadBuffer;
@@ -368,7 +368,7 @@ class DSP::u::WaveInput : public DSP::File, public DSP::Source//: public CAudioI
public:
WaveInput(DSP::Clock_ptr ParentClock,
- const string &FileName_in, const string &FileDir_in,
+ const std::string &FileName_in, const std::string &FileDir_in,
unsigned int OutputsNo=1); //just one channel
~WaveInput(void);
@@ -442,7 +442,7 @@ class DSP::u::FileInput : public DSP::File, public DSP::Source
* Can be used between calls to DSP::Clock::execute
* or in blocks' callbacks.
*/
- bool OpenFile(const string &FileName,
+ bool OpenFile(const std::string &FileName,
DSP::e::SampleType sample_type=DSP::e::SampleType::ST_float,
DSP::e::FileType FILEtype = DSP::e::FileType::FT_raw,
unsigned int Default_NoOfFileChannels = 0);
@@ -451,7 +451,7 @@ class DSP::u::FileInput : public DSP::File, public DSP::Source
/*! NoOfChannels == 0 - autodetect no of channels
*/
FileInput(DSP::Clock_ptr ParentClock,
- const string &FileName,
+ const std::string &FileName,
unsigned int NoOfChannels = 1U,
DSP::e::SampleType sample_type=DSP::e::SampleType::ST_float,
DSP::e::FileType FILEtype = DSP::e::FileType::FT_raw
@@ -585,14 +585,14 @@ class DSP::u::FileOutput : public DSP::File, public DSP::Block
void FlushBuffer(void);
void raw_FlushBuffer(void);
- bool Open(const string &FileName, DSP::e::SampleType sample_type=DSP::e::SampleType::ST_float,
+ bool Open(const std::string &FileName, DSP::e::SampleType sample_type=DSP::e::SampleType::ST_float,
unsigned int NoOfChannels=1, DSP::e::FileType file_type=DSP::e::FileType::FT_raw,
long int sampling_rate = -1);
void Close(void);
//! true if file must be reopen in current clock cycle
bool ReOpenFile;
- string ReOpen_FileName;
+ std::string ReOpen_FileName;
DSP::e::SampleType ReOpen_SampleType;
DSP::e::FileType ReOpen_FileType;
unsigned long ReOpen_sampling_rate;
@@ -631,7 +631,7 @@ class DSP::u::FileOutput : public DSP::File, public DSP::Block
FileOutput(unsigned char NoOfChannels=1);
/*! \test constant inputs must be tested
*/
- FileOutput(const string &FileName,
+ FileOutput(const std::string &FileName,
DSP::e::SampleType sample_type=DSP::e::SampleType::ST_float,
unsigned int NoOfChannels=1,
DSP::e::FileType file_type=DSP::e::FileType::FT_raw,
@@ -683,7 +683,7 @@ class DSP::u::FileOutput : public DSP::File, public DSP::Block
* \note This function only marks output file to be reopened.
* All samples from current cycle will be stored in the old file.
*/
- void ReOpen(const string &FileName,
+ void ReOpen(const std::string &FileName,
DSP::e::SampleType sample_type=DSP::e::SampleType::ST_float,
DSP::e::FileType file_type=DSP::e::FileType::FT_raw,
long int sampling_rate = -1);
diff --git a/src/include/DSP_clocks.h b/src/include/DSP_clocks.h
index 95f2fc0..f0a2e9c 100644
--- a/src/include/DSP_clocks.h
+++ b/src/include/DSP_clocks.h
@@ -178,7 +178,7 @@ class DSP::Clock
* returns -1: no clock where found
*/
static long GetAlgorithmClocks(DSP::Clock_ptr ReferenceClock,
- vector<DSP::Clock_ptr> &ClocksList, bool FindSignalActivatedClocks = false);
+ std::vector<DSP::Clock_ptr> &ClocksList, bool FindSignalActivatedClocks = false);
private:
//8) Jednokierunkowa lista obiekt�w DSP::Clock
@@ -363,7 +363,7 @@ class DSP::Clock
*
*/
static void SchemeToDOTfile(DSP::Clock_ptr ReferenceClock,
- const string &dot_filename,
+ const std::string &dot_filename,
DSP::Macro_ptr DrawnMacro = NULL);
#ifdef __DEBUG__
@@ -373,12 +373,12 @@ class DSP::Clock
* in dot-file format. Called from DSP::Clock::SchemeToDOTfile
*/
bool ClockComponentsToDOTfile(std::ofstream &m_plik,
- vector<bool> &ComponentDoneTable, long max_components_number,
- vector<bool> &UsedMacrosTable, vector<DSP::Macro_ptr> &MacrosList,
- vector<bool> &UsedClocksTable, vector<DSP::Clock_ptr> &ClocksList,
+ std::vector<bool> &ComponentDoneTable, long max_components_number,
+ std::vector<bool> &UsedMacrosTable, std::vector<DSP::Macro_ptr> &MacrosList,
+ std::vector<bool> &UsedClocksTable, std::vector<DSP::Clock_ptr> &ClocksList,
DSP::Macro_ptr DrawnMacro);
bool ClockNotificationsToDOTfile(std::ofstream &dot_plik,
- vector<bool> &ComponentDoneTable, long max_components_number);
+ std::vector<bool> &ComponentDoneTable, long max_components_number);
//bool *UsedClocksTable, DSP::Clock_ptr *ClocksList, long clocks_number);
#endif
diff --git a/src/include/DSP_lib.h b/src/include/DSP_lib.h
index cab06de..b11c027 100644
--- a/src/include/DSP_lib.h
+++ b/src/include/DSP_lib.h
@@ -11,7 +11,7 @@
#define DSP_VER_MAJOR 0
#define DSP_VER_MINOR 20
-#define DSP_VER_BUILD 23 // !!! without zeroes before, else this will be treated as octal number
+#define DSP_VER_BUILD 24 // !!! without zeroes before, else this will be treated as octal number
#define DSP_VER_YEAR 2023
#define DSP_VER DSP_VER_MAJOR.DSP_VER_MINOR.DSP_VER_BUILD
@@ -37,7 +37,7 @@
namespace DSP {
struct libver;
DSP::libver lib_version(void);
- string lib_version_string();
+ std::string lib_version_string();
}
/*!
@@ -136,8 +136,8 @@ struct DSP::libver
* \todo consider omitting InputClocks memory reservation in release mode
*/
DSP::libver DSP::lib_version(void);
-//! Return DSP Engine library version information string.
-string DSP::lib_version_string();
+//! Return DSP Engine library version information std::string.
+std::string DSP::lib_version_string();
/* @} ver_data */
@@ -302,7 +302,7 @@ string DSP::lib_version_string();
*
* Library version can be checked using
* - ::DSP::lib_version function which returns DSP::libver structure
- * - ::DSP::lib_version_string function which returns string with version and copyright
+ * - ::DSP::lib_version_string function which returns std::string with version and copyright
* information
* .
*
@@ -683,11 +683,11 @@ string DSP::lib_version_string();
* .
* \section lib_LOG_usr User LOG messages
* - DSP::e::LogMode::Info, DSP::e::LogMode::Error, DSP::e::LogMode::first, DSP::e::LogMode::second
- * - DSP::log << "Hello" << DSP::e::LogMode::second << "This is echo !!!" << endl;
- * - DSP::log << DSP::e::LogMode::Error << "MAIN" << DSP::e::LogMode::second << "end" << endl;
+ * - DSP::log << "Hello" << DSP::e::LogMode::second << "This is echo !!!" << std::endl;
+ * - DSP::log << DSP::e::LogMode::Error << "MAIN" << DSP::e::LogMode::second << "end" << std::endl;
* .
* - DSP::e::LogMode::pause, DSP::e::LogMode::pause_off
- * - DSP::log << DSP::e::LogMode::pause << "Finished SolveMatrix test" << endl;
+ * - DSP::log << DSP::e::LogMode::pause << "Finished SolveMatrix test" << std::endl;
* .
* .
* \section lib_LOG_wx Working with wxWidgets
diff --git a/src/include/DSP_logstream.h b/src/include/DSP_logstream.h
index 16f8de8..3aa545f 100644
--- a/src/include/DSP_logstream.h
+++ b/src/include/DSP_logstream.h
@@ -18,14 +18,14 @@
namespace DSP
{
//! Pointer to the Message callback function
- /*! bool func(const string &source, const string &message, const bool IsError)
+ /*! bool func(const std::string &source, const std::string &message, const bool IsError)
* used in DSP::logstream::Message, DSP::logstream::ErrorMessage, DSP::logstream::InfoMessage
*
* If function returns true all other message logging
* actions will be abandoned. Message will be treated
* as local addressed only for callback function.
*/
- typedef bool (*Message_callback_ptr)(const string &, const string &, const bool);
+ typedef bool (*Message_callback_ptr)(const std::string &, const std::string &, const bool);
class logstream;
@@ -97,7 +97,7 @@
* If LOG file is open, it is closed and file_name is changed.
* New file will be created when next LOG message will be issued.
*/
- void SetLogFileName(const string &file_name);
+ void SetLogFileName(const std::string &file_name);
//! Sets/changes current user LOG Message processing function
void SetLogFunctionPtr(Message_callback_ptr function_ptr);
@@ -135,7 +135,7 @@
// template <class charT, class Traits>
// inline basic_ostream<charT,Traits>& operator<< (basic_ostream<charT,Traits>& os, const DSP::e::LogMode& log_mode) {
-inline ostream& operator<< (ostream& os, const DSP::e::LogMode& log_mode) {
+inline std::ostream& operator<< (std::ostream& os, const DSP::e::LogMode& log_mode) {
DSP::logstream *p;
try {
p = dynamic_cast<DSP::logstream*>(&os);
diff --git a/src/include/DSP_misc.h b/src/include/DSP_misc.h
index 6a88f16..a62f1ea 100644
--- a/src/include/DSP_misc.h
+++ b/src/include/DSP_misc.h
@@ -44,8 +44,6 @@
#include <fstream>
#include <string>
-using namespace std;
-
//---------------------------------------------------------------------------
#include <DSP_setup.h>
#include <DSP_logstream.h>
@@ -65,7 +63,7 @@ namespace DSP {
unsigned long gcd(unsigned long a, unsigned long b);
//! Solves matrix equation using Gaussian elimination with backsubstitution
- void SolveMatrixEqu(const vector<DSP::Float_vector> &A_in, //! square matrix of coefficients (table of rows)
+ void SolveMatrixEqu(const std::vector<DSP::Float_vector> &A_in, //! square matrix of coefficients (table of rows)
DSP::Float_vector &X, //!vector reserved for solution
const DSP::Float_vector &B_in); //!right-hand side quantities vector
@@ -73,7 +71,7 @@ namespace DSP {
/*! All calculations are internally done at high precision
*/
void SolveMatrixEqu_prec(
- const vector<DSP::Float_vector> &A_in, //!matrix coefficients (table of rows)
+ const std::vector<DSP::Float_vector> &A_in, //!matrix coefficients (table of rows)
DSP::Float_vector &X_in, //!vector reserved for solution
const DSP::Float_vector &B_in); //!right-hand side quantities vector
//! Solves matrix equation using Gaussian elimination with backward substitution
@@ -82,7 +80,7 @@ namespace DSP {
* \note use_pivoting = 0 should not be used
*/
void SolveMatrixEqu_prec(
- const vector<DSP::Prec_Float_vector> &A_in, //!matrix coefficients (table of rows)
+ const std::vector<DSP::Prec_Float_vector> &A_in, //!matrix coefficients (table of rows)
DSP::Prec_Float_vector &X_in, //!vector reserved for solution
const DSP::Prec_Float_vector &B_in, //!right-hand side quantities vector
int use_pivoting); //! pivoting mode: 0-none; 1-rows; 2-rows&cols
@@ -110,9 +108,9 @@ namespace DSP {
/*! \warning if parent_dir != NULL then it must exist.
* \warning Will create single subdirectory (no nested subdir creation)
*/
- bool MakeDir(const string &dir_name, const string &parent_dir = "");
+ bool MakeDir(const std::string &dir_name, const std::string &parent_dir = "");
//! Splits directory name into bits and tries to create it subdirectory by subdirectory
- void MakeDir_Ex(const string &dir_name);
+ void MakeDir_Ex(const std::string &dir_name);
//! Symbol error rate estimation for QPSK
@@ -236,7 +234,7 @@ namespace DSP {
* \f$x(x) = \frac{\sin({\pi}x)}{{\pi}x)}\f$
*/
template <typename T>
- void sinc(const DSP::Float_vector& arguments, vector<T> &output_buffer);
+ void sinc(const DSP::Float_vector& arguments, std::vector<T> &output_buffer);
//! Normalized sinc function
/*!
@@ -300,7 +298,7 @@ inline DSP::e::LoadCoef_Type DSP::e::operator|(DSP::e::LoadCoef_Type __a, DSP::e
class DSP::LoadCoef
{
public:
- string filename; // file name with path
+ std::string filename; // file name with path
unsigned char file_version;
@@ -362,7 +360,7 @@ class DSP::LoadCoef
*
* @return Returns false on error.
*/
- bool Open(const string &Filename, const string &Dir);
+ bool Open(const std::string &Filename, const std::string &Dir);
//! Checks Coefficients size for given vector
/*! \param vector_no = 0, 1, ...
diff --git a/src/include/DSP_modules.h b/src/include/DSP_modules.h
index 305ee04..8c2d8d5 100644
--- a/src/include/DSP_modules.h
+++ b/src/include/DSP_modules.h
@@ -23,8 +23,6 @@
#include <DSP_types.h>
#include <DSP_misc.h>
-using namespace std;
-
//#include <DSPclocks.h>
namespace DSP {
@@ -117,7 +115,7 @@ class DSP::output
static DSP::output _null;
//! output name
- string _name;
+ std::string _name;
public:
//! connects the given output to the given input
@@ -127,14 +125,14 @@ class DSP::output
friend bool ::operator>>( const DSP::output &output, const DSP::input &input );
//! read output name
- const string &get_name(void) const;
+ const std::string &get_name(void) const;
//! set output name
- void set_name(const string &name);
+ void set_name(const std::string &name);
//! pointer to the component with the given output
DSP::Component_ptr component;
//! indexes of output lines
- vector <unsigned int> Outputs;
+ std::vector <unsigned int> Outputs;
//! returns null output object
inline static DSP::output &null(){
@@ -161,7 +159,7 @@ class DSP::input
static DSP::input _null;
//! input name
- string _name;
+ std::string _name;
public:
//! connects the given output to the given input
@@ -171,14 +169,14 @@ class DSP::input
friend bool ::operator<<( const DSP::input &input, const DSP::output &output);
//! read input name
- const string &get_name(void) const;
+ const std::string &get_name(void) const;
//! set input name
- void set_name(const string &name);
+ void set_name(const std::string &name);
//! pointer to the component with the given output
DSP::Component_ptr component;
//! indexes of input lines
- vector <unsigned int> Inputs;
+ std::vector <unsigned int> Inputs;
//! returns null input object
inline static DSP::input &null(){
@@ -205,16 +203,16 @@ class DSP::name
private:
#if __DEBUG__ == 1
//! Name of the object
- string ObjectName;
+ std::string ObjectName;
#endif
public:
name(void);
- name(const string &Name);
+ name(const std::string &Name);
//! Sets the name of the block
- void SetName(const string &Name, bool Append=true);
+ void SetName(const std::string &Name, bool Append=true);
//! Returns the block's name
- string GetName();
+ std::string GetName();
};
// ***************************************************** //
@@ -726,8 +724,8 @@ class DSP::name
#ifdef __DEBUG__
namespace DSP {
- extern const vector<string> DOT_colors;
- extern const vector<string> DOT_edge_colors;
+ extern const std::vector<std::string> DOT_colors;
+ extern const std::vector<std::string> DOT_edge_colors;
}
#endif
@@ -917,7 +915,7 @@ class DSP::Component : public virtual DSP::name, public DSP::_connect_class
// //! counter containing the number of defined outputs
//unsigned int DefinedOutputsCounter;
//! pointer the the array containing pointer to defined outputs
- vector <DSP::output> DefinedOutputs;
+ std::vector <DSP::output> DefinedOutputs;
public:
//! creates output definition for the given block
@@ -926,17 +924,17 @@ class DSP::Component : public virtual DSP::name, public DSP::_connect_class
* e.g. separate components of complex output
* and complex output itself
*/
- bool DefineOutput(const string &Name, const unsigned int &OutputNo = 0);
- bool DefineOutput(const string &Name, const unsigned int &OutputNo_re, const unsigned int &OutputNo_im);
- bool DefineOutput(const string &Name, const vector<unsigned int> &Outputs);
+ bool DefineOutput(const std::string &Name, const unsigned int &OutputNo = 0);
+ bool DefineOutput(const std::string &Name, const unsigned int &OutputNo_re, const unsigned int &OutputNo_im);
+ bool DefineOutput(const std::string &Name, const std::vector<unsigned int> &Outputs);
//! Deletes output definition
/*! If Name.length() == 0 deletes all output definitions
*/
- bool UndefineOutput(const string &Name);
+ bool UndefineOutput(const std::string &Name);
//! returns output of the given name
- DSP::output &Output(const string &Name);
+ DSP::output &Output(const std::string &Name);
//! returns input of the given name
- virtual DSP::input &Input(const string &Name);
+ virtual DSP::input &Input(const std::string &Name);
protected:
//! Connects DSP::Block input to output of the current block
@@ -999,33 +997,33 @@ class DSP::Component : public virtual DSP::name, public DSP::_connect_class
#ifdef __DEBUG__
//! Returns component name used in DOTfile (empty on failure)
- string GetComponentName_DOTfile();
+ std::string GetComponentName_DOTfile();
/*! output_index - index of the rendered output
*/
- virtual string GetComponentEdgeParams_DOTfile(const unsigned int &output_index = 0U);
+ virtual std::string GetComponentEdgeParams_DOTfile(const unsigned int &output_index = 0U);
/*! generates component HMTL label and shape for DOT
*/
- static string GetHtmlNodeLabel_DOTfile(const unsigned long &no_of_inputs, const unsigned long &no_of_outputs, const string &node_name, const string &leading_space, const unsigned int &border_width);
+ static std::string GetHtmlNodeLabel_DOTfile(const unsigned long &no_of_inputs, const unsigned long &no_of_outputs, const std::string &node_name, const std::string &leading_space, const unsigned int &border_width);
//! Returns component node parameters used in DOTfile
- virtual string GetComponentNodeParams_DOTfile(const string &leading_space);
+ virtual std::string GetComponentNodeParams_DOTfile(const std::string &leading_space);
//! Returns component node parameters used in DOTfile
- virtual string GetComponentNodeParams_DOTfile(void);
+ virtual std::string GetComponentNodeParams_DOTfile(void);
//! Returns true if ports should be used for edges
virtual bool UsePorts_DOTfile(void);
//! Writes component edges to file
- void ComponentEdgesToDOTfile(std::ofstream &dot_plik, const string &this_name,
- vector<bool> &UsedMacrosTable, vector<DSP::Macro_ptr> &MacrosList,
+ void ComponentEdgesToDOTfile(std::ofstream &dot_plik, const std::string &this_name,
+ std::vector<bool> &UsedMacrosTable, std::vector<DSP::Macro_ptr> &MacrosList,
DSP::Macro_ptr DrawnMacro, unsigned int space_sep = 4);
/*! Returns source name in first_source_name if first_source_name != NULL.
* User must reserve memory for it beforehand.
*
*/
void ComponentToDOTfile(std::ofstream &dot_plik,
- vector<bool> &ComponentDoneTable, long max_components_number,
- vector<bool> &UsedMacrosTable, vector<DSP::Macro_ptr> &MacrosList,
- vector<bool> &UsedClocksTable, vector<DSP::Clock_ptr> &ClocksList,
+ std::vector<bool> &ComponentDoneTable, long max_components_number,
+ std::vector<bool> &UsedMacrosTable, std::vector<DSP::Macro_ptr> &MacrosList,
+ std::vector<bool> &UsedClocksTable, std::vector<DSP::Clock_ptr> &ClocksList,
DSP::Macro_ptr DrawnMacro = NULL,
DSP::Clock_ptr clock_ptr = NULL);
#endif
@@ -1034,7 +1032,7 @@ class DSP::Component : public virtual DSP::name, public DSP::_connect_class
/* Notifications support */
/****************************/
private:
- vector<DSP::Clock_ptr> NotificationClocks;
+ std::vector<DSP::Clock_ptr> NotificationClocks;
public:
//! Function called by main clocks' processing function at the begining of each cycle
/*! It is called only for registered components. It's executed for each
@@ -1047,7 +1045,7 @@ class DSP::Component : public virtual DSP::name, public DSP::_connect_class
#ifdef __DEBUG__
DSP::log << DSP::e::LogMode::Error << "DSP::Component::Notify";
DSP::log << DSP::e::LogMode::second << "Component >>" << GetName() << "<< registered for notifications but notification function not implemented !!!";
- DSP::log << endl;
+ DSP::log << std::endl;
#endif
return;
}
@@ -1195,8 +1193,8 @@ class DSP::Clock_trigger
// friend void DSP::Component::ComponentToDOTfile(std::ofstream &dot_plik,
//bool *ComponentDoneTable, long max_components_number,
//DSP::Clock_ptr clock_ptr);
- friend string DSP::Component::GetComponentNodeParams_DOTfile(const string &leading_space);
- friend string DSP::Component::GetComponentNodeParams_DOTfile(void);
+ friend std::string DSP::Component::GetComponentNodeParams_DOTfile(const std::string &leading_space);
+ friend std::string DSP::Component::GetComponentNodeParams_DOTfile(void);
#endif
protected:
@@ -1353,26 +1351,26 @@ class DSP::Block : public virtual DSP::Component
// //! counter containing the number of defined inputs
//unsigned int DefinedInputsCounter;
//! pointer the the array containing pointer to defined inputs
- vector<DSP::input> DefinedInputs;
+ std::vector<DSP::input> DefinedInputs;
public:
//! creates input definition for the given block
/*! Returns true if succeeds.
*/
- bool DefineInput(const string &Name, const unsigned int &InputNo = 0);
- bool DefineInput(const string &Name, const unsigned int &InputNo_re, const unsigned int &InputNo_im);
- bool DefineInput(const string &Name, const vector <unsigned int> &Inputs);
+ bool DefineInput(const std::string &Name, const unsigned int &InputNo = 0);
+ bool DefineInput(const std::string &Name, const unsigned int &InputNo_re, const unsigned int &InputNo_im);
+ bool DefineInput(const std::string &Name, const std::vector <unsigned int> &Inputs);
//! Deletes input definition
/*! If Name == NULL deletes all input definitions
*/
- bool UndefineInput(const string &Name);
+ bool UndefineInput(const std::string &Name);
//! returns input of the given name
- DSP::input &Input(const string &Name);
+ DSP::input &Input(const std::string &Name);
protected:
//! Clocks at which each input works
/*! This is only for the sake of structure syntax checking */
- vector<DSP::Clock_ptr> InputClocks;
+ std::vector<DSP::Clock_ptr> InputClocks;
DSP::clock_groups ClockGroups;
@@ -1437,9 +1435,9 @@ class DSP::Block : public virtual DSP::Component
*/
bool BlockAllowsForConstantInputs;
//! Values for constant inputs
- vector<DSP::Float> ConstantInputValues;
+ std::vector<DSP::Float> ConstantInputValues;
//! true is given value is constant
- vector<bool> IsConstantInput;
+ std::vector<bool> IsConstantInput;
//!Sets number of inputs
/*!Parameters are: number of real inputs, number of complex inputs
@@ -1495,7 +1493,7 @@ class DSP::Block : public virtual DSP::Component
* Replaces obsolete function:
* bool SetConstInput(int InputNo, DSP::Float value);
*/
- bool SetConstInput(const string &InputName, DSP::Float value);
+ bool SetConstInput(const std::string &InputName, DSP::Float value);
/*! Indicates given input as constant value
* InputNo -> real_value
* InputNo+1 -> imag_value
@@ -1506,8 +1504,8 @@ class DSP::Block : public virtual DSP::Component
* Replaces obsolete function:
* bool SetConstInput(int InputNo, DSP::Float real_value, DSP::Float imag_value);
*/
- bool SetConstInput(const string &InputName, DSP::Float real_value, DSP::Float imag_value);
- bool SetConstInput(const string &InputName, DSP::Complex value)
+ bool SetConstInput(const std::string &InputName, DSP::Float real_value, DSP::Float imag_value);
+ bool SetConstInput(const std::string &InputName, DSP::Complex value)
{
return SetConstInput(InputName, value.re, value.im);
}
@@ -1536,7 +1534,7 @@ class DSP::Block : public virtual DSP::Component
#ifndef __DEBUG__
UNUSED_ARGUMENT(block);
#else
- stringstream tekst;
+ std::stringstream tekst;
if (block == &DummyBlock)
{
tekst << "WARNING: Unconnected output detected (" << Caller->GetName() << ")";
@@ -1546,7 +1544,7 @@ class DSP::Block : public virtual DSP::Component
tekst << "WARNING: Block uses DummyExecute. Check block constructor if Execute_ptr is set correctly ("
<< Caller->GetName() << ")";
}
- DSP::log << DSP::e::LogMode::Error << "DSP::Block::Execute" << DSP::e::LogMode::second << tekst.str() << endl;
+ DSP::log << DSP::e::LogMode::Error << "DSP::Block::Execute" << DSP::e::LogMode::second << tekst.str() << std::endl;
#endif
}
@@ -1637,7 +1635,7 @@ class DSP::Source : public virtual DSP::Component
DSP::log << DSP::e::LogMode::Error << "DSP::Block::Execute"
<< DSP::e::LogMode::Error
<< "WARNING: Source uses DummyExecute. Check source constructor if OutputExecute_ptr is set correctly ("
- << source->GetName() << ")" << endl;
+ << source->GetName() << ")" << std::endl;
#endif
return true;
}
@@ -1726,7 +1724,7 @@ class DSP::MacroStack
* \warning The user must free MacroList table allocated
* by this function on his own.
*/
- static unsigned int GetCurrentMacroList(vector<DSP::Macro_ptr> &MacrosList);
+ static unsigned int GetCurrentMacroList(std::vector<DSP::Macro_ptr> &MacrosList);
};
//! User can derive class from this block to group several DSP components into single macro component
@@ -1758,10 +1756,10 @@ class DSP::MacroStack
class DSP::Macro : public virtual DSP::name
{
#ifdef __DEBUG__
- friend void DSP::Component::ComponentEdgesToDOTfile(std::ofstream &, const string &,
- vector<bool> &, vector<DSP::Macro_ptr> &, DSP::Macro_ptr, unsigned int);
- friend string DSP::Component::GetHtmlNodeLabel_DOTfile(const unsigned long &, const unsigned long &,
- const string &, const string &, const unsigned int &);
+ friend void DSP::Component::ComponentEdgesToDOTfile(std::ofstream &, const std::string &,
+ std::vector<bool> &, std::vector<DSP::Macro_ptr> &, DSP::Macro_ptr, unsigned int);
+ friend std::string DSP::Component::GetHtmlNodeLabel_DOTfile(const unsigned long &, const unsigned long &,
+ const std::string &, const std::string &, const unsigned int &);
#endif
private:
@@ -1796,15 +1794,15 @@ class DSP::Macro : public virtual DSP::name
DSP::u::Copy_ptr MacroOutput_block;
//! returns internal output of the macro input of the given name
- DSP::output &MacroInput(const string &Name);
+ DSP::output &MacroInput(const std::string &Name);
//! returns internal input of the macro output of the given name
- DSP::input &MacroOutput(const string &Name);
+ DSP::input &MacroOutput(const std::string &Name);
public:
//! returns macro output of the given name
- DSP::output &Output(const string &Name);
+ DSP::output &Output(const std::string &Name);
//! returns external macro input of the given name
- DSP::input &Input(const string &Name);
+ DSP::input &Input(const std::string &Name);
//! Returns macro input line number connected to the given macro block input
/*! Returns FO_NoInput if not connected to the macro input
@@ -1814,20 +1812,20 @@ class DSP::Macro : public virtual DSP::name
//! creates input definition for macro input (internal and external)
/*! Returns true if succeeds.
*/
- bool DefineInput(const string &Name, const unsigned int &InputNo = 0);
- bool DefineInput(const string &Name, const unsigned int &InputNo_re, const unsigned int &InputNo_im);
- bool DefineInput(const string &Name, const vector<unsigned int> &Inputs);
+ bool DefineInput(const std::string &Name, const unsigned int &InputNo = 0);
+ bool DefineInput(const std::string &Name, const unsigned int &InputNo_re, const unsigned int &InputNo_im);
+ bool DefineInput(const std::string &Name, const std::vector<unsigned int> &Inputs);
//! Deletes input definition
- bool UndefineInput(const string &Name = "");
+ bool UndefineInput(const std::string &Name = "");
//! creates output definition for macro output (internal and external)
/*! Returns true if succeeds
*/
- bool DefineOutput(const string &Name, const unsigned int &OutputNo = 0);
- bool DefineOutput(const string &Name, const unsigned int &OutputNo_re, const unsigned int &OutputNo_im);
- bool DefineOutput(const string &Name, vector<unsigned int> &Outputs);
+ bool DefineOutput(const std::string &Name, const unsigned int &OutputNo = 0);
+ bool DefineOutput(const std::string &Name, const unsigned int &OutputNo_re, const unsigned int &OutputNo_im);
+ bool DefineOutput(const std::string &Name, std::vector<unsigned int> &Outputs);
//! Deletes output definition
- bool UndefineOutput(const string &Name = "");
+ bool UndefineOutput(const std::string &Name = "");
//! Returns clock assigned to macro external output number OutputNo
DSP::Clock_ptr GetOutputClock(unsigned int OutputNo=0);
@@ -1866,7 +1864,7 @@ class DSP::Macro : public virtual DSP::name
* \note All macro components should be created in derived class destructor
* between calls to DSP::Macro::MacroInitStarted and DSP::Macro::MacroInitFinished.
*/
- Macro(const string ¯o_name,
+ Macro(const std::string ¯o_name,
unsigned int NoOfInputs_in,
unsigned int NoOfOutputs_in);
//! Macro container clean up
@@ -1899,24 +1897,24 @@ class DSP::Macro : public virtual DSP::name
#ifdef __DEBUG__
private:
//! Returns macro node parames used in DOTfile
- string GetMacroNodeParams_DOTfile();
+ std::string GetMacroNodeParams_DOTfile();
//! used in macro graph to draw input node
- string GetMacroInputNodeParams_DOTfile();
+ std::string GetMacroInputNodeParams_DOTfile();
//! used in macro graph to draw output node
- string GetMacroOutputNodeParams_DOTfile();
+ std::string GetMacroOutputNodeParams_DOTfile();
//! Draws macro node edges
- string GetMacroEdgeParams_DOTfile(const unsigned int &output_index);
+ std::string GetMacroEdgeParams_DOTfile(const unsigned int &output_index);
bool UsePorts_DOTfile(void);
//! Writes macro outgoing edges to file
- void MacroEdgesToDOTfile(std::ofstream &dot_plik, const string ¯o_name,
+ void MacroEdgesToDOTfile(std::ofstream &dot_plik, const std::string ¯o_name,
DSP::Macro_ptr DrawnMacro, unsigned int space_sep = 4);
- void MacroInputEdgesToDOTfile(std::ofstream &dot_plik, const string ¯o_input_name,
+ void MacroInputEdgesToDOTfile(std::ofstream &dot_plik, const std::string ¯o_input_name,
DSP::Macro_ptr DrawnMacro, unsigned int space_sep = 4);
- void MacroOutputEdgesToDOTfile(std::ofstream &dot_plik, const string ¯o_output_name,
+ void MacroOutputEdgesToDOTfile(std::ofstream &dot_plik, const std::string ¯o_output_name,
DSP::Macro_ptr DrawnMacro, unsigned int space_sep = 4);
//! Returns macro name used in DOTfile
- string GetMacroName_DOTfile();
+ std::string GetMacroName_DOTfile();
#endif
};
@@ -1962,13 +1960,13 @@ class DSP::u::LoopDelay : public DSP::Block, public DSP::Source
* equal to size of the delay
* \param state_buffer - buffer with initial values
*/
- bool SetState(const string &InputName, unsigned int size, DSP::Float_ptr state_buffer);
+ bool SetState(const std::string &InputName, unsigned int size, DSP::Float_ptr state_buffer);
//! Sets internal state for delay line related to given input
/*! State buffer size (block delay) must equal one.
* \param InputName - must be name of real valued input line
* \param state_buffer_value - buffer with initial values
*/
- bool SetState(const string &InputName, DSP::Float state_buffer_value);
+ bool SetState(const std::string &InputName, DSP::Float state_buffer_value);
};
//! Delay element implemented in processing mode
@@ -2034,9 +2032,9 @@ class DSP::u::Splitter : public DSP::Block
#ifdef __DEBUG__
private:
bool UsePorts_DOTfile(void);
- string GetComponentNodeParams_DOTfile(const string &leading_space);
- string GetComponentNodeParams_DOTfile(void);
- string GetComponentEdgeParams_DOTfile(const unsigned int &output_index);
+ std::string GetComponentNodeParams_DOTfile(const std::string &leading_space);
+ std::string GetComponentNodeParams_DOTfile(void);
+ std::string GetComponentEdgeParams_DOTfile(const unsigned int &output_index);
#endif
public:
diff --git a/src/include/DSP_modules2.h b/src/include/DSP_modules2.h
index f26afcb..826789d 100644
--- a/src/include/DSP_modules2.h
+++ b/src/include/DSP_modules2.h
@@ -290,7 +290,7 @@ class DSP::u::Farrow : public DSP::Block, public DSP::Source
* \param InputClock clock for input signal
* \param OutputClock clock for output signal
*/
- Farrow(const bool &IsComplex, const vector<DSP::Float_vector> &Farrow_coefs_in,
+ Farrow(const bool &IsComplex, const std::vector<DSP::Float_vector> &Farrow_coefs_in,
const DSP::Clock_ptr &InputClock, const DSP::Clock_ptr &OutputClock);
~Farrow(void);
@@ -516,8 +516,8 @@ class DSP::u::Serial2Parallel : public DSP::Block, public DSP::Source
static bool OutputExecute(OUTPUT_EXECUTE_ARGS);
int no_of_parallel_outputs; //! number of inputs cycles before the output is generated
- vector<DSP::Float> inputs; //! vector for input samples
- vector<DSP::Float> outputs; //! vector for input samples
+ std::vector<DSP::Float> inputs; //! vector for input samples
+ std::vector<DSP::Float> outputs; //! vector for input samples
bool output_ready; //! set true when all inputs are collected in inputs vector
int current_cycle_no; // 0, 1, ..., no_of_inputs_per_output-1
public:
@@ -525,7 +525,7 @@ class DSP::u::Serial2Parallel : public DSP::Block, public DSP::Source
Serial2Parallel(const DSP::Clock_ptr &InputClock,
const unsigned int &NoOfParallelOutputs,
const unsigned int &NoOfLinesPerInput=1,
- const vector<DSP::Float> &first_output_vector={});
+ const std::vector<DSP::Float> &first_output_vector={});
~Serial2Parallel(void);
};
@@ -559,7 +559,7 @@ class DSP::u::Parallel2Serial : public DSP::Block, public DSP::Source
static bool OutputExecute(OUTPUT_EXECUTE_ARGS);
int no_of_parallel_inputs; //! number of output cycles per input cycle
- vector<DSP::Float> inputs; //! vector for input samples for current clock cycle
+ std::vector<DSP::Float> inputs; //! vector for input samples for current clock cycle
bool ready; //! set true when all lines of the first input are collected in inputs vector and output can be generated for the first output clock cycle
unsigned int no_of_first_output_sample_lines_ready; // allows for detection when the first output sample can be generated
int current_out; //! index of currently generated output
@@ -613,7 +613,7 @@ class DSP::u::SymbolMapper : public DSP::Block
DSP::Complex_vector current_constellation;
friend unsigned int getConstellation(DSP::Complex_vector &constellation, DSP::e::ModulationType type, const DSP::Float &constellation_phase_offset, const unsigned int &bits_per_symbol_in, bool &is_real);
- vector <unsigned char> input_bits;
+ std::vector <unsigned char> input_bits;
static void InputExecute_bits(INPUT_EXECUTE_ARGS);
public:
diff --git a/src/include/DSP_modules_misc.h b/src/include/DSP_modules_misc.h
index 2d084ca..553b423 100644
--- a/src/include/DSP_modules_misc.h
+++ b/src/include/DSP_modules_misc.h
@@ -33,23 +33,23 @@ class DSP::TMorseTable
private:
static int TablesNo;
static TMorseTable *FirstTable;
- static const string &BaseDirectory;
+ static const std::string &BaseDirectory;
TMorseTable *NextTable;
- string FileName;
- string TableDescription;
+ std::string FileName;
+ std::string TableDescription;
- void Save2File(const string &Name);
+ void Save2File(const std::string &Name);
static TMorseTable *Current;
public:
- bool LoadFromFile(const string &Name);
+ bool LoadFromFile(const std::string &Name);
- string FontName[FontsEditEntriesNo];
+ std::string FontName[FontsEditEntriesNo];
uint16_t FontCharset[FontsEditEntriesNo];
- string TestText[FontsEditEntriesNo];
+ std::string TestText[FontsEditEntriesNo];
uint16_t MorseCodeEntriesNo;
uint32_t MorseCode[MaxMorseCodeEntriesNumber]; //Converter to number
@@ -60,33 +60,33 @@ class DSP::TMorseTable
static int FontCharset2Ind(uint32_t charset);
static uint32_t Ind2FontCharset(int ind);
- static const string Ind2AnsiString(int ind);
+ static const std::string Ind2AnsiString(int ind);
- static uint32_t MorseCodeText2Number(const string &dot_dash_text);
+ static uint32_t MorseCodeText2Number(const std::string &dot_dash_text);
/*!
* @param Number - numerical representation of MORSE code
* @return output text
*/
- static string Number2MorseCodeText(uint32_t Number);
+ static std::string Number2MorseCodeText(uint32_t Number);
//! Converts character into Morse code number
/*! \warning works only for single character codes
*/
uint32_t Char2Number(char znak);
- int MorseCodeText2LetterInd(const string &dot_dash_text);
+ int MorseCodeText2LetterInd(const std::string &dot_dash_text);
TMorseTable(void);
~TMorseTable(void);
static int Count(void); //number of tables
- const string Description(void);
+ const std::string Description(void);
static void SelectCurrent(int ind);
static TMorseTable *GetTable(int ind);
static int GetTableNo(TMorseTable *Table);
- static void LoadTables(const string &BaseDir);
+ static void LoadTables(const std::string &BaseDir);
static void ReloadCurrentTable(void);
static bool DeleteCurrentTable(void);
- static bool RenameCurrentTable(const string &NewName);
+ static bool RenameCurrentTable(const std::string &NewName);
static void NewTable(void);
static void FreeTables(void);
static void SaveCurrent(void);
@@ -109,14 +109,14 @@ class DSP::u::MORSEkey : public DSP::Source // , public DSP::Randomization
void Init(DSP::Clock_ptr ParentClock);
TMorseTable MorseTable;
- string AsciiText;
+ std::string AsciiText;
//int current_char; // always first char is the current char
//! current key state (1.0/0.0 == ON/OFF)
DSP::Float value;
int state, morse_state;
- string morse_text;
+ std::string morse_text;
int current_morse_segment;
float WPM;
@@ -153,7 +153,7 @@ class DSP::u::MORSEkey : public DSP::Source // , public DSP::Randomization
static float GetDotLength(float WPM_in, long sampling_rate_in,
float dash2dot_ratio = 3.0, float space2dot_ratio = 7.0);
- bool LoadCodeTable(const string &filename);
+ bool LoadCodeTable(const std::string &filename);
//! Changes manually current key state
/*!
@@ -161,8 +161,8 @@ class DSP::u::MORSEkey : public DSP::Source // , public DSP::Randomization
*/
void SetKeyState(bool set_to_ON);
- //! Append string to the characters to transmit
- void AddString(string AsciiText_in);
+ //! Append std::string to the characters to transmit
+ void AddString(std::string AsciiText_in);
//! Append char to the characters to transmit
void AddChar(char znak);
diff --git a/src/include/DSP_sockets.h b/src/include/DSP_sockets.h
index c97fd9a..eca4275 100644
--- a/src/include/DSP_sockets.h
+++ b/src/include/DSP_sockets.h
@@ -135,7 +135,7 @@ class DSP::Socket
private:
static bool winsock_initialized;
static int NoOfSocketObjects;
- static const string DEFAULT_PORT;
+ static const std::string DEFAULT_PORT;
#ifndef __NO_WINSOCK__
static WSADATA wsaData;
#endif
@@ -153,8 +153,8 @@ class DSP::Socket
//! table of DSP::Socket created in server mode
static std::vector<DSP::Socket *> server_objects_list;
- string extract_hostname(const string& address_with_port);
- string extract_port(const string& address_with_port, const string& default_port);
+ std::string extract_hostname(const std::string& address_with_port);
+ std::string extract_port(const std::string& address_with_port, const std::string& default_port);
static void close_socket();
public:
@@ -183,8 +183,8 @@ class DSP::Socket
bool Init_socket(void);
- bool InitClient(const string &address_with_port);
- bool InitServer_ListenSocket(const string &address_with_port);
+ bool InitClient(const std::string &address_with_port);
+ bool InitServer_ListenSocket(const std::string &address_with_port);
bool InitServer(void); //uint32_t ServerObjectID_in);
//! Attempts to accepts single connections if there is any in the listen queue
@@ -211,7 +211,7 @@ class DSP::Socket
*
* \note ServerObjectID_in == 0x00000000 means : accept all IDs
*/
- Socket(const string &address_with_port, bool run_as_client, uint32_t ServerObjectID_in);
+ Socket(const std::string &address_with_port, bool run_as_client, uint32_t ServerObjectID_in);
~Socket(void);
//! Waits until connection with current object is made
@@ -284,7 +284,7 @@ class DSP::u::SocketInput : public DSP::File, public DSP::Socket, public DSP::So
public:
//! \note address may include port number after colon
SocketInput(DSP::Clock_ptr ParentClock,
- const string &address_with_port, bool run_as_client,
+ const std::string &address_with_port, bool run_as_client,
uint32_t ServerObjectID,
unsigned int NoOfChannels=1,
DSP::e::SampleType sample_type=DSP::e::SampleType::ST_float);
@@ -397,7 +397,7 @@ class DSP::u::SocketOutput : public DSP::Socket, public DSP::Block
* @param sample_type
*/
SocketOutput(
- const string & address_with_port, bool run_as_client,
+ const std::string & address_with_port, bool run_as_client,
uint32_t ServerObjectID,
unsigned int NoOfChannels=1,
DSP::e::SampleType sample_type=DSP::e::SampleType::ST_float);
diff --git a/src/include/DSP_types.h b/src/include/DSP_types.h
index 38ba86a..8a77f25 100644
--- a/src/include/DSP_types.h
+++ b/src/include/DSP_types.h
@@ -19,7 +19,6 @@
#include <string>
#include <functional>
-using namespace std;
//---------------------------------------------------------------------------
#include <DSP_setup.h>
//---------------------------------------------------------------------------
--
GitLab