Fix common/message includes

client/CMakeLists.txt

@@ -12,7 +12,7 @@ set(CLIENT_SOURCES
 set(CLIENT_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} ${ATOMIC_LIBRARY} common)
 
 set(CLIENT_INCLUDE ${Boost_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/client
-                   ${CMAKE_SOURCE_DIR}/common)
+                   ${CMAKE_SOURCE_DIR})
 
 if(MACOSX)
   # Bonjour

client/client_connection.cpp

@@ -1,6 +1,6 @@
 /***
     This file is part of snapcast
-    Copyright (C) 2014-2022  Johannes Pohl
+    Copyright (C) 2014-2023  Johannes Pohl
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,9 +21,9 @@
 
 // local headers
 #include "common/aixlog.hpp"
+#include "common/message/hello.hpp"
 #include "common/snap_exception.hpp"
 #include "common/str_compat.hpp"
-#include "message/hello.hpp"
 
 // 3rd party headers
 #include <boost/asio/read.hpp>

client/client_connection.hpp

@@ -1,6 +1,6 @@
 /***
     This file is part of snapcast
-    Copyright (C) 2014-2022  Johannes Pohl
+    Copyright (C) 2014-2023  Johannes Pohl
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,9 +21,9 @@
 
 // local headers
 #include "client_settings.hpp"
+#include "common/message/factory.hpp"
+#include "common/message/message.hpp"
 #include "common/time_defs.hpp"
-#include "message/factory.hpp"
-#include "message/message.hpp"
 
 // 3rd party headers
 #include <boost/asio/any_io_executor.hpp>

client/controller.cpp

@@ -1,6 +1,6 @@
 /***
     This file is part of snapcast
-    Copyright (C) 2014-2022  Johannes Pohl
+    Copyright (C) 2014-2023  Johannes Pohl
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -24,8 +24,8 @@
 #include "controller.hpp"
 
 // local headers
-#include "decoder/pcm_decoder.hpp"
 #include "decoder/null_decoder.hpp"
+#include "decoder/pcm_decoder.hpp"
 #if defined(HAS_OGG) && (defined(HAS_TREMOR) || defined(HAS_VORBIS))
 #include "decoder/ogg_decoder.hpp"
 #endif
@@ -58,10 +58,10 @@
 
 #include "browseZeroConf/browse_mdns.hpp"
 #include "common/aixlog.hpp"
+#include "common/message/client_info.hpp"
+#include "common/message/hello.hpp"
+#include "common/message/time.hpp"
 #include "common/snap_exception.hpp"
-#include "message/client_info.hpp"
-#include "message/hello.hpp"
-#include "message/time.hpp"
 #include "time_provider.hpp"
 
 // standard headers

client/controller.hpp

@@ -1,6 +1,6 @@
 /***
     This file is part of snapcast
-    Copyright (C) 2014-2021  Johannes Pohl
+    Copyright (C) 2014-2023  Johannes Pohl
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -22,9 +22,9 @@
 // local headers
 #include "client_connection.hpp"
 #include "client_settings.hpp"
+#include "common/message/message.hpp"
+#include "common/message/server_settings.hpp"
 #include "decoder/decoder.hpp"
-#include "message/message.hpp"
-#include "message/server_settings.hpp"
 #include "player/player.hpp"
 #include "stream.hpp"
 

client/decoder/decoder.hpp

@@ -1,6 +1,6 @@
 /***
     This file is part of snapcast
-    Copyright (C) 2014-2020  Johannes Pohl
+    Copyright (C) 2014-2023  Johannes Pohl
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -16,11 +16,17 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#ifndef DECODER_H
+#pragma once
-#define DECODER_H
+
+
+// local headers
+#include "common/message/codec_header.hpp"
+#include "common/message/pcm_chunk.hpp"
 #include "common/sample_format.hpp"
-#include "message/codec_header.hpp"
+
-#include "message/pcm_chunk.hpp"
+// 3rd party headers
+
+// standard headers
 #include <mutex>
 
 namespace decoder
@@ -40,5 +46,3 @@ protected:
 };
 
 } // namespace decoder
-
-#endif

client/decoder/ogg_decoder.cpp

@@ -1,6 +1,6 @@
 /***
     This file is part of snapcast
-    Copyright (C) 2014-2021  Johannes Pohl
+    Copyright (C) 2014-2023  Johannes Pohl
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -16,15 +16,23 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+
+// prototype/interface header file
+#include "ogg_decoder.hpp"
+
+// local headers
+#include "common/aixlog.hpp"
+#include "common/endian.hpp"
+#include "common/snap_exception.hpp"
+
+// 3rd party headers
+
+// standard headers
 #include <cmath>
 #include <cstdint>
 #include <cstring>
 #include <iostream>
 
-#include "common/aixlog.hpp"
-#include "common/endian.hpp"
-#include "common/snap_exception.hpp"
-#include "ogg_decoder.hpp"
 
 
 using namespace std;

client/stream.hpp

@@ -1,6 +1,6 @@
 /***
     This file is part of snapcast
-    Copyright (C) 2014-2021  Johannes Pohl
+    Copyright (C) 2014-2023  Johannes Pohl
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,6 +19,17 @@
 #ifndef STREAM_HPP
 #define STREAM_HPP
 
+// local headers
+#include "common/message/message.hpp"
+#include "common/message/pcm_chunk.hpp"
+#include "common/queue.h"
+#include "common/resampler.hpp"
+#include "common/sample_format.hpp"
+#include "double_buffer.hpp"
+
+// 3rd party headers
+
+// standard headers
 #include <atomic>
 #include <deque>
 #include <memory>
@@ -27,12 +38,6 @@
 #include <soxr.h>
 #endif
 
-#include "common/queue.h"
-#include "common/sample_format.hpp"
-#include "double_buffer.hpp"
-#include "message/message.hpp"
-#include "message/pcm_chunk.hpp"
-#include "resampler.hpp"
 
 /// Time synchronized audio stream
 /**

client/time_provider.hpp

@@ -1,6 +1,6 @@
 /***
     This file is part of snapcast
-    Copyright (C) 2014-2020  Johannes Pohl
+    Copyright (C) 2014-2023  Johannes Pohl
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -16,12 +16,17 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#ifndef TIME_PROVIDER_H
+#pragma once
-#define TIME_PROVIDER_H
 
+
+// local headers
+#include "common/message/message.hpp"
 #include "common/time_defs.hpp"
 #include "double_buffer.hpp"
-#include "message/message.hpp"
+
+// 3rd party headers
+
+// standard headers
 #include <atomic>
 #include <chrono>
 
@@ -84,6 +89,3 @@ private:
     DoubleBuffer<chronos::usec::rep> diffBuffer_;
     std::atomic<chronos::usec::rep> diffToServer_;
 };
-
-
-#endif

server/streamreader/control_error.hpp

@@ -1,6 +1,6 @@
 /***
     This file is part of snapcast
-    Copyright (C) 2014-2021  Johannes Pohl
+    Copyright (C) 2014-2023  Johannes Pohl
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -16,10 +16,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#ifndef STREAMREADER_ERROR_HPP
+#pragma once
-#define STREAMREADER_ERROR_HPP
 
 
+// standard headers
 #include <system_error>
 
 
@@ -77,6 +77,3 @@ struct is_error_code_enum<ControlErrc> : public std::true_type
 } // namespace std
 
 std::error_code make_error_code(ControlErrc);
-
-
-#endif

server/streamreader/file_stream.cpp

@@ -1,6 +1,6 @@
 /***
     This file is part of snapcast
-    Copyright (C) 2014-2021  Johannes Pohl
+    Copyright (C) 2014-2023  Johannes Pohl
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,6 +25,8 @@
 #include "encoder/encoder_factory.hpp"
 
 // 3rd party headers
+
+// standard headers
 #include <memory>