build: Move private headers out from include folder

CMakeLists.txt

@@ -60,10 +60,6 @@ add_library(uvgrtp STATIC
 target_include_directories(uvgrtp
     PUBLIC
         ${PROJECT_SOURCE_DIR}/include
-        ${PROJECT_SOURCE_DIR}/include/formats
-        ${PROJECT_SOURCE_DIR}/include/zrtp
-        ${PROJECT_SOURCE_DIR}/include/rtcp
-        ${PROJECT_SOURCE_DIR}/include/srtp
 )
 
 set(LIBRARY_PATHS "")

include/lib.hh

@@ -1,48 +1,14 @@
 #pragma once
 
 // these includes are here for easier usage of this library
-// At this point I don't know which ones are required so I'll include them all
-#include "formats/h26x.hh"
-#include "formats/h264.hh"
-#include "formats/h265.hh"
-#include "formats/h266.hh"
-#include "formats/media.hh"
-
-#include "srtp/base.hh"
-#include "srtp/srtcp.hh"
-#include "srtp/srtp.hh"
-
-#include "zrtp/commit.hh"
-#include "zrtp/confack.hh"
-#include "zrtp/confirm.hh"
-#include "zrtp/defines.hh"
-#include "zrtp/dh_kxchng.hh"
-#include "zrtp/error.hh"
-#include "zrtp/hello.hh"
-#include "zrtp/hello_ack.hh"
-#include "zrtp/zrtp_receiver.hh"
-
-#include "clock.hh"
-#include "crypto.hh"
-#include "debug.hh"
-#include "dispatch.hh"
-#include "frame.hh"
-#include "holepuncher.hh"
-#include "hostname.hh"
-#include "media_stream.hh"
-#include "mingw_inet.hh"
-#include "multicast.hh"
-#include "pkt_dispatch.hh"
-#include "poll.hh"
-#include "queue.hh"
-#include "random.hh"
-#include "rtcp.hh"
-#include "rtp.hh"
-#include "runner.hh"
-#include "session.hh"
-#include "socket.hh"
-#include "util.hh"
-#include "zrtp.hh"
+#include "media_stream.hh"  // media streamer class
+#include "session.hh"       // session class
+#include "rtcp.hh"          // RTCP
+#include "clock.hh"         // time related functions
+#include "crypto.hh"        // check if crypto is enabled
+#include "debug.hh"         // debug prints
+#include "frame.hh"         // frame related functions
+#include "util.hh"          // types
 
 #include <map>
 #include <string>

src/formats/h264.cc

@@ -1,7 +1,7 @@
-#include "formats/h264.hh"
+#include "h264.hh"
 
-#include "queue.hh"
-#include "rtp.hh"
+#include "../queue.hh"
+#include "../rtp.hh"
 #include "debug.hh"
 
 #include <cstdint>

src/formats/h264.hh

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "formats/h26x.hh"
+#include "h26x.hh"
 #include "clock.hh"
 #include "util.hh"
 #include "frame.hh"

src/formats/h264_pkt_handler.cc

@@ -1,6 +1,6 @@
-#include "formats/h264.hh"
+#include "h264.hh"
 
-#include "queue.hh"
+#include "../queue.hh"
 #include "debug.hh"
 
 #include <cstdint>

src/formats/h265.cc

@@ -1,8 +1,8 @@
-#include "formats/h265.hh"
+#include "h265.hh"
 
-#include "srtp/srtcp.hh"
-#include "rtp.hh"
-#include "queue.hh"
+#include "../srtp/srtcp.hh"
+#include "../rtp.hh"
+#include "../queue.hh"
 #include "debug.hh"
 
 #include <cstdint>

src/formats/h265.hh

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "formats/h26x.hh"
+#include "h26x.hh"
 #include "clock.hh"
 #include "util.hh"
 #include "frame.hh"

src/formats/h265_pkt_handler.cc

@@ -1,7 +1,7 @@
-#include "formats/h265.hh"
+#include "h265.hh"
 
-#include "rtp.hh"
-#include "queue.hh"
+#include "../rtp.hh"
+#include "../queue.hh"
 #include "debug.hh"
 
 #include <cstdint>

src/formats/h266.cc

@@ -1,7 +1,7 @@
-#include "formats/h266.hh"
+#include "h266.hh"
 
-#include "rtp.hh"
-#include "queue.hh"
+#include "../rtp.hh"
+#include "../queue.hh"
 #include "frame.hh"
 #include "debug.hh"
 

src/formats/h266.hh

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "formats/h26x.hh"
+#include "h26x.hh"
 
 #include "util.hh"
 

src/formats/h266_pkt_handler.cc

@@ -1,7 +1,7 @@
-#include "formats/h266.hh"
+#include "h266.hh"
 
-#include "rtp.hh"
-#include "queue.hh"
+#include "../rtp.hh"
+#include "../queue.hh"
 #include "debug.hh"
 
 #include <cstdint>

src/formats/h26x.cc

@@ -1,7 +1,7 @@
-#include "formats/h26x.hh"
+#include "h26x.hh"
 
-#include "rtp.hh"
-#include "queue.hh"
+#include "../rtp.hh"
+#include "../queue.hh"
 #include "socket.hh"
 #include "debug.hh"
 

src/formats/media.cc

@@ -1,7 +1,7 @@
-#include "formats/media.hh"
+#include "media.hh"
 
 #include "../rtp.hh"
-#include "../socket.hh"
+#include "socket.hh"
 #include "../queue.hh"
 #include "debug.hh"
 

src/formats/media.hh

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../util.hh"
+#include "util.hh"
 
 #include <map>
 #include <memory>

src/rtcp/app.cc

@@ -1,6 +1,6 @@
 #include "rtcp.hh"
 
-#include "srtp/srtcp.hh"
+#include "../srtp/srtcp.hh"
 #include "debug.hh"
 
 uvgrtp::frame::rtcp_app_packet *uvgrtp::rtcp::get_app_packet(uint32_t ssrc)

src/rtcp/receiver.cc

@@ -1,6 +1,6 @@
 #include "rtcp.hh"
 
-#include "srtp/srtcp.hh"
+#include "../srtp/srtcp.hh"
 #include "debug.hh"
 
 uvgrtp::frame::rtcp_receiver_report *uvgrtp::rtcp::get_receiver_packet(uint32_t ssrc)

src/rtcp/rtcp_runner.cc

@@ -1,5 +1,5 @@
 #include "rtcp.hh"
-#include "poll.hh"
+#include "../poll.hh"
 
 #include "debug.hh"
 

src/rtcp/sdes.cc

@@ -1,6 +1,6 @@
 #include "rtcp.hh"
 
-#include "srtp/srtcp.hh"
+#include "../srtp/srtcp.hh"
 #include "debug.hh"
 
 uvgrtp::frame::rtcp_sdes_packet *uvgrtp::rtcp::get_sdes_packet(uint32_t ssrc)

src/rtcp/sender.cc

@@ -1,6 +1,6 @@
 #include "rtcp.hh"
 
-#include "srtp/srtcp.hh"
+#include "../srtp/srtcp.hh"
 #include "debug.hh"
 
 uvgrtp::frame::rtcp_sender_report *uvgrtp::rtcp::get_sender_packet(uint32_t ssrc)

src/srtp/base.cc

@@ -1,7 +1,7 @@
-#include "srtp/base.hh"
+#include "base.hh"
 
 #include "crypto.hh"
-#include "zrtp.hh"
+#include "../zrtp.hh"
 #include "debug.hh"
 
 #include <cstring>

src/srtp/base.hh

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../util.hh"
+#include "util.hh"
 
 #ifdef _WIN32
 #include <winsock2.h>

src/srtp/srtcp.cc

@@ -1,4 +1,4 @@
-#include "srtp/srtcp.hh"
+#include "srtcp.hh"
 
 #include "crypto.hh"
 #include "debug.hh"

src/srtp/srtp.cc

@@ -1,6 +1,6 @@
-#include "srtp/srtp.hh"
+#include "srtp.hh"
 
-#include "srtp/base.hh"
+#include "base.hh"
 #include "crypto.hh"
 #include "debug.hh"
 #include "frame.hh"

src/zrtp/commit.cc

@@ -1,6 +1,6 @@
-#include "zrtp/commit.hh"
+#include "commit.hh"
 
-#include "zrtp.hh"
+#include "../zrtp.hh"
 #include "crypto.hh"
 #include "debug.hh"
 #include "frame.hh"

src/zrtp/commit.hh

@@ -1,7 +1,7 @@
 #pragma once
 
 
-#include "zrtp/defines.hh"
+#include "defines.hh"
 
 #include "util.hh"
 

src/zrtp/confack.cc

@@ -1,6 +1,6 @@
-#include "zrtp/confack.hh"
+#include "confack.hh"
 
-#include "zrtp.hh"
+#include "../zrtp.hh"
 #include "crypto.hh"
 #include "frame.hh"
 #include "socket.hh"

src/zrtp/confack.hh

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "zrtp/defines.hh"
-#include "zrtp/zrtp_receiver.hh"
+#include "defines.hh"
+#include "zrtp_receiver.hh"
 
 #include "util.hh"
 

src/zrtp/confirm.cc

@@ -1,6 +1,6 @@
-#include "zrtp/confirm.hh"
+#include "confirm.hh"
 
-#include "zrtp.hh"
+#include "../zrtp.hh"
 #include "crypto.hh"
 #include "frame.hh"
 #include "socket.hh"

src/zrtp/confirm.hh

@@ -1,7 +1,7 @@
 #pragma once
 
 
-#include "zrtp/defines.hh"
+#include "defines.hh"
 
 #include "util.hh"
 

src/zrtp/defines.hh

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../util.hh"
+#include "util.hh"
 
 namespace uvgrtp {
 

src/zrtp/dh_kxchng.cc

@@ -1,8 +1,8 @@
-#include "zrtp/dh_kxchng.hh"
+#include "dh_kxchng.hh"
 
-#include "zrtp/zrtp_receiver.hh"
+#include "zrtp_receiver.hh"
 
-#include "zrtp.hh"
+#include "../zrtp.hh"
 #include "crypto.hh"
 #include "frame.hh"
 #include "socket.hh"

src/zrtp/dh_kxchng.hh

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "zrtp/defines.hh"
+#include "defines.hh"
 
 #include "util.hh"
 

src/zrtp/error.cc

@@ -1,8 +1,8 @@
-#include "zrtp/error.hh"
+#include "error.hh"
 
-#include "zrtp/zrtp_receiver.hh"
+#include "zrtp_receiver.hh"
 
-#include "zrtp.hh"
+#include "../zrtp.hh"
 #include "crypto.hh"
 #include "socket.hh"
 #include "frame.hh"

src/zrtp/error.hh

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "zrtp/defines.hh"
+#include "defines.hh"
 
 #include "util.hh"
 

src/zrtp/hello.cc

@@ -1,8 +1,8 @@
-#include "zrtp/hello.hh"
+#include "hello.hh"
 
-#include "zrtp/zrtp_receiver.hh"
+#include "zrtp_receiver.hh"
 
-#include "zrtp.hh"
+#include "../zrtp.hh"
 #include "crypto.hh"
 #include "frame.hh"
 #include "socket.hh"

src/zrtp/hello.hh

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "zrtp/defines.hh"
+#include "defines.hh"
 
 #include "util.hh"
 

src/zrtp/hello_ack.cc

@@ -1,8 +1,8 @@
-#include "zrtp/hello_ack.hh"
+#include "hello_ack.hh"
 
-#include "zrtp/zrtp_receiver.hh"
+#include "zrtp_receiver.hh"
 
-#include "zrtp.hh"
+#include "../zrtp.hh"
 #include "crypto.hh"
 #include "frame.hh"
 #include "socket.hh"

src/zrtp/hello_ack.hh

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "zrtp/defines.hh"
+#include "defines.hh"
 
 #include "util.hh"
 

src/zrtp/zrtp_receiver.cc

@@ -1,16 +1,16 @@
-#include "zrtp/zrtp_receiver.hh"
+#include "zrtp_receiver.hh"
 
-#include "zrtp/defines.hh"
-#include "zrtp/dh_kxchng.hh"
-#include "zrtp/commit.hh"
-#include "zrtp/confack.hh"
-#include "zrtp/confirm.hh"
-#include "zrtp/hello.hh"
-#include "zrtp/hello_ack.hh"
+#include "defines.hh"
+#include "dh_kxchng.hh"
+#include "commit.hh"
+#include "confack.hh"
+#include "confirm.hh"
+#include "hello.hh"
+#include "hello_ack.hh"
 
 #include "socket.hh"
 #include "crypto.hh"
-#include "poll.hh"
+#include "../poll.hh"
 #include "debug.hh"
 #include "util.hh"