build: Move includes to include/uvgrtp folder

CMakeLists.txt

@@ -96,7 +96,7 @@ if (UNIX)
         )
     # endif (NOT "${LIBRARY_PATHS}" STREQUAL "")
 
-    install(DIRECTORY include/ DESTINATION /usr/local/include/uvgrtp
+    install(DIRECTORY include/uvgrtp DESTINATION /usr/local/include/uvgrtp
             FILES_MATCHING PATTERN "*.hh"
     )
 endif (UNIX)
@@ -131,7 +131,7 @@ if (WIN32)
         )
     # endif (NOT "${LIBRARY_PATHS}" STREQUAL "")
 
-    install(DIRECTORY include/ DESTINATION ${PROJECT_BINARY_DIR}/include
+    install(DIRECTORY include/uvgrtp DESTINATION ${PROJECT_BINARY_DIR}/include/uvgrtp
             FILES_MATCHING PATTERN "*.hh"
     )
 endif (WIN32)

src/clock.cc

@@ -1,6 +1,6 @@
-#include "clock.hh"
+#include "uvgrtp/clock.hh"
 
-#include "debug.hh"
+#include "uvgrtp/debug.hh"
 
 #include <stdio.h>
 

src/crypto.cc

@@ -1,6 +1,6 @@
-#include "crypto.hh"
+#include "uvgrtp/crypto.hh"
 
-#include "debug.hh"
+#include "uvgrtp/debug.hh"
 
 
 

src/dispatch.cc

@@ -1,8 +1,8 @@
 #include "dispatch.hh"
 
 #include "queue.hh"
-#include "socket.hh"
-#include "debug.hh"
+#include "uvgrtp/socket.hh"
+#include "uvgrtp/debug.hh"
 
 
 #ifndef _WIN32

src/dispatch.hh

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "runner.hh"
+#include "uvgrtp/runner.hh"
 
-#include "util.hh"
+#include "uvgrtp/util.hh"
 
 #include <condition_variable>
 #include <queue>

src/formats/h264.cc

@@ -2,7 +2,8 @@
 
 #include "../queue.hh"
 #include "../rtp.hh"
-#include "debug.hh"
+
+#include "uvgrtp/debug.hh"
 
 #include <cstdint>
 #include <cstring>

src/formats/h264.hh

@@ -1,10 +1,11 @@
 #pragma once
 
 #include "h26x.hh"
-#include "clock.hh"
-#include "util.hh"
-#include "frame.hh"
-#include "socket.hh"
+
+#include "uvgrtp/clock.hh"
+#include "uvgrtp/util.hh"
+#include "uvgrtp/frame.hh"
+#include "uvgrtp/socket.hh"
 
 #include <deque>
 

src/formats/h265.cc

@@ -3,7 +3,8 @@
 #include "../srtp/srtcp.hh"
 #include "../rtp.hh"
 #include "../queue.hh"
-#include "debug.hh"
+
+#include "uvgrtp/debug.hh"
 
 #include <cstdint>
 #include <cstring>

src/formats/h265.hh

@@ -1,10 +1,11 @@
 #pragma once
 
 #include "h26x.hh"
-#include "clock.hh"
-#include "util.hh"
-#include "frame.hh"
-#include "socket.hh"
+
+#include "uvgrtp/clock.hh"
+#include "uvgrtp/util.hh"
+#include "uvgrtp/frame.hh"
+#include "uvgrtp/socket.hh"
 
 #include <deque>
 #include <map>

src/formats/h266.cc

@@ -2,8 +2,9 @@
 
 #include "../rtp.hh"
 #include "../queue.hh"
-#include "frame.hh"
-#include "debug.hh"
+
+#include "uvgrtp/frame.hh"
+#include "uvgrtp/debug.hh"
 
 #include <cstdint>
 #include <cstring>

src/formats/h266.hh

@@ -2,11 +2,10 @@
 
 #include "h26x.hh"
 
-#include "util.hh"
-
-#include "socket.hh"
-#include "clock.hh"
-#include "frame.hh"
+#include "uvgrtp/util.hh"
+#include "uvgrtp/socket.hh"
+#include "uvgrtp/clock.hh"
+#include "uvgrtp/frame.hh"
 
 #include <deque>
 

src/formats/h26x.cc

@@ -2,8 +2,9 @@
 
 #include "../rtp.hh"
 #include "../queue.hh"
-#include "socket.hh"
-#include "debug.hh"
+
+#include "uvgrtp/socket.hh"
+#include "uvgrtp/debug.hh"
 
 
 #include <cstdint>
@@ -421,4 +422,4 @@ void uvgrtp::formats::h26x::prepend_start_code(int flags, uvgrtp::frame::rtp_fra
         (*out)->payload = pl;
         (*out)->payload_len += 4;
     }
-}
+}

