Changing company name

elk-audio · Mar 27, 2023 · 2712a04 · 2712a04
1 parent 42d6ac1
commit 2712a04
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 50 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # ElkLog
-Logger library with support for logging both non-realtime and realtime threads. ElkLog uses spdlog internally but adds features specifically for logging in Elk Audio OS. 
+Logger library with support for logging both non-realtime and realtime threads. ElkLog uses spdlog internally but adds features specifically for logging from Elk Audio OS. 
 
-Copyright 2020 - 2023 Modern Ancient Instruments Networked AB, dba Elk, Stockholm, Sweden.
+Copyright 2020-2023 Elk Audio AB, Stockholm, Sweden.
 
 ## Usage
 
@@ -36,5 +36,3 @@ if (elklog::StaticLogger::init_logger("log.txt", "example_logger", "debug") == e
 ## License
 
 ElkLog is licensed under the GNU General Public License v3 (“GPLv3”). Commercial licenses are available on request at [email protected].
-
-Copyright 2020-2023 Modern Ancient Instruments Networked AB, dba Elk, Stockholm, Sweden.
diff --git a/include/elklog/elk_logger.h b/include/elklog/elk_logger.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 Modern Ancient Instruments Networked AB, dba Elk
+ * Copyright 2020-2023 Elk Audio AB
  * ElkLog is free software: you can redistribute it and/or modify it under the terms
  * of the GNU General Public License as published by the Free Software Foundation,
  * either version 3 of the License, or (at your option) any later version.
@@ -19,11 +19,11 @@
  *        Provides a unified logger abstraction that is safe to call in any context
  *        (either RT or non-RT).
  *
- * @copyright Copyright 2020-2023 Elk AB, Stockholm
+ * @copyright Copyright 2020-2023 Elk Audio AB, Stockholm
  */
 
-#ifndef ALOHA_LOGGER_H
-#define ALOHA_LOGGER_H
+#ifndef ELK_LOGGER_H
+#define ELK_LOGGER_H
 
 #include <memory>
 #include <string>
@@ -332,7 +332,7 @@ class ElkLogger
     std::promise<bool> _closed_promise;
 };
 
-} // namespace aloha
+} // namespace elklog
 
 #else // ELKLOG_DISABLE_LOGGING
 
@@ -379,8 +379,8 @@ class ElkLogger
     {}
 };
 
-} // namespace aloha
+} // namespace elklog
 
 #endif // ELKLOG_DISABLE_LOGGING
 
-#endif /* ALOHA_LOGGER_H */
+#endif /* ELK_LOGGER_H */
diff --git a/include/elklog/log_return_code.h b/include/elklog/log_return_code.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 Modern Ancient Instruments Networked AB, dba Elk
+ * Copyright 2020-2023 Elk Audio AB
  * ElkLog is free software: you can redistribute it and/or modify it under the terms
  * of the GNU General Public License as published by the Free Software Foundation,
  * either version 3 of the License, or (at your option) any later version.
@@ -15,7 +15,7 @@
 /**
  * @brief Log initialization return codes
  *
- * @copyright Copyright 2020-2023 Elk AB, Stockholm
+ * @copyright Copyright 2020-2023 Elk Audio AB, Stockholm
  */
 
 #ifndef LOG_RETURN_CODE_H
@@ -57,7 +57,7 @@ inline std::ostream& operator << (std::ostream& o, const Status& c)
     return o;
 }
 
-} // namespace aloha
+} // namespace elklog
 
 
 #endif /* LOG_RETURN_CODE_H */
diff --git a/include/elklog/rtlogger.h b/include/elklog/rtlogger.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 Modern Ancient Instruments Networked AB, dba Elk
+ * Copyright 2020-2023 Elk Audio AB
  * ElkLog is free software: you can redistribute it and/or modify it under the terms
  * of the GNU General Public License as published by the Free Software Foundation,
  * either version 3 of the License, or (at your option) any later version.
@@ -18,7 +18,7 @@
  *
  *        Not safe to log messages from multiple RT threads at the same time.
  *
- * @copyright Copyright 2020-2023 Elk AB, Stockholm
+ * @copyright Copyright 2020-2023 Elk Audio AB, Stockholm
  */
 
 #ifndef RT_LOGGER_H
@@ -152,11 +152,11 @@ class RtLogger
     RtLogLevel _min_log_level;
 };
 
-} // namespace aloha
+} // namespace elklog
 
 #else // ELKLOG_DISABLE_LOGGING
 
