From 8f412d5418706866f5f461d6264f999380b38758 Mon Sep 17 00:00:00 2001
From: Marek Blok <Marek.Blok@pg.edu.pl>
Date: Tue, 6 Apr 2021 11:50:11 +0200
Subject: [PATCH] Main.cpp and examples fix for v.0.20.003
---
examples/callbacks.cpp | 2 +-
examples/echo.cpp | 2 +-
examples/hello.cpp | 2 +-
examples/macro_example.cpp | 2 +-
examples/multirate.cpp | 2 +-
examples/socket_client.cpp | 2 +-
examples/socket_client_2.cpp | 2 +-
examples/socket_server.cpp | 2 +-
examples/socket_server_2.cpp | 2 +-
src/Main.cpp | 14 +++++++-------
10 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/examples/callbacks.cpp b/examples/callbacks.cpp
index 2365f2a..25aa5f7 100644
--- a/examples/callbacks.cpp
+++ b/examples/callbacks.cpp
@@ -66,7 +66,7 @@ int main(void)
std::shared_ptr<DSP::u::Amplifier> Scale;
std::shared_ptr<DSP::u::Multiplexer> Multiplexer2;
- DSP::log.SetLogState(DSP::E_LS_Mode::LS_console | DSP::E_LS_Mode::LS_file);
+ DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
DSP::log.SetLogFileName("log_file.log");
DSP::log << DSP::lib_version_string() << endl;
diff --git a/examples/echo.cpp b/examples/echo.cpp
index ffb1d29..05f8b17 100644
--- a/examples/echo.cpp
+++ b/examples/echo.cpp
@@ -11,7 +11,7 @@ int main(void)
int temp;
long int Fp;
- DSP::log.SetLogState(DSP::E_LS_Mode::LS_console | DSP::E_LS_Mode::LS_file);
+ DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
DSP::log.SetLogFileName("log_file.log");
DSP::log << DSP::lib_version_string() << endl;
diff --git a/examples/hello.cpp b/examples/hello.cpp
index 824ced6..5f1bfaf 100644
--- a/examples/hello.cpp
+++ b/examples/hello.cpp
@@ -17,7 +17,7 @@ int test_hello(void)
int temp;
long int Fp;
- DSP::log.SetLogState(DSP::E_LS_Mode::LS_console | DSP::E_LS_Mode::LS_file);
+ 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;
diff --git a/examples/macro_example.cpp b/examples/macro_example.cpp
index ea66e7a..26125e8 100644
--- a/examples/macro_example.cpp
+++ b/examples/macro_example.cpp
@@ -58,7 +58,7 @@ int main(void)
int temp;
long int Fp;
- DSP::log.SetLogState(DSP::E_LS_Mode::LS_console | DSP::E_LS_Mode::LS_file);
+ 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;
diff --git a/examples/multirate.cpp b/examples/multirate.cpp
index feebfb0..7ba74bf 100644
--- a/examples/multirate.cpp
+++ b/examples/multirate.cpp
@@ -49,7 +49,7 @@ int main(int argn, char *args[])
/*************************************************************/
// Log file setup
DSP::log.SetLogFileName("log_file.log");
- DSP::log.SetLogState(DSP::E_LS_Mode::LS_file | DSP::E_LS_Mode::LS_console);
+ DSP::log.SetLogState(DSP::e::LogState::file | DSP::e::LogState::console);
DSP::log << DSP::lib_version_string() << endl << endl;
/*************************************************************/
diff --git a/examples/socket_client.cpp b/examples/socket_client.cpp
index b14b822..15a8e69 100644
--- a/examples/socket_client.cpp
+++ b/examples/socket_client.cpp
@@ -13,7 +13,7 @@ int main(void)
int temp;
long int Fp;
- DSP::log.SetLogState(DSP::E_LS_Mode::LS_console | DSP::E_LS_Mode::LS_file);
+ 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;
diff --git a/examples/socket_client_2.cpp b/examples/socket_client_2.cpp
index 5df1874..cf1095e 100644
--- a/examples/socket_client_2.cpp
+++ b/examples/socket_client_2.cpp
@@ -15,7 +15,7 @@ int main(void)
DSP::LoadCoef coef_info;
int N_SRC; DSP::Float_vector h_SRC;
- DSP::log.SetLogState(DSP::E_LS_Mode::LS_console | DSP::E_LS_Mode::LS_file);
+ 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;
diff --git a/examples/socket_server.cpp b/examples/socket_server.cpp
index d816e75..6e6a067 100644
--- a/examples/socket_server.cpp
+++ b/examples/socket_server.cpp
@@ -14,7 +14,7 @@ int main(void)
int temp;
long int Fp;
- DSP::log.SetLogState(DSP::E_LS_Mode::LS_console | DSP::E_LS_Mode::LS_file);
+ 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;
diff --git a/examples/socket_server_2.cpp b/examples/socket_server_2.cpp
index 767e36f..857fd79 100644
--- a/examples/socket_server_2.cpp
+++ b/examples/socket_server_2.cpp
@@ -14,7 +14,7 @@ int main(void)
int temp;
long int Fp, Fp1;
- DSP::log.SetLogState(DSP::E_LS_Mode::LS_console | DSP::E_LS_Mode::LS_file);
+ 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;
diff --git a/src/Main.cpp b/src/Main.cpp
index 213ccee..9e986e2 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -929,7 +929,7 @@ int test_3()
DSP::Clock_ptr MasterClock; //, MasterClock2, Zegar1, Zegar2, Zegar3;
- DSP::log.SetLogState(DSP::E_LS_Mode::LS_console | DSP::E_LS_Mode::LS_file_append);
+ DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file_append);
DSP::log.SetLogFileName("log_file.log");
MasterClock=DSP::Clock::CreateMasterClock();
@@ -1153,7 +1153,7 @@ int test_4()
// char dir_name[]=".";
// DSP::f::SetLogState(DSP_LS_console | DSP_LS_file | DSP_LS_errors_only);
- DSP::log.SetLogState(DSP::E_LS_Mode::LS_console | DSP::E_LS_Mode::LS_file_append);
+ DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file_append);
DSP::log.SetLogFileName("log_file.log");
DSP::Float Fp, Fp1, Fp2; //sampling frequencies
@@ -1660,7 +1660,7 @@ int test_7()
int temp;
long int Fp;
- DSP::log.SetLogState(DSP::E_LS_Mode::LS_console | DSP::E_LS_Mode::LS_file);
+ 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;
@@ -1838,7 +1838,7 @@ int test_9()
/*************************************************************/
// Log file setup
DSP::log.SetLogFileName("log_file.txt");
- DSP::log.SetLogState(DSP::E_LS_Mode::LS_file | DSP::E_LS_Mode::LS_console);
+ DSP::log.SetLogState(DSP::e::LogState::file | DSP::e::LogState::console);
DSP::log << DSP::lib_version_string() << endl << endl;
/*************************************************************/
@@ -2014,7 +2014,7 @@ int test_11()
// Log file setup
DSP::log.SetLogFileName("log_file.log");
//DSP::f::SetLogState(DSP_LS_file | DSP_LS_console);
- DSP::log.SetLogState(DSP::E_LS_Mode::LS_file);
+ DSP::log.SetLogState(DSP::e::LogState::file);
DSP::log << DSP::lib_version_string() << endl << endl;
/*************************************************************/
@@ -2268,7 +2268,7 @@ int test_12(void)
DSP::u::Amplifier *Scale;
DSP::u::Multiplexer *Multiplexer2;
- DSP::log.SetLogState(DSP::E_LS_Mode::LS_console | DSP::E_LS_Mode::LS_file);
+ DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
DSP::log.SetLogFileName("log_file.log");
DSP::log << DSP::lib_version_string() << endl;
@@ -2713,7 +2713,7 @@ int test_ZPSTC_cw_3()
int main(int argc, char*argv[])
{
// DSP::f::SetLogState(DSP_LS_console | DSP_LS_file);
- DSP::log.SetLogState(DSP::E_LS_Mode::LS_console | DSP::E_LS_Mode::LS_file);
+ DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
DSP::log.SetLogFileName("DSPElib_test_log.txt");
DSP::log << "test DSP::log" << endl;
--
GitLab