Changed srt-multiplex to a testing application (#718)

* Temporarily removed srt-multiplex user application.

CMakeLists.txt

@@ -760,7 +760,8 @@ if (ENABLE_APPS)
 		# https://github.com/Haivision/srt/issues/177
 		message(WARNING "On MinGW, some C++11 apps are blocked due to lacking proper C++11 headers for <thread>. FIX IF POSSIBLE.")
 	else()
-		srt_add_application(srt-multiplex ${VIRTUAL_srtsupport})
+		# srt-multiplex temporarily blocked
+		#srt_add_application(srt-multiplex ${VIRTUAL_srtsupport})
 		srt_add_application(srt-tunnel ${VIRTUAL_srtsupport})
 		target_compile_definitions(srt-tunnel PUBLIC -DSRT_ENABLE_VERBOSE_LOCK)
 	endif()
@@ -799,6 +800,9 @@ if (ENABLE_APPS)
 		srt_add_testprogram(srt-test-relay)
 		srt_make_application(srt-test-relay)
 		target_compile_definitions(srt-test-relay PUBLIC -DSRT_ENABLE_VERBOSE_LOCK)
+
+		srt_add_testprogram(srt-test-multiplex)
+		srt_make_application(srt-test-multiplex)
 	endif()
 
 endif()

docs/SRT-Multiplex.md

@@ -6,6 +6,11 @@ multiple streams in one direction. This tool demonstrates two SRT features:
  specified by IP address and port) for multiple SRT connections
  - the use of the `streamid` socket option to identify multiplexed resources
 
+NOTE: due to changes in the common code that can't be properly handled in the
+current form of srt-multiplex, this application is temporarily blocked. Instead
+the `srt-test-multiplex` application was added with the same functionality,
+although it's recommended for testing purposes only.
+
 #### Usage
 
 `srt-multiplex <SRT-URI> -i <INPUT-URI1>[id] <INPUT-URI2>[id]...`