From 3b5acb7f88400163994d1800bc67d995a8390e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= Date: Fri, 9 Jul 2021 12:10:23 +0300 Subject: [PATCH] build: Move includes to include/uvgrtp folder --- CMakeLists.txt | 4 ++-- include/{ => uvgrtp}/clock.hh | 0 include/{ => uvgrtp}/crypto.hh | 0 include/{ => uvgrtp}/debug.hh | 0 include/{ => uvgrtp}/frame.hh | 0 include/{ => uvgrtp}/lib.hh | 0 include/{ => uvgrtp}/media_stream.hh | 0 include/{ => uvgrtp}/rtcp.hh | 0 include/{ => uvgrtp}/runner.hh | 0 include/{ => uvgrtp}/session.hh | 0 include/{ => uvgrtp}/socket.hh | 0 include/{ => uvgrtp}/util.hh | 0 src/clock.cc | 4 ++-- src/crypto.cc | 4 ++-- src/dispatch.cc | 4 ++-- src/dispatch.hh | 4 ++-- src/formats/h264.cc | 3 ++- src/formats/h264.hh | 9 +++++---- src/formats/h265.cc | 3 ++- src/formats/h265.hh | 9 +++++---- src/formats/h266.cc | 5 +++-- src/formats/h266.hh | 9 ++++----- src/formats/h26x.cc | 7 ++++--- src/formats/h26x.hh | 4 ++-- src/formats/media.cc | 5 +++-- src/formats/media.hh | 2 +- src/frame.cc | 6 +++--- src/holepuncher.cc | 6 +++--- src/holepuncher.hh | 4 ++-- src/hostname.cc | 2 +- src/lib.cc | 7 ++++--- src/media_stream.cc | 8 ++++---- src/multicast.cc | 2 +- src/multicast.hh | 2 +- src/pkt_dispatch.cc | 9 +++++---- src/pkt_dispatch.hh | 5 ++--- src/poll.cc | 4 ++-- src/poll.hh | 2 +- src/queue.cc | 4 +++- src/queue.hh | 6 +++--- src/random.cc | 2 +- src/random.hh | 2 +- src/rtcp.cc | 9 +++++---- src/rtp.cc | 5 +++-- src/rtp.hh | 4 ++-- src/runner.cc | 2 +- src/session.cc | 8 ++++---- src/socket.cc | 6 +++--- src/srtp/base.cc | 4 ++-- src/srtp/base.hh | 2 +- src/srtp/srtcp.cc | 4 ++-- src/srtp/srtp.cc | 7 ++++--- src/zrtp.cc | 9 ++++++--- src/zrtp/commit.cc | 9 +++++---- src/zrtp/commit.hh | 2 +- src/zrtp/confack.cc | 9 +++++---- src/zrtp/confack.hh | 2 +- src/zrtp/confirm.cc | 9 +++++---- src/zrtp/confirm.hh | 2 +- src/zrtp/defines.hh | 2 +- src/zrtp/dh_kxchng.cc | 9 +++++---- src/zrtp/dh_kxchng.hh | 2 +- src/zrtp/error.cc | 8 ++++---- src/zrtp/error.hh | 2 +- src/zrtp/hello.cc | 9 ++++----- src/zrtp/hello.hh | 2 +- src/zrtp/hello_ack.cc | 9 +++++---- src/zrtp/hello_ack.hh | 2 +- src/zrtp/zrtp_message.cc | 6 +++--- src/zrtp/zrtp_message.hh | 7 ++++--- src/zrtp/zrtp_receiver.cc | 10 ++++++---- src/zrtp/zrtp_receiver.hh | 2 +- uvgRTP.pro | 22 +++++++++++----------- 73 files changed, 177 insertions(+), 155 deletions(-) rename include/{ => uvgrtp}/clock.hh (100%) rename include/{ => uvgrtp}/crypto.hh (100%) rename include/{ => uvgrtp}/debug.hh (100%) rename include/{ => uvgrtp}/frame.hh (100%) rename include/{ => uvgrtp}/lib.hh (100%) rename include/{ => uvgrtp}/media_stream.hh (100%) rename include/{ => uvgrtp}/rtcp.hh (100%) rename include/{ => uvgrtp}/runner.hh (100%) rename include/{ => uvgrtp}/session.hh (100%) rename include/{ => uvgrtp}/socket.hh (100%) rename include/{ => uvgrtp}/util.hh (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index ebb2a5c..0fdca52 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/include/clock.hh b/include/uvgrtp/clock.hh similarity index 100% rename from include/clock.hh rename to include/uvgrtp/clock.hh diff --git a/include/crypto.hh b/include/uvgrtp/crypto.hh similarity index 100% rename from include/crypto.hh rename to include/uvgrtp/crypto.hh diff --git a/include/debug.hh b/include/uvgrtp/debug.hh similarity index 100% rename from include/debug.hh rename to include/uvgrtp/debug.hh diff --git a/include/frame.hh b/include/uvgrtp/frame.hh similarity index 100% rename from include/frame.hh rename to include/uvgrtp/frame.hh diff --git a/include/lib.hh b/include/uvgrtp/lib.hh similarity index 100% rename from include/lib.hh rename to include/uvgrtp/lib.hh diff --git a/include/media_stream.hh b/include/uvgrtp/media_stream.hh similarity index 100% rename from include/media_stream.hh rename to include/uvgrtp/media_stream.hh diff --git a/include/rtcp.hh b/include/uvgrtp/rtcp.hh similarity index 100% rename from include/rtcp.hh rename to include/uvgrtp/rtcp.hh diff --git a/include/runner.hh b/include/uvgrtp/runner.hh similarity index 100% rename from include/runner.hh rename to include/uvgrtp/runner.hh diff --git a/include/session.hh b/include/uvgrtp/session.hh similarity index 100% rename from include/session.hh rename to include/uvgrtp/session.hh diff --git a/include/socket.hh b/include/uvgrtp/socket.hh similarity index 100% rename from include/socket.hh rename to include/uvgrtp/socket.hh diff --git a/include/util.hh b/include/uvgrtp/util.hh similarity index 100% rename from include/util.hh rename to include/uvgrtp/util.hh diff --git a/src/clock.cc b/src/clock.cc index c52418f..a785393 100644 --- a/src/clock.cc +++ b/src/clock.cc @@ -1,6 +1,6 @@ -#include "clock.hh" +#include "uvgrtp/clock.hh" -#include "debug.hh" +#include "uvgrtp/debug.hh" #include diff --git a/src/crypto.cc b/src/crypto.cc index bacd7b5..bd483a9 100644 --- a/src/crypto.cc +++ b/src/crypto.cc @@ -1,6 +1,6 @@ -#include "crypto.hh" +#include "uvgrtp/crypto.hh" -#include "debug.hh" +#include "uvgrtp/debug.hh" diff --git a/src/dispatch.cc b/src/dispatch.cc index 62c1868..f152fe0 100644 --- a/src/dispatch.cc +++ b/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 diff --git a/src/dispatch.hh b/src/dispatch.hh index 92df6e3..c0fa982 100644 --- a/src/dispatch.hh +++ b/src/dispatch.hh @@ -1,8 +1,8 @@ #pragma once -#include "runner.hh" +#include "uvgrtp/runner.hh" -#include "util.hh" +#include "uvgrtp/util.hh" #include #include diff --git a/src/formats/h264.cc b/src/formats/h264.cc index af2c32d..1134af6 100644 --- a/src/formats/h264.cc +++ b/src/formats/h264.cc @@ -2,7 +2,8 @@ #include "../queue.hh" #include "../rtp.hh" -#include "debug.hh" + +#include "uvgrtp/debug.hh" #include #include diff --git a/src/formats/h264.hh b/src/formats/h264.hh index 9c83156..cf0402a 100644 --- a/src/formats/h264.hh +++ b/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 diff --git a/src/formats/h265.cc b/src/formats/h265.cc index c02d1d4..3887e65 100644 --- a/src/formats/h265.cc +++ b/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 #include diff --git a/src/formats/h265.hh b/src/formats/h265.hh index c452f75..9b00312 100644 --- a/src/formats/h265.hh +++ b/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 #include diff --git a/src/formats/h266.cc b/src/formats/h266.cc index 75affa5..3ff0f09 100644 --- a/src/formats/h266.cc +++ b/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 #include diff --git a/src/formats/h266.hh b/src/formats/h266.hh index 5cd7ca2..c21094a 100644 --- a/src/formats/h266.hh +++ b/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 diff --git a/src/formats/h26x.cc b/src/formats/h26x.cc index 97b5fc5..feea3bd 100644 --- a/src/formats/h26x.cc +++ b/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 @@ -421,4 +422,4 @@ void uvgrtp::formats::h26x::prepend_start_code(int flags, uvgrtp::frame::rtp_fra (*out)->payload = pl; (*out)->payload_len += 4; } -} \ No newline at end of file +} diff --git a/src/formats/h26x.hh b/src/formats/h26x.hh index 8f36261..3a33f42 100644 --- a/src/formats/h26x.hh +++ b/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" diff --git a/src/formats/media.cc b/src/formats/media.cc index 7927210..4b3fb10 100644 --- a/src/formats/media.cc +++ b/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 #include diff --git a/src/formats/media.hh b/src/formats/media.hh index 6661ff4..010cbe6 100644 --- a/src/formats/media.hh +++ b/src/formats/media.hh @@ -1,6 +1,6 @@ #pragma once -#include "util.hh" +#include "uvgrtp/util.hh" #include #include diff --git a/src/frame.cc b/src/frame.cc index 0b187f8..ca733a7 100644 --- a/src/frame.cc +++ b/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 diff --git a/src/holepuncher.cc b/src/holepuncher.cc index 3f9759f..b359d4e 100644 --- a/src/holepuncher.cc +++ b/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 diff --git a/src/holepuncher.hh b/src/holepuncher.hh index fcf2550..db542a7 100644 --- a/src/holepuncher.hh +++ b/src/holepuncher.hh @@ -1,7 +1,7 @@ #pragma once -#include "runner.hh" -#include "util.hh" +#include "uvgrtp/runner.hh" +#include "uvgrtp/util.hh" #include diff --git a/src/hostname.cc b/src/hostname.cc index 9691b29..50ce7a4 100644 --- a/src/hostname.cc +++ b/src/hostname.cc @@ -1,6 +1,6 @@ #include "hostname.hh" -#include "debug.hh" +#include "uvgrtp/debug.hh" #ifdef _WIN32 //#include diff --git a/src/lib.cc b/src/lib.cc index 2613437..3460f17 100644 --- a/src/lib.cc +++ b/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 #include diff --git a/src/media_stream.cc b/src/media_stream.cc index f7a6647..0adb469 100644 --- a/src/media_stream.cc +++ b/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" diff --git a/src/multicast.cc b/src/multicast.cc index 5a7cc80..c4949c5 100644 --- a/src/multicast.cc +++ b/src/multicast.cc @@ -1,6 +1,6 @@ #include "multicast.hh" -#include "frame.hh" +#include "uvgrtp/frame.hh" uvgrtp::multicast::multicast() { diff --git a/src/multicast.hh b/src/multicast.hh index fc11cfe..3c5b9d0 100644 --- a/src/multicast.hh +++ b/src/multicast.hh @@ -1,6 +1,6 @@ #pragma once -#include "util.hh" +#include "uvgrtp/util.hh" namespace uvgrtp { class connection; diff --git a/src/pkt_dispatch.cc b/src/pkt_dispatch.cc index 59dac45..58192bf 100644 --- a/src/pkt_dispatch.cc +++ b/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 diff --git a/src/pkt_dispatch.hh b/src/pkt_dispatch.hh index ed5df6f..d7f9e06 100644 --- a/src/pkt_dispatch.hh +++ b/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 #include diff --git a/src/poll.cc b/src/poll.cc index d060d28..59e99a4 100644 --- a/src/poll.cc +++ b/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 diff --git a/src/poll.hh b/src/poll.hh index 31384e1..e960956 100644 --- a/src/poll.hh +++ b/src/poll.hh @@ -1,6 +1,6 @@ #pragma once -#include "util.hh" +#include "uvgrtp/util.hh" #include diff --git a/src/queue.cc b/src/queue.cc index 44c1326..8aad392 100644 --- a/src/queue.cc +++ b/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 #include diff --git a/src/queue.hh b/src/queue.hh index 1fb9f34..6f66ee4 100644 --- a/src/queue.hh +++ b/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 #include diff --git a/src/random.cc b/src/random.cc index 55b3873..b16d21d 100644 --- a/src/random.cc +++ b/src/random.cc @@ -1,6 +1,6 @@ #include "random.hh" -#include "debug.hh" +#include "uvgrtp/debug.hh" #ifdef _WIN32 #include diff --git a/src/random.hh b/src/random.hh index aba27dd..50c8ad5 100644 --- a/src/random.hh +++ b/src/random.hh @@ -1,5 +1,5 @@ -#include "util.hh" +#include "uvgrtp/util.hh" namespace uvgrtp { namespace random { diff --git a/src/rtcp.cc b/src/rtcp.cc index 230fed6..e70d911 100644 --- a/src/rtcp.cc +++ b/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 #endif diff --git a/src/rtp.cc b/src/rtp.cc index 8dc213f..d6b77f3 100644 --- a/src/rtp.cc +++ b/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 #include diff --git a/src/rtp.hh b/src/rtp.hh index 63ac10b..07203c7 100644 --- a/src/rtp.hh +++ b/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 { diff --git a/src/runner.cc b/src/runner.cc index 9bfa5ec..0d91bf2 100644 --- a/src/runner.cc +++ b/src/runner.cc @@ -1,4 +1,4 @@ -#include "runner.hh" +#include "uvgrtp/runner.hh" uvgrtp::runner::runner(): active_(false), runner_(nullptr) diff --git a/src/session.cc b/src/session.cc index f2e4020..474128f 100644 --- a/src/session.cc +++ b/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): diff --git a/src/socket.cc b/src/socket.cc index c5e720b..12e4e09 100644 --- a/src/socket.cc +++ b/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 diff --git a/src/srtp/base.cc b/src/srtp/base.cc index 8720175..db9ac97 100644 --- a/src/srtp/base.cc +++ b/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 #include diff --git a/src/srtp/base.hh b/src/srtp/base.hh index 5f4b989..7147f99 100644 --- a/src/srtp/base.hh +++ b/src/srtp/base.hh @@ -1,6 +1,6 @@ #pragma once -#include "util.hh" +#include "uvgrtp/util.hh" #ifdef _WIN32 #include diff --git a/src/srtp/srtcp.cc b/src/srtp/srtcp.cc index 938562b..3902cc9 100644 --- a/src/srtp/srtcp.cc +++ b/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 #include diff --git a/src/srtp/srtp.cc b/src/srtp/srtp.cc index ace7840..727ae0e 100644 --- a/src/srtp/srtp.cc +++ b/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 #include diff --git a/src/zrtp.cc b/src/zrtp.cc index f77463a..67071b5 100644 --- a/src/zrtp.cc +++ b/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 #include diff --git a/src/zrtp/commit.cc b/src/zrtp/commit.cc index f1a3bbd..ec34788 100644 --- a/src/zrtp/commit.cc +++ b/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 #include diff --git a/src/zrtp/commit.hh b/src/zrtp/commit.hh index 2c13f9f..80856e2 100644 --- a/src/zrtp/commit.hh +++ b/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 diff --git a/src/zrtp/confack.cc b/src/zrtp/confack.cc index aff5003..96259eb 100644 --- a/src/zrtp/confack.cc +++ b/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 diff --git a/src/zrtp/confack.hh b/src/zrtp/confack.hh index 4df63b2..ba2d554 100644 --- a/src/zrtp/confack.hh +++ b/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 diff --git a/src/zrtp/confirm.cc b/src/zrtp/confirm.cc index b9223be..ab98f23 100644 --- a/src/zrtp/confirm.cc +++ b/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 diff --git a/src/zrtp/confirm.hh b/src/zrtp/confirm.hh index ea403e3..7d3a7e6 100644 --- a/src/zrtp/confirm.hh +++ b/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 diff --git a/src/zrtp/defines.hh b/src/zrtp/defines.hh index f249558..d7068e0 100644 --- a/src/zrtp/defines.hh +++ b/src/zrtp/defines.hh @@ -1,6 +1,6 @@ #pragma once -#include "util.hh" +#include "uvgrtp/util.hh" namespace uvgrtp { diff --git a/src/zrtp/dh_kxchng.cc b/src/zrtp/dh_kxchng.cc index b619ff1..666b8b0 100644 --- a/src/zrtp/dh_kxchng.cc +++ b/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 diff --git a/src/zrtp/dh_kxchng.hh b/src/zrtp/dh_kxchng.hh index b72beba..d1dacf8 100644 --- a/src/zrtp/dh_kxchng.hh +++ b/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 diff --git a/src/zrtp/error.cc b/src/zrtp/error.cc index 4e6ac9d..30a705b 100644 --- a/src/zrtp/error.cc +++ b/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 diff --git a/src/zrtp/error.hh b/src/zrtp/error.hh index 40a80ab..5618e73 100644 --- a/src/zrtp/error.hh +++ b/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 diff --git a/src/zrtp/hello.cc b/src/zrtp/hello.cc index f0b9085..c7fdda2 100644 --- a/src/zrtp/hello.cc +++ b/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 diff --git a/src/zrtp/hello.hh b/src/zrtp/hello.hh index dab57c2..d87a746 100644 --- a/src/zrtp/hello.hh +++ b/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 diff --git a/src/zrtp/hello_ack.cc b/src/zrtp/hello_ack.cc index 6d04245..76d3df2 100644 --- a/src/zrtp/hello_ack.cc +++ b/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 diff --git a/src/zrtp/hello_ack.hh b/src/zrtp/hello_ack.hh index a40f777..a7fc9ce 100644 --- a/src/zrtp/hello_ack.hh +++ b/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 diff --git a/src/zrtp/zrtp_message.cc b/src/zrtp/zrtp_message.cc index 0a7fed1..ced97bd 100644 --- a/src/zrtp/zrtp_message.cc +++ b/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 diff --git a/src/zrtp/zrtp_message.hh b/src/zrtp/zrtp_message.hh index 33f56f1..7c01fad 100644 --- a/src/zrtp/zrtp_message.hh +++ b/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; \ No newline at end of file +namespace uvg_rtp = uvgrtp; diff --git a/src/zrtp/zrtp_receiver.cc b/src/zrtp/zrtp_receiver.cc index 5d5fdde..3082f01 100644 --- a/src/zrtp/zrtp_receiver.cc +++ b/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 diff --git a/src/zrtp/zrtp_receiver.hh b/src/zrtp/zrtp_receiver.hh index 194d632..1124176 100644 --- a/src/zrtp/zrtp_receiver.hh +++ b/src/zrtp/zrtp_receiver.hh @@ -1,6 +1,6 @@ #pragma once -#include "util.hh" +#include "uvgrtp/util.hh" #ifndef _WIN32 #include diff --git a/uvgRTP.pro b/uvgRTP.pro index a497fb7..bbf1427 100644 --- a/uvgRTP.pro +++ b/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 \