src/formats/h26x.hh

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "media.hh"
-#include "util.hh"
-#include "socket.hh"
+#include "uvgrtp/util.hh"
+#include "uvgrtp/socket.hh"
 
 
 

src/formats/media.cc

@@ -1,9 +1,10 @@
 #include "media.hh"
 
 #include "../rtp.hh"
-#include "socket.hh"
 #include "../queue.hh"
-#include "debug.hh"
+
+#include "uvgrtp/socket.hh"
+#include "uvgrtp/debug.hh"
 
 #include <map>
 #include <unordered_map>

src/formats/media.hh

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

src/frame.cc

@@ -1,7 +1,7 @@
-#include "frame.hh"
+#include "uvgrtp/frame.hh"
 
-#include "util.hh"
-#include "debug.hh"
+#include "uvgrtp/util.hh"
+#include "uvgrtp/debug.hh"
 
 #include <cstring>
 

src/holepuncher.cc

@@ -1,8 +1,8 @@
 #include "holepuncher.hh"
 
-#include "clock.hh"
-#include "socket.hh"
-#include "debug.hh"
+#include "uvgrtp/clock.hh"
+#include "uvgrtp/socket.hh"
+#include "uvgrtp/debug.hh"
 
 
 #define THRESHOLD 2000

src/holepuncher.hh

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "runner.hh"
-#include "util.hh"
+#include "uvgrtp/runner.hh"
+#include "uvgrtp/util.hh"
 
 #include <atomic>
 

src/hostname.cc

@@ -1,6 +1,6 @@
 #include "hostname.hh"
 
-#include "debug.hh"
+#include "uvgrtp/debug.hh"
 
 #ifdef _WIN32
 //#include <windows.h>

src/lib.cc

@@ -1,9 +1,10 @@
-#include "lib.hh"
+#include "uvgrtp/lib.hh"
 
-#include "debug.hh"
 #include "hostname.hh"
 #include "random.hh"
-#include "session.hh"
+
+#include "uvgrtp/session.hh"
+#include "uvgrtp/debug.hh"
 
 #include <cstdlib>
 #include <cstring>

src/media_stream.cc

@@ -1,17 +1,17 @@
-#include "media_stream.hh"
+#include "uvgrtp/media_stream.hh"
 
 #include "formats/h264.hh"
 #include "formats/h265.hh"
 #include "formats/h266.hh"
-#include "debug.hh"
+#include "uvgrtp/debug.hh"
 #include "random.hh"
 #include "rtp.hh"
 #include "zrtp.hh"
 
 #include "holepuncher.hh"
 #include "pkt_dispatch.hh"
-#include "rtcp.hh"
-#include "socket.hh"
+#include "uvgrtp/rtcp.hh"
+#include "uvgrtp/socket.hh"
 #include "srtp/srtcp.hh"
 #include "srtp/srtp.hh"
 #include "formats/media.hh"

src/multicast.cc

@@ -1,6 +1,6 @@
 #include "multicast.hh"
 
