[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.158,1.159 configure,1.528,1.529

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv4825

Modified Files:
	cfg-mplayer.h configure 
Log Message:
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson at live.com>
see <http://www.live.com/mplayer/> for details.


Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- cfg-mplayer.h	24 Jul 2002 17:25:13 -0000	1.158
+++ cfg-mplayer.h	5 Aug 2002 00:39:06 -0000	1.159
@@ -80,6 +80,10 @@
 extern void vo_zr_revertoption(config_t* opt,char* pram);
 #endif
 
+#ifdef STREAMING_LIVE_DOT_COM
+extern int isSDPFile;
+#endif
+
 #ifdef HAVE_NEW_GUI
 extern char * skinName;
 #endif
@@ -274,6 +278,13 @@
 #ifdef HAVE_ZR
 	// -vo zr
 	{"zr*", vo_zr_parseoption, CONF_TYPE_FUNC_FULL, 0, 0, 0, &vo_zr_revertoption },
+#endif
+
+#ifdef STREAMING_LIVE_DOT_COM
+	// -sdp option, specifying that the source is a SDP file
+        {"sdp", &isSDPFile, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+#else
+	{"sdp", "MPlayer was compiled WITHOUT the \"LIVE.COM Streaming Media\" libraries!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif
 
 //---------------------- mplayer-only options ------------------------

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.528
retrieving revision 1.529
diff -u -r1.528 -r1.529
--- configure	3 Aug 2002 22:48:41 -0000	1.528
+++ configure	5 Aug 2002 00:39:06 -0000	1.529
@@ -154,6 +154,7 @@
   --disable-libdv        disable libdv 0.9.5 support [autodetect]
   --disable-streaming    disable network streaming support
                          (support for: http/mms/rtp) [enable]
+  --disable-live         disable LIVE.COM Streaming Media support [disable]
   --disable-vidix        disable VIDIX stuff [enable on x86 *nix]
   --disable-new-input    disable new input system [enable]
   --enable-joystick      enable joystick support in new input [disable]
@@ -241,6 +242,7 @@
   --with-gtk-config=PATH   path to gtk*-config (e.g. /opt/bin/gtk-config)
   --with-glib-config=PATH  path to glib*-config (e.g. /opt/bin/glib-config)
   --with-dvdnav-config=PATH  path to dvdnav-config
+  --with-livelibdir=DIR       path to LIVE.COM Streaming Media libraries
 
 EOF
     exit 0
@@ -929,6 +931,7 @@
 _dvdkit=auto
 _xanim=auto
 _real=auto
+_live=no
 _xinerama=auto
 _mga=auto
 _xmga=auto
@@ -1052,6 +1055,8 @@
   --disable-xanim)	_xanim=no	;;
   --enable-real)	_real=yes	;;
   --disable-real)	_real=no	;;
+  --enable-live)	_live=yes	;;
+  --disable-live)	_live=no	;;
   --enable-xinerama)	_xinerama=yes	;;
   --disable-xinerama)	_xinerama=no	;;
   --enable-mga)		_mga=yes	;;
@@ -1149,6 +1154,10 @@
     _reallibdir=`echo $ac_option | cut -d '=' -f 2`
     _real=yes
     ;;
+  --with-livelibdir=*)
+    _livelibdir=`echo $ac_option | cut -d '=' -f 2`
+    _live=yes
+    ;;
   --with-csslibdir=*)
     _csslibdir=`echo $ac_option | cut -d '=' -f 2`
     _css=yes
@@ -3397,6 +3406,41 @@
 fi
 
 
+if test -z "$_livelibdir" ; then
+    for I in $_libdir/live /usr/lib/live /usr/local/lib/live; do
+      if test -d "$I" ; then
+        _livelibdir="$I"
+        break;
+      fi;
+    done
+fi
+
+echocheck "LIVE.COM Streaming Media libraries"
+if test "$_live" = auto ; then
+  _live=yes
+  test "$_livelibdir" || _live=no
+  # TODO: deeper, more reliable test of libs, and version!
+  # (users may have empty live/ dir or something different there, for
+  # example 'live config files', or they may have old, incompatibel version)
+fi
+if test "$_live" = yes ; then
+  echores "yes (using $_livelibdir)"
+  _streaming=yes
+  _def_live='#define STREAMING_LIVE_DOT_COM 1'
+  _live_libs_def="# LIVE.COM Streaming Media libraries:
+LIVE_LIB_DIR = $_livelibdir
+LIVE_LIBS =  \$(LIVE_LIB_DIR)/liveMedia/libliveMedia.a
+LIVE_LIBS += \$(LIVE_LIB_DIR)/groupsock/libgroupsock.a
+LIVE_LIBS += \$(LIVE_LIB_DIR)/UsageEnvironment/libUsageEnvironment.a
+LIVE_LIBS += \$(LIVE_LIB_DIR)/BasicUsageEnvironment/libBasicUsageEnvironment.a
+LIVE_LIBS += -lstdc++"
+  _ld_live='$(LIVE_LIBS)'
+else
+  echores "no"
+  _def_live='#undef STREAMING_LIVE_DOT_COM'
+fi
+
+
 echocheck "iconv"
 if test "$_iconv" = auto ; then
   if freebsd ; then
@@ -4069,8 +4113,11 @@
 WIN32_PATH = -DWIN32_PATH=\\"$_win32libdir\\"
 STRIPBINARIES = $_stripbinaries
 
+$_live_libs_def
+
 STREAMING = $_streaming
-STREAMING_LIB = $_ld_streaming
+STREAMING_LIVE_DOT_COM = $_live
+STREAMING_LIB = $_ld_streaming $_ld_live
 VIDIX = $_vidix
 
 OPENDIVX = $_opendivx
@@ -4375,6 +4422,9 @@
 $_def_real
 /* Default search path */
 $_def_real_path
+
+/* LIVE.COM Streaming Media library support */
+$_def_live
 
 /* Use 3dnow/mmxext/sse/mmx optimized fast memcpy() [maybe buggy... signal 4]*/
 $_def_fastmemcpy