build: Move includes to include/uvgrtp folder

This commit is contained in:
Joni Räsänen 2021-07-09 12:10:23 +03:00
parent 06fdcd519b
commit 3b5acb7f88
73 changed files with 177 additions and 155 deletions

View File

@ -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)

View File

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

View File

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

View File

@ -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

View File

@ -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>

View File

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

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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;
}
}
}

View File

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

View File

@ -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>

View File

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

View File

@ -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>

View File

@ -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

View File

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

View File

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

View File

@ -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>

View File

@ -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"

View File

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

View File

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

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

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

View File

@ -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>

View File

@ -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>

View File

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

View File

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

View File

@ -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

View File

@ -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>

View File

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

View File

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

View File

@ -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):

View File

@ -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>

View File

@ -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>

View File

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

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

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

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

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

View File

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

View File

@ -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>

View File

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

View File

@ -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>

View File

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

View File

@ -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>

View File

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

View File

@ -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>

View File

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

View File

@ -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>

View File

@ -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;

View File

@ -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>

View File

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

View File

@ -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 \