vrxtx_params: use enum for rxtx_mode (clarity)

define the enum at the same time

Author: MartinPulec

src/host.h

@@ -99,9 +99,6 @@ extern unsigned int cuda_devices[];
 extern unsigned int cuda_devices_count;
 extern bool cuda_devices_explicit; ///< --cuda-device/-D specified expilcitly
 
-#define MODE_SENDER   (1U<<0U)
-#define MODE_RECEIVER (1U<<1U)
-
 typedef void (*mainloop_t)(void *);
 /// mainloop to be run if display mainloop isn't run
 extern mainloop_t mainloop;

src/main.cpp

@@ -1245,10 +1245,12 @@ static int adjust_params(struct ug_options *opt) {
         }
 
         if (strcmp("none", opt->requested_display) != 0) {
-                opt->video.rxtx_mode |= MODE_RECEIVER;
+                opt->video.rxtx_mode =
+                    (enum rxtx_mode)(opt->video.rxtx_mode | MODE_RECEIVER);
         }
         if (strcmp("none", vidcap_params_get_driver(opt->vidcap_params_head)) != 0) {
-                opt->video.rxtx_mode |= MODE_SENDER;
+                opt->video.rxtx_mode =
+                    (enum rxtx_mode)(opt->video.rxtx_mode | MODE_SENDER);
         }
 
         adjust_ports(opt, audio_rxtx_mode);

src/types.h

@@ -363,6 +363,13 @@ enum video_mode {
         VIDEO_3X1,     ///< 3x1 video
 };
 
+/// bit sum SENDER+RECEIVER for duplex operation
+enum rxtx_mode {
+        RXTX_MODE_NONE = 0,
+        MODE_SENDER    = 1 << 0,
+        MODE_RECEIVER  = 1 << 1,
+};
+
 enum tx_media_type {
         TX_MEDIA_AUDIO,
         TX_MEDIA_VIDEO

src/video_rxtx.hpp

@@ -60,7 +60,7 @@ struct video_frame;
 
 struct vrxtx_params {
         const char           *compression;    // nullptr selects proto dfl
-        unsigned int          rxtx_mode;
+        enum rxtx_mode        rxtx_mode;
         struct display       *display_device; // only iHDTV, UG RTP
         struct vidcap        *capture_device; // iHDTV only
         const char           *receiver;
@@ -79,7 +79,7 @@ struct vrxtx_params {
 #define VRXTX_INIT \
         { \
                 .compression    = nullptr, \
-                .rxtx_mode      = 0, \
+                .rxtx_mode      = RXTX_MODE_NONE, \
                 .display_device = nullptr, \
                 .capture_device = nullptr, \
                 .receiver       = nullptr, \