-#include "frame.hh"
+#include "uvgrtp/frame.hh"
 
 uvgrtp::multicast::multicast()
 {

src/multicast.hh

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

src/pkt_dispatch.cc

@@ -1,10 +1,11 @@
 #include "pkt_dispatch.hh"
 
-#include "frame.hh"
-#include "socket.hh"
-#include "debug.hh"
 #include "random.hh"
-#include "util.hh"
+
+#include "uvgrtp/util.hh"
+#include "uvgrtp/frame.hh"
+#include "uvgrtp/socket.hh"
+#include "uvgrtp/debug.hh"
 
 #ifdef __linux__
 #include <errno.h>

src/pkt_dispatch.hh

@@ -1,8 +1,7 @@
 #pragma once
 
-#include "runner.hh"
-
-#include "util.hh"
+#include "uvgrtp/runner.hh"
+#include "uvgrtp/util.hh"
 
 #include <mutex>
 #include <unordered_map>

src/poll.cc

@@ -1,8 +1,8 @@
 #include "poll.hh"
 
 #include "multicast.hh"
-#include "socket.hh"
-#include "debug.hh"
+#include "uvgrtp/socket.hh"
+#include "uvgrtp/debug.hh"
 
 #ifdef _WIN32
 #include <winsock2.h>

src/poll.hh

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

src/queue.cc

@@ -6,9 +6,11 @@
 
 #include "rtp.hh"
 #include "srtp/base.hh"
-#include "debug.hh"
+
 #include "random.hh"
 
+#include "uvgrtp/debug.hh"
+
 #ifdef _WIN32
 #include <winsock2.h>
 #include <windows.h>

src/queue.hh

@@ -1,9 +1,9 @@
 #pragma once
 
 
-#include "frame.hh"
-#include "socket.hh"
-#include "util.hh"
+#include "uvgrtp/frame.hh"
+#include "uvgrtp/socket.hh"
+#include "uvgrtp/util.hh"
 
 #include <atomic>
 #include <memory>

src/random.cc

@@ -1,6 +1,6 @@
 #include "random.hh"
 
-#include "debug.hh"
+#include "uvgrtp/debug.hh"
 
 #ifdef _WIN32
 #include <winsock2.h>

src/random.hh

@@ -1,5 +1,5 @@
 
-#include "util.hh"
+#include "uvgrtp/util.hh"
 
 namespace uvgrtp {
     namespace random {

src/rtcp.cc

@@ -1,13 +1,14 @@
-#include "rtcp.hh"
+#include "uvgrtp/rtcp.hh"
 
 #include "hostname.hh"
 #include "poll.hh"
-#include "debug.hh"
-#include "util.hh"
 #include "rtp.hh"
-#include "frame.hh"
 #include "srtp/srtcp.hh"
 
+#include "uvgrtp/debug.hh"
+#include "uvgrtp/util.hh"
+#include "uvgrtp/frame.hh"
+
 #ifndef _WIN32
 #include <sys/time.h>
 #endif

src/rtp.cc

@@ -1,9 +1,10 @@
 #include "rtp.hh"
 
-#include "frame.hh"
-#include "debug.hh"
 #include "random.hh"
 
+#include "uvgrtp/frame.hh"
+#include "uvgrtp/debug.hh"
+
 #ifdef __linux__
 #include <arpa/inet.h>
 #include <unistd.h>

src/rtp.hh

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

src/runner.cc

@@ -1,4 +1,4 @@
-#include "runner.hh"
+#include "uvgrtp/runner.hh"
 
 uvgrtp::runner::runner():
     active_(false), runner_(nullptr)

src/session.cc

@@ -1,9 +1,9 @@
-#include "session.hh"
+#include "uvgrtp/session.hh"
 
-#include "media_stream.hh"
+#include "uvgrtp/media_stream.hh"
 #include "zrtp.hh"
-#include "crypto.hh"
-#include "debug.hh"
+#include "uvgrtp/crypto.hh"
+#include "uvgrtp/debug.hh"
 
 
 uvgrtp::session::session(std::string addr):

src/socket.cc

@@ -1,7 +1,7 @@
-#include "socket.hh"
+#include "uvgrtp/socket.hh"
 
-#include "debug.hh"
-#include "util.hh"
+#include "uvgrtp/debug.hh"
+#include "uvgrtp/util.hh"
 
 #ifdef _WIN32
 #include <winsock2.h>

src/srtp/base.cc

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

src/srtp/base.hh

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

src/srtp/srtcp.cc

@@ -1,7 +1,7 @@
 #include "srtcp.hh"
 
-#include "crypto.hh"
-#include "debug.hh"
+#include "uvgrtp/crypto.hh"
+#include "uvgrtp/debug.hh"
 
 #include <cstring>
 #include <iostream>

src/srtp/srtp.cc

@@ -1,9 +1,10 @@
 #include "srtp.hh"
 
 #include "base.hh"
-#include "crypto.hh"
-#include "debug.hh"
-#include "frame.hh"
+
+#include "uvgrtp/crypto.hh"
+#include "uvgrtp/debug.hh"
+#include "uvgrtp/frame.hh"
 
 #include <cstring>
 #include <iostream>

src/zrtp.cc

@@ -6,12 +6,15 @@
 #include "zrtp/dh_kxchng.hh"
 #include "zrtp/hello.hh"
 #include "zrtp/hello_ack.hh"
-#include "socket.hh"
 
-#include "debug.hh"
-#include "crypto.hh"
 #include "random.hh"
 
+#include "uvgrtp/socket.hh"
+#include "uvgrtp/debug.hh"
+#include "uvgrtp/crypto.hh"
+
+
+
 #include <cstring>
 #include <thread>
 

src/zrtp/commit.cc

@@ -1,10 +1,11 @@
 #include "commit.hh"
 
 #include "../zrtp.hh"
-#include "crypto.hh"
-#include "debug.hh"
-#include "frame.hh"
-#include "socket.hh"
+
+#include "uvgrtp/crypto.hh"
+#include "uvgrtp/debug.hh"
+#include "uvgrtp/frame.hh"
+#include "uvgrtp/socket.hh"
 
 #include <cassert>
 #include <cstring>

src/zrtp/commit.hh

@@ -3,7 +3,7 @@
 #include "defines.hh"
 #include "zrtp_message.hh"
 
-#include "util.hh"
+#include "uvgrtp/util.hh"
 
 #ifndef _WIN32
 #include <netinet/in.h>

src/zrtp/confack.cc

@@ -1,10 +1,11 @@
 #include "confack.hh"
 
 #include "../zrtp.hh"
-#include "crypto.hh"
-#include "frame.hh"
-#include "socket.hh"
-#include "debug.hh"
+
+#include "uvgrtp/crypto.hh"
+#include "uvgrtp/frame.hh"
+#include "uvgrtp/socket.hh"
+#include "uvgrtp/debug.hh"
 
 #include <cstring>
 

src/zrtp/confack.hh

@@ -4,7 +4,7 @@
 #include "zrtp_receiver.hh"
 #include "zrtp_message.hh"
 
-#include "util.hh"
+#include "uvgrtp/util.hh"
 
 #ifndef _WIN32
 #include <netinet/in.h>

src/zrtp/confirm.cc

@@ -1,10 +1,11 @@
 #include "confirm.hh"
 
 #include "../zrtp.hh"
-#include "crypto.hh"
-#include "frame.hh"
-#include "socket.hh"
-#include "debug.hh"
+
+#include "uvgrtp/crypto.hh"
+#include "uvgrtp/frame.hh"
+#include "uvgrtp/socket.hh"
+#include "uvgrtp/debug.hh"
 
 #include <cstring>
 

src/zrtp/confirm.hh

@@ -4,7 +4,7 @@
 #include "defines.hh"
 #include "zrtp_message.hh"
 
-#include "util.hh"
+#include "uvgrtp/util.hh"
 
 #ifndef _WIN32
 #include <netinet/in.h>

src/zrtp/defines.hh

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

src/zrtp/dh_kxchng.cc

@@ -3,10 +3,11 @@
 #include "zrtp_receiver.hh"
 
 #include "../zrtp.hh"
-#include "crypto.hh"
-#include "frame.hh"
-#include "socket.hh"
-#include "debug.hh"
+
+#include "uvgrtp/crypto.hh"
+#include "uvgrtp/frame.hh"
+#include "uvgrtp/socket.hh"
+#include "uvgrtp/debug.hh"
 
 #include <cstring>
 

src/zrtp/dh_kxchng.hh

@@ -3,7 +3,7 @@
 #include "defines.hh"
 #include "zrtp_message.hh"
 
-#include "util.hh"
+#include "uvgrtp/util.hh"
 
 #ifndef _WIN32
 #include <netinet/in.h>

src/zrtp/error.cc

@@ -3,11 +3,11 @@
 #include "zrtp_receiver.hh"
 
 #include "../zrtp.hh"
-#include "crypto.hh"
-#include "socket.hh"
-#include "frame.hh"
 
-#include "debug.hh"
+#include "uvgrtp/crypto.hh"
+#include "uvgrtp/socket.hh"
+#include "uvgrtp/frame.hh"
+#include "uvgrtp/debug.hh"
 
 
 #include <cstring>

src/zrtp/error.hh

@@ -3,7 +3,7 @@
 #include "defines.hh"
 #include "zrtp_message.hh"
 
-#include "util.hh"
+#include "uvgrtp/util.hh"
 
 #ifndef _WIN32
 #include <netinet/in.h>

src/zrtp/hello.cc

@@ -3,12 +3,11 @@
 #include "zrtp_receiver.hh"
 
 #include "../zrtp.hh"
-#include "crypto.hh"
-#include "frame.hh"
-#include "socket.hh"
-#include "debug.hh"
-
 
+#include "uvgrtp/crypto.hh"
+#include "uvgrtp/frame.hh"
+#include "uvgrtp/socket.hh"
+#include "uvgrtp/debug.hh"
 
 #include <cstring>
 

src/zrtp/hello.hh

@@ -3,7 +3,7 @@
 #include "defines.hh"
 #include "zrtp_message.hh"
 
-#include "util.hh"
+#include "uvgrtp/util.hh"
 
 #ifndef _WIN32
 #include <netinet/in.h>

src/zrtp/hello_ack.cc

@@ -3,10 +3,11 @@
 #include "zrtp_receiver.hh"
 
 #include "../zrtp.hh"
-#include "crypto.hh"
-#include "frame.hh"
-#include "socket.hh"
-#include "debug.hh"
+
+#include "uvgrtp/crypto.hh"
+#include "uvgrtp/frame.hh"
+#include "uvgrtp/socket.hh"
+#include "uvgrtp/debug.hh"
 
 #include <cstring>
 

src/zrtp/hello_ack.hh

@@ -3,7 +3,7 @@
 #include "defines.hh"
 #include "zrtp_message.hh"
 
-#include "util.hh"
+#include "uvgrtp/util.hh"
 
 #ifndef _WIN32
 #include <netinet/in.h>

src/zrtp/zrtp_message.cc

@@ -1,9 +1,9 @@
 #include "zrtp_message.hh"
 
-#include "frame.hh"
-#include "socket.hh"
+#include "uvgrtp/frame.hh"
+#include "uvgrtp/socket.hh"
 
-#include "debug.hh"
+#include "uvgrtp/debug.hh"
 
 #include <string>
 

src/zrtp/zrtp_message.hh

@@ -1,9 +1,10 @@
 #pragma once
 
 #include "defines.hh"
-#include "util.hh"
 #include "../zrtp.hh"
-#include "frame.hh"
+
+#include "uvgrtp/frame.hh"
+#include "uvgrtp/util.hh"
 
 
 namespace uvgrtp {
@@ -40,4 +41,4 @@ namespace uvgrtp {
 };
 
 
-namespace uvg_rtp = uvgrtp;
+namespace uvg_rtp = uvgrtp;

src/zrtp/zrtp_receiver.cc

@@ -8,11 +8,13 @@
 #include "hello.hh"
 #include "hello_ack.hh"
 
-#include "socket.hh"
-#include "crypto.hh"
 #include "../poll.hh"
-#include "debug.hh"
-#include "util.hh"
+
+#include "uvgrtp/socket.hh"
+#include "uvgrtp/crypto.hh"
+
+#include "uvgrtp/debug.hh"
+#include "uvgrtp/util.hh"
 
 #ifdef _WIN32
 #include <winsock2.h>

src/zrtp/zrtp_receiver.hh

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util.hh"
+#include "uvgrtp/util.hh"
 
 #ifndef _WIN32
 #include <netinet/in.h>

uvgRTP.pro

@@ -66,17 +66,17 @@ SOURCES += \
 	src/srtp/srtcp.cc \
 
 HEADERS += \
-	include/clock.hh \
-	include/crypto.hh \
-	include/debug.hh \
-	include/frame.hh \
-	include/lib.hh \
-	include/media_stream.hh \
-	include/rtcp.hh \
-	include/runner.hh \
-	include/session.hh \
-	include/socket.hh \
-	include/util.hh \
+	include/uvgrtp/clock.hh \
+	include/uvgrtp/crypto.hh \
+	include/uvgrtp/debug.hh \
+	include/uvgrtp/frame.hh \
+	include/uvgrtp/lib.hh \
+	include/uvgrtp/media_stream.hh \
+	include/uvgrtp/rtcp.hh \
+	include/uvgrtp/runner.hh \
+	include/uvgrtp/session.hh \
+	include/uvgrtp/socket.hh \
+	include/uvgrtp/util.hh \
 	src/dispatch.hh \
 	src/holepuncher.hh \
 	src/hostname.hh \