[Mplayer-cvslog] CVS: main Makefile,1.264,1.265 configure,1.706,1.707 cfg-common.h,1.98,1.99

[Bertrand Baudet]

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

Modified Files:
	Makefile configure cfg-common.h 
Log Message:
Changed the STREAMING defines to MPLAYER_NETWORK to avoid name definition clash.


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- Makefile	11 May 2003 18:29:04 -0000	1.264
+++ Makefile	17 May 2003 12:23:32 -0000	1.265
@@ -36,7 +36,7 @@
 VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) 
 AO_LIBS = $(ARTS_LIB) $(ESD_LIB) $(NAS_LIB) $(SGIAUDIO_LIB)
 CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(THEORA_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB) $(MATROSKA_LIB) 
-COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB)
+COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB)
 
 CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(FRIBIDI_INC) # -Wall
 

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.706
retrieving revision 1.707
diff -u -r1.706 -r1.707
--- configure	12 May 2003 22:52:23 -0000	1.706
+++ configure	17 May 2003 12:23:32 -0000	1.707
@@ -153,8 +153,7 @@
   --disable-tv-bsdbt848  disable BSD BT848 Interface support [autodetect]
   --disable-edl          disable EDL (edit decision list) support [enable]
   --disable-rtc          disable RTC (/dev/rtc) on Linux [autodetect]
-  --disable-streaming    disable network streaming support
-                         (support for: http/mms/rtp) [enable]
+  --disable-network      disable network support (for: http/mms/rtp) [enable]
   --enable-smb           enable Samba (SMB) input support [autodetect]
   --enable-live          enable LIVE.COM Streaming Media support [disable]
   --enable-dvdnav        enable dvdnav support [disable]
@@ -1056,7 +1055,7 @@
 _tv_v4l=auto
 _tv_bsdbt848=auto
 _edl=yes
-_streaming=yes
+_network=yes
 _smbsupport=auto
 _vidix=auto
 _joystick=no
@@ -1229,8 +1228,8 @@
   --disable-tv-v4l)	_tv_v4l=no	;;
   --enable-fastmemcpy)	_fastmemcpy=yes	;;
   --disable-fastmemcpy)	_fastmemcpy=no	;;
-  --enable-streaming)	_streaming=yes	;;
-  --disable-streaming)	_streaming=no	;;
+  --enable-network)	_network=yes	;;
+  --disable-network)	_network=no	;;
   --enable-smb)		_smbsupport=yes	;;
   --disable-smb)	_smbsupport=no	;;
   --enable-vidix)	_vidix=yes	;;
@@ -1848,8 +1847,8 @@
     echores "yes (using $_ld_sock)"
   else
     _use_aton=no
-    _streaming=no
-    echores "no (=> streaming support disabled)"
+    _network=no
+    echores "no (=> network support disabled)"
   fi
 fi
 
@@ -4342,14 +4341,14 @@
 fi
 
 echocheck "LIVE.COM Streaming Media libraries"
-if test "$_live" = auto  && test "$_streaming" = yes ; then
+if test "$_live" = auto  && test "$_network" = yes ; 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 && test "$_streaming" = yes ; then
+if test "$_live" = yes && test "$_network" = yes ; then
   echores "yes (using $_livelibdir)"
   _def_live='#define STREAMING_LIVE_DOT_COM 1'
   _live_libs_def="# LIVE.COM Streaming Media libraries:
@@ -4787,17 +4786,17 @@
 echores "$_select"
 
 
-echocheck "streaming"
-# FIXME streaming check
-if test "$_streaming" != no ; then
-  _def_streaming='#define STREAMING 1'
-  _ld_streaming="$_ld_sock"
-  _inputmodules="streaming $_inputmodules"
+echocheck "network"
+# FIXME network check
+if test "$_network" != no ; then
+  _def_network='#define MPLAYER_NETWORK 1'
+  _ld_network="$_ld_sock"
+  _inputmodules="network $_inputmodules"
 else
-  _noinputmodules="streaming $_noinputmodules"
-  _def_streaming='#undef STREAMING'
+  _noinputmodules="network $_noinputmodules"
+  _def_network='#undef MPLAYER_NETWORK'
 fi
-echores "$_streaming"
+echores "$_network"
 
 # endian testing
 echocheck "byte order"
@@ -5214,9 +5213,9 @@
 
 $_live_libs_def
 
-STREAMING = $_streaming
+MPLAYER_NETWORK = $_network
 STREAMING_LIVE_DOT_COM = $_live
-STREAMING_LIB = $_ld_streaming $_ld_live
+MPLAYER_NETWORK_LIB = $_ld_network $_ld_live
 DVBIN = $_dvbin
 VIDIX = $_vidix
 SHARED_PP = $_shared_pp
@@ -5733,8 +5732,8 @@
 $_def_faad
 $_def_faad_version
 
-/* enable streaming */
-$_def_streaming
+/* enable network */
+$_def_network
 
 /* define this to use inet_aton() instead of inet_pton() */
 $_def_use_aton

Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- cfg-common.h	21 Apr 2003 17:16:49 -0000	1.98
+++ cfg-common.h	17 May 2003 12:23:32 -0000	1.99
@@ -36,7 +36,7 @@
 	{"csslib", "MPlayer was compiled WITHOUT libcss support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif
 
-#ifdef STREAMING
+#ifdef MPLAYER_NETWORK
 	{"user", &network_username, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"passwd", &network_password, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"bandwidth", &network_bandwidth, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
@@ -245,7 +245,7 @@
 /* from dec_audio, currently used for ac3surround decoder only */
 extern int audio_output_channels;
 
-#ifdef STREAMING
+#ifdef MPLAYER_NETWORK
 /* defined in network.c */
 extern char *network_username;
 extern char *network_password;