Fix includes

server/CMakeLists.txt

@@ -34,7 +34,7 @@ set(SERVER_SOURCES
 set(SERVER_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} ${ATOMIC_LIBRARY} common)
 
 set(SERVER_INCLUDE ${Boost_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/server
-                   ${CMAKE_SOURCE_DIR}/common)
+                   ${CMAKE_SOURCE_DIR})
 
 if(ANDROID)
   find_package(vorbis REQUIRED CONFIG)

server/control_server.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,13 +21,13 @@
 
 // local headers
 #include "common/aixlog.hpp"
+#include "common/message/time.hpp"
 #include "common/snap_exception.hpp"
 #include "common/utils.hpp"
 #include "config.hpp"
 #include "control_session_http.hpp"
 #include "control_session_tcp.hpp"
 #include "jsonrpcpp.hpp"
-#include "message/time.hpp"
 
 // 3rd party headers
 

server/control_server.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
@@ -20,12 +20,12 @@
 #define CONTROL_SERVER_HPP
 
 // local headers
+#include "common/message/codec_header.hpp"
+#include "common/message/message.hpp"
+#include "common/message/server_settings.hpp"
 #include "common/queue.h"
 #include "common/sample_format.hpp"
 #include "control_session.hpp"
-#include "message/codec_header.hpp"
-#include "message/message.hpp"
-#include "message/server_settings.hpp"
 #include "server_settings.hpp"
 
 // 3rd party headers

server/control_session.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
@@ -20,8 +20,8 @@
 #define CONTROL_SESSION_HPP
 
 // local headers
+#include "common/message/message.hpp"
 #include "common/queue.h"
-#include "message/message.hpp"
 #include "server_settings.hpp"
 
 // 3rd party headers

server/control_session_http.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,14 +16,21 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+// prototype/interface header file
 #include "control_session_http.hpp"
+
+// standard headers
+#include <iostream>
+
+// 3rd party headers
+#include <boost/beast/http/buffer_body.hpp>
+#include <boost/beast/http/file_body.hpp>
+
+// local headers
 #include "common/aixlog.hpp"
+#include "common/message/pcm_chunk.hpp"
 #include "control_session_ws.hpp"
-#include "message/pcm_chunk.hpp"
 #include "stream_session_ws.hpp"
-#include <boost/beast/http/buffer_body.hpp>
-#include <boost/beast/http/file_body.hpp>
-#include <iostream>
 
 using namespace std;
 namespace websocket = beast::websocket; // from <boost/beast/websocket.hpp>

server/control_session_tcp.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
@@ -25,7 +25,7 @@
 
 // local headers
 #include "common/aixlog.hpp"
-#include "message/pcm_chunk.hpp"
+#include "common/message/pcm_chunk.hpp"
 
 
 using namespace std;

server/control_session_ws.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,7 +21,7 @@
 
 // local headers
 #include "common/aixlog.hpp"
-#include "message/pcm_chunk.hpp"
+#include "common/message/pcm_chunk.hpp"
 
 // 3rd party headers
 

server/encoder/encoder.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
@@ -19,13 +19,16 @@
 #ifndef ENCODER_HPP
 #define ENCODER_HPP
 
+// local headers
+#include "common/message/codec_header.hpp"
+#include "common/message/pcm_chunk.hpp"
+#include "common/sample_format.hpp"
+
+// standard headers
 #include <functional>
 #include <memory>
 #include <string>
 