-namespace aloha {
+namespace elklog {
 
 template<size_t message_len, size_t fifo_size>
 class RtLogger
@@ -191,7 +191,7 @@ class RtLogger
 
 };
 
-} // namespace aloha
+} // namespace elklog
 
 #endif // ELKLOG_DISABLE_LOGGING
 

diff --git a/include/elklog/rtloglevel.h b/include/elklog/rtloglevel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 Modern Ancient Instruments Networked AB, dba Elk
+ * Copyright 2020-2023 Elk Audio AB
  * ElkLog is free software: you can redistribute it and/or modify it under the terms
  * of the GNU General Public License as published by the Free Software Foundation,
  * either version 3 of the License, or (at your option) any later version.
@@ -15,7 +15,7 @@
  /**
  * @brief RT-logger levels
  *
- * @copyright Copyright 2020-2023 Elk AB, Stockholm
+ * @copyright Copyright 2020-2023 Elk Audio AB, Stockholm
  */
 
 #ifndef RTLOGLEVEL_H
@@ -57,7 +57,7 @@ inline std::ostream& operator << (std::ostream& o, const RtLogLevel& l)
 }
 
 
-} // namespace aloha
+} // namespace elklog
 
 
 #endif /* RTLOGLEVEL_H */
diff --git a/include/elklog/rtlogmessage.h b/include/elklog/rtlogmessage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 Modern Ancient Instruments Networked AB, dba Elk
+ * Copyright 2020-2023 Elk Audio AB
  * ElkLog is free software: you can redistribute it and/or modify it under the terms
  * of the GNU General Public License as published by the Free Software Foundation,
  * either version 3 of the License, or (at your option) any later version.
@@ -15,7 +15,7 @@
  /**
  * @brief RT-safe class to pass around Log Messages
  *
- * @copyright Copyright 2020-2023 Elk AB, Stockholm
+ * @copyright Copyright 2020-2023 Elk Audio AB, Stockholm
  */
 
 #ifndef RTLOGMESSAGE_H
@@ -128,6 +128,6 @@ inline std::ostream& operator << (std::ostream& o, const RtLogMessage<buffer_len
 }
 
 
-} // namespace aloha
+} // namespace elklog
 
 #endif /* RTLOGMESSAGE_H */
diff --git a/include/elklog/spinlock.h b/include/elklog/spinlock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 Modern Ancient Instruments Networked AB, dba Elk
+ * Copyright 2020-2023 Elk Audio AB
  * ElkLog is free software: you can redistribute it and/or modify it under the terms
  * of the GNU General Public License as published by the Free Software Foundation,
  * either version 3 of the License, or (at your option) any later version.
@@ -14,7 +14,7 @@
 
 /**
  * @brief Basic spinlock implementation safe for xenomai use
- * @copyright 2017-2023 Elk AB, Stockholm
+ * @copyright 2017-2023 Elk Audio AB, Stockholm
  */
 
 #ifndef ELKLOG_SPINLOCK_H

diff --git a/include/elklog/static_logger.h b/include/elklog/static_logger.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 Modern Ancient Instruments Networked AB, dba Elk
+ * Copyright 2020-2023 Elk Audio AB
  * ElkLog is free software: you can redistribute it and/or modify it under the terms
  * of the GNU General Public License as published by the Free Software Foundation,
  * either version 3 of the License, or (at your option) any later version.
@@ -33,16 +33,14 @@
  * spdlog supports ostream style too, but that doesn't work with
  * ELKLOG_DISABLE_LOGGING unfortunately
  *
- * @copyright Copyright 2020-2023 Elk AB, Stockholm
+ * @copyright Copyright 2020-2023 Elk Audio AB, Stockholm
  */
 
 #ifndef STATIC_LOGGER_H
 #define STATIC_LOGGER_H
 
 #include "elk_logger.h"
 
-//#define SPDLOG_DEBUG_ON // TODO - needed?
-
 /* log macros */
 #ifndef ELKLOG_DISABLE_LOGGING
 //#include "spdlog/spdlog.h"

diff --git a/include/public_header.h b/include/public_header.h
diff --git a/include/version.h b/include/version.h
diff --git a/src/elklog.cpp b/src/elklog.cpp
@@ -1,7 +1,7 @@
 #include "elklog/static_logger.h"
 
-namespace elklog{
+namespace elklog {
 
 ElkLogger* StaticLogger::public_instance;
 
-}
+} // namespace elklog