rtp.h: do not include config_*.h

Author: MartinPulec

src/audio/audio.cpp

@@ -48,6 +48,7 @@
  */
 
 #include <array>
+#include <cassert>
 #include <cinttypes>
 #include <cstdio>
 #include <cstdlib>

src/audio/jack.c

@@ -41,6 +41,7 @@
  */
 
 #include <jack/jack.h>
+#include <math.h>          // for nexttowardf
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>

src/audio/playback/mixer.cpp

@@ -52,6 +52,12 @@
 #include <thread>
 #include <utility>                 // for move, pair
 #include <vector>
+#ifdef _WIN32
+#include <ws2tcpip.h>
+#else
+#include <netinet/in.h>            // for sockaddr_in, sockaddr_in6
+#include <sys/socket.h>            // for sockaddr_storage, AF_UNSPEC, AF_INET
+#endif
 
 #include "audio/audio_playback.h"
 #include "audio/codec.h"

src/rtp/ldgm.cpp

@@ -35,6 +35,7 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <cassert>
 #include <cerrno>
 #include <climits>
 #include <cstdio>
@@ -46,6 +47,9 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#ifdef _WIN32
+#include <windows.h>
+#endif
 
 #define WANT_MKDIR
 #include "compat/misc.h"           // for mkdir

src/rtp/rtp.c

@@ -1172,7 +1172,9 @@ struct rtp *rtp_init_if(const char *addr, const char *iface,
         return session;
 }
 
-rtp_t rtp_init_with_udp_socket(struct socket_udp_local *l, struct sockaddr *sa, socklen_t len, rtp_callback callback)
+rtp_t
+rtp_init_with_udp_socket(struct socket_udp_local *l, struct sockaddr *sa,
+                         unsigned len, rtp_callback callback)
 {
         struct rtp *session;
         int i, j;

src/rtp/rtp.h

@@ -37,9 +37,6 @@
 #ifndef __RTP_H__
 #define __RTP_H__
 
-#include "config_win32.h"
-#include "config_unix.h"
-
 #ifdef __cplusplus
 #include <cstddef> // offsetof
 #include <cstdint>
@@ -237,7 +234,10 @@ typedef enum {
                                         // RTP_POT_RECORD_SOURCE
 } rtp_option;
 
+struct msghdr;
+struct sockaddr;
 struct socket_udp_local;
+struct timeval;
 
 /* API */
 rtp_t		rtp_init(const char *addr, 
@@ -254,7 +254,7 @@ rtp_t		rtp_init_if(const char *addr, const char *iface,
 			    rtp_callback callback,
 			    uint8_t *userdata,
                             int force_ip_version, bool multithreaded);
-rtp_t            rtp_init_with_udp_socket(struct socket_udp_local *l, struct sockaddr *sa, socklen_t len, rtp_callback callback);
+rtp_t            rtp_init_with_udp_socket(struct socket_udp_local *l, struct sockaddr *sa, unsigned len, rtp_callback callback);
 
 void		 rtp_send_bye(struct rtp *session);
 void		 rtp_done(struct rtp *session);

src/transmit.cpp

@@ -58,13 +58,19 @@
 
 #include <algorithm>
 #include <array>
+#include <cassert>
+#include <cmath>
 #include <iostream>
 #include <sstream>
 #include <vector>
+#ifdef _WIN32
+#include <windef.h>                   // for LARGE_INTEGER
+#endif
 
 #include "audio/codec.h"
 #include "audio/types.h"
 #include "audio/utils.h"
+#include "compat/net.h"              // for htonl etc.
 #include "control_socket.h"
 #include "crypto/openssl_encrypt.h"
 #include "debug.h"
@@ -432,12 +438,12 @@ tx_send(struct tx *tx, struct video_frame *frame, struct rtp *rtp_session)
 
         for(i = 0; i < frame->tile_count; ++i)
         {
-                int last = FALSE;
+                bool last = false;
                 int fragment_offset = 0;
 
                 if (i == frame->tile_count - 1) {
                         if(!frame->fragment || frame->last_fragment)
-                                last = TRUE;
+                                last = true;
                 }
                 if(frame->fragment)
                         fragment_offset = vf_get_tile(frame, i)->offset;

src/utils/fs.h

@@ -41,7 +41,7 @@
 
 // maximal platform path length including terminating null byte
 #ifdef _WIN32
-#include <windows.h>
+#include <windef.h>            /// for MAX_PATH
 #define MAX_PATH_SIZE (MAX_PATH + 1)
 #define PATH_SEPARATOR "\\"
 #else

src/video_capture/rtsp.c

@@ -57,6 +57,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>                  // for timespec
+#ifndef _WIN32
+#include <unistd.h>                // for unlink
+#endif // defined _WIN32
 
 #include "audio/types.h"
 #include "config.h"                // for PACKAGE_BUGREPORT
@@ -356,7 +359,7 @@ keep_alive_thread(void *arg){
         // actual keepalive
         MSG(DEBUG, "GET PARAMETERS %s:\n", s->uri);
         if (!rtsp_get_parameters(s->curl, s->uri)) {
-            s->should_exit = TRUE;
+            s->should_exit = true;
             exit_uv(1);
         }
     }
@@ -722,7 +725,7 @@ vidcap_rtsp_init(struct vidcap_params *params, void **state) {
     s->vrtsp_state.desc.fps = 30;
     s->vrtsp_state.desc.interlacing = PROGRESSIVE;
 
-    s->should_exit = FALSE;
+    s->should_exit = false;
 
     s->vrtsp_state.boss_waiting = false;
     s->vrtsp_state.worker_waiting = false;

src/video_rxtx/rtp.cpp

@@ -35,6 +35,7 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <cassert>
 #include <cinttypes>
 #include <map>
 #include <mutex>
@@ -295,17 +296,17 @@ struct rtp *rtp_video_rxtx::initialize_network(const char *addr, int recv_port,
         }
         struct rtp *device =
             rtp_init_if(addr, mcast_if, recv_port, send_port, ttl, rtcp_bw,
-                        FALSE, rtp_recv_callback, (uint8_t *) participants,
+                        false, rtp_recv_callback, (uint8_t *) participants,
                         force_ip_version, multithreaded);
         if (device == nullptr) {
                 return nullptr;
         }
-        rtp_set_option(device, RTP_OPT_WEAK_VALIDATION, TRUE);
-        rtp_set_option(device, RTP_OPT_PROMISC, TRUE);
+        rtp_set_option(device, RTP_OPT_WEAK_VALIDATION, true);
+        rtp_set_option(device, RTP_OPT_PROMISC, true);
         rtp_set_sdes(device, rtp_my_ssrc(device),
                      RTCP_SDES_TOOL, PACKAGE_STRING, strlen(PACKAGE_STRING));
         if (strcmp(addr, IN6_BLACKHOLE_SERVER_MODE_STR) == 0) {
-                rtp_set_option(device, RTP_OPT_SEND_BACK, TRUE);
+                rtp_set_option(device, RTP_OPT_SEND_BACK, true);
         }
 
         rtp_set_recv_buf(device, INITIAL_VIDEO_RECV_BUFFER_SIZE);