-#include "common/sample_format.hpp"
-#include "message/codec_header.hpp"
-#include "message/pcm_chunk.hpp"
 
 namespace encoder
 {

server/jsonrpcpp.hpp

@@ -22,7 +22,7 @@
 #ifndef JSON_RPC_HPP
 #define JSON_RPC_HPP
 
-#include "json.hpp"
+#include "common/json.hpp"
 #include <cstring>
 #include <exception>
 #include <string>

server/server.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,10 +21,10 @@
 
 // local headers
 #include "common/aixlog.hpp"
+#include "common/message/client_info.hpp"
+#include "common/message/hello.hpp"
+#include "common/message/time.hpp"
 #include "config.hpp"
-#include "message/client_info.hpp"
-#include "message/hello.hpp"
-#include "message/time.hpp"
 #include "stream_session_tcp.hpp"
 
 // 3rd party headers

server/server.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
@@ -20,13 +20,13 @@
 #define SERVER_HPP
 
 // local headers
+#include "common/message/codec_header.hpp"
+#include "common/message/message.hpp"
+#include "common/message/server_settings.hpp"
 #include "common/queue.h"
 #include "common/sample_format.hpp"
 #include "control_server.hpp"
 #include "jsonrpcpp.hpp"
-#include "message/codec_header.hpp"
-#include "message/message.hpp"
-#include "message/server_settings.hpp"
 #include "server_settings.hpp"
 #include "stream_server.hpp"
 #include "stream_session.hpp"

server/snapserver.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,13 +21,13 @@
 #ifdef HAS_DAEMON
 #include "common/daemon.hpp"
 #endif
+#include "common/message/message.hpp"
 #include "common/sample_format.hpp"
 #include "common/snap_exception.hpp"
 #include "common/time_defs.hpp"
 #include "common/utils/string_utils.hpp"
 #include "common/version.hpp"
 #include "encoder/encoder_factory.hpp"
-#include "message/message.hpp"
 #include "server.hpp"
 #include "server_settings.hpp"
 #if defined(HAS_AVAHI) || defined(HAS_BONJOUR)

server/stream_server.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,10 +21,10 @@
 
 // local headers
 #include "common/aixlog.hpp"
+#include "common/message/client_info.hpp"
+#include "common/message/hello.hpp"
+#include "common/message/time.hpp"
 #include "config.hpp"
-#include "message/client_info.hpp"
-#include "message/hello.hpp"
-#include "message/time.hpp"
 #include "stream_session_tcp.hpp"
 
 // 3rd party headers

server/stream_server.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
@@ -20,13 +20,13 @@
 #define STREAM_SERVER_HPP
 
 // local headers
+#include "common/message/codec_header.hpp"
+#include "common/message/message.hpp"
+#include "common/message/server_settings.hpp"
 #include "common/queue.h"
 #include "common/sample_format.hpp"
 #include "control_server.hpp"
 #include "jsonrpcpp.hpp"
-#include "message/codec_header.hpp"
-#include "message/message.hpp"
-#include "message/server_settings.hpp"
 #include "server_settings.hpp"
 #include "stream_session.hpp"
 #include "streamreader/stream_manager.hpp"

server/stream_session.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
@@ -21,7 +21,7 @@
 
 // local headers
 #include "common/aixlog.hpp"
-#include "message/pcm_chunk.hpp"
+#include "common/message/pcm_chunk.hpp"
 
 // 3rd party headers
 

server/stream_session.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
@@ -20,8 +20,8 @@
 #define STREAM_SESSION_HPP
 
 // local headers
+#include "common/message/message.hpp"
 #include "common/queue.h"
-#include "message/message.hpp"
 #include "streamreader/stream_manager.hpp"
 
 // 3rd party headers

server/stream_session_tcp.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,7 +21,7 @@
 
 // local headers
 #include "common/aixlog.hpp"
-#include "message/pcm_chunk.hpp"
+#include "common/message/pcm_chunk.hpp"
 
 // 3rd party headers
 

server/stream_session_ws.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,7 +21,7 @@
 
 // local headers
 #include "common/aixlog.hpp"
-#include "message/pcm_chunk.hpp"
+#include "common/message/pcm_chunk.hpp"
 
 // 3rd party headers
 

server/streamreader/meta_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
@@ -20,8 +20,8 @@
 #define META_STREAM_HPP
 
 // local headers
+#include "common/resampler.hpp"
 #include "posix_stream.hpp"
-#include "resampler.hpp"
 
 // standard headers
 #include <memory>