[MPlayer-cvslog] r29322 - in trunk: cfg-common-opts.h libmpdemux/demux_rtp.cpp

[lu_zero]

Author: lu_zero
Date: Mon May 25 22:28:35 2009
New Revision: 29322

Log:
Unify over rtsp_transport_tcp as var to hold the -rtsp-stream-over-tcp flag and make sure libnemesi only builds are fine

Modified:
   trunk/cfg-common-opts.h
   trunk/libmpdemux/demux_rtp.cpp

Modified: trunk/cfg-common-opts.h
==============================================================================
--- trunk/cfg-common-opts.h	Mon May 25 19:51:10 2009	(r29321)
+++ trunk/cfg-common-opts.h	Mon May 25 22:28:35 2009	(r29322)
@@ -85,7 +85,7 @@
 #endif /* CONFIG_LIVE555 */
 #ifdef CONFIG_LIBNEMESI || CONFIG_LIVE555
 	// -rtsp-stream-over-tcp option, specifying TCP streaming of RTP/RTCP
-        {"rtsp-stream-over-tcp", &rtspStreamOverTCP, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+        {"rtsp-stream-over-tcp", &rtsp_transport_tcp, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 #else
 	{"rtsp-stream-over-tcp", "-rtsp-stream-over-tcp requires the \"LIVE555 Streaming Media\" or \"libnemesi\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif /* CONFIG_LIVE555 || CONFIG_LIBNEMESI */

Modified: trunk/libmpdemux/demux_rtp.cpp
==============================================================================
--- trunk/libmpdemux/demux_rtp.cpp	Mon May 25 19:51:10 2009	(r29321)
+++ trunk/libmpdemux/demux_rtp.cpp	Mon May 25 22:28:35 2009	(r29322)
@@ -110,7 +110,12 @@ static char* openURL_sip(SIPClient* clie
   }
 }
 
-int rtspStreamOverTCP = 0;
+#ifdef CONFIG_LIBNEMESI
+extern int rtsp_transport_tcp;
+#else
+int rtsp_transport_tcp = 0;
+#endif
+
 extern int rtsp_port;
 
 extern "C" int audio_id, video_id, dvdsub_id;
@@ -229,7 +234,7 @@ extern "C" demuxer_t* demux_open_rtp(dem
 	if (rtspClient != NULL) {
 	  // Issue a RTSP "SETUP" command on the chosen subsession:
 	  if (!rtspClient->setupMediaSubsession(*subsession, False,
-						rtspStreamOverTCP)) break;
+						rtsp_transport_tcp)) break;
 	  if (!strcmp(subsession->mediumName(), "audio"))
 	    audiofound = 1;
 	  if (!strcmp(subsession->mediumName(), "video"))
@@ -327,7 +332,7 @@ extern "C" int demux_rtp_fill_buffer(dem
     const float ptsBehindLimit = 60.0; // seconds
     if (ptsBehind < ptsBehindThreshold ||
 	ptsBehind > ptsBehindLimit ||
-	rtspStreamOverTCP) { // packet's OK
+	rtsp_transport_tcp) { // packet's OK
       ds_add_packet(ds, dp);
       break;
     }