Changed the STREAMING defines to MPLAYER_NETWORK to avoid name definition clash.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10122 b3059339-0415-0410-9bf9-f77b7e298cf2

9 files changed, 15 insertions, 14 deletions

diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile
index cd7e47cff1..d5345dec2d 100644
--- a/libmpdemux/Makefile
+++ b/libmpdemux/Makefile
@@ -7,7 +7,7 @@ SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c
 ifeq ($(XMMS_PLUGINS),yes)
 SRCS += demux_xmms.c
 endif 
-ifeq ($(STREAMING),yes)
+ifeq ($(MPLAYER_NETWORK),yes)
 SRCS += asf_streaming.c url.c http.c network.c asf_mmst_streaming.c pnm.c
 SRCS += realrtsp/asmrp.c realrtsp/real.c realrtsp/rmff.c realrtsp/rtsp.c realrtsp/rtsp_session.c realrtsp/sdpplin.c realrtsp/xbuffer.c
 ifeq ($(STREAMING_LIVE_DOT_COM),yes)
diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c
index ea77f798e6..8c816865fa 100644
--- a/libmpdemux/asfheader.c
+++ b/libmpdemux/asfheader.c
@@ -327,7 +327,7 @@ while(!stream_eof(demuxer->stream)){
 
 if(streams) {
   uint32_t vr = 0, ar = 0,i;
-#ifdef STREAMING
+#ifdef MPLAYER_NETWORK
   if( demuxer->stream->streaming_ctrl!=NULL ) {
 	  if( demuxer->stream->streaming_ctrl->bandwidth!=0 && demuxer->stream->streaming_ctrl->data!=NULL ) {
 		  best_audio = ((asf_http_streaming_ctrl_t*)demuxer->stream->streaming_ctrl->data)->audio_id;
diff --git a/libmpdemux/cdda.c b/libmpdemux/cdda.c
index 61a67d8ee6..d33e5a5dba 100644
--- a/libmpdemux/cdda.c
+++ b/libmpdemux/cdda.c
@@ -101,7 +101,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) {
     return STREAM_UNSUPORTED;
   }
 
-#ifdef STREAMING
+#ifdef MPLAYER_NETWORK
   if(strncmp(st->url,"cddb",4) == 0) {
     i = cddb_resolve(p->device, &xmcd_file);
     if(i == 0) {
@@ -209,7 +209,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) {
   paranoia_seek(priv->cdp,priv->start_sector,SEEK_SET);
   priv->sector = priv->start_sector;
 
-#ifdef STREAMING
+#ifdef MPLAYER_NETWORK
   if(cddb_info) {
     cd_info_free(cd_info);
     priv->cd_info = cddb_info;
diff --git a/libmpdemux/cddb.c b/libmpdemux/cddb.c
index 410ff6e9a1..1b18f6c5ac 100644
--- a/libmpdemux/cddb.c
+++ b/libmpdemux/cddb.c
@@ -14,7 +14,7 @@
 
 #include "config.h"
 
-#if defined(HAVE_CDDA) && defined(STREAMING)
+#if defined(HAVE_CDDA) && defined(MPLAYER_NETWORK)
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libmpdemux/open.c b/libmpdemux/open.c
index 12d35b20df..73ea6f5eae 100644
--- a/libmpdemux/open.c
+++ b/libmpdemux/open.c
@@ -20,7 +20,7 @@
 #include "demuxer.h"
 #include "mf.h"
 
-#ifdef STREAMING
+#ifdef MPLAYER_NETWORK
 #include "url.h"
 #include "network.h"
 extern int streaming_start( stream_t *stream, int *demuxer_type, URL_t *url);
@@ -466,7 +466,7 @@ if(strncmp("dvbin://",filename,8) == 0)
 }
 #endif
 
-#ifdef STREAMING
+#ifdef MPLAYER_NETWORK
 #ifdef STREAMING_LIVE_DOT_COM
   // Check for a SDP file:
   if (strncmp("sdp://",filename,6) == 0) {
diff --git a/libmpdemux/stream.c b/libmpdemux/stream.c
index 7d0989a1de..d6fac88dc4 100644
--- a/libmpdemux/stream.c
+++ b/libmpdemux/stream.c
@@ -47,7 +47,7 @@ extern stream_info_t stream_info_vcd;
 #ifdef HAVE_CDDA
 extern stream_info_t stream_info_cdda;
 #endif
-#ifdef STREAMING
+#ifdef MPLAYER_NETWORK
 extern stream_info_t stream_info_netstream;
 #endif
 extern stream_info_t stream_info_null;
@@ -60,7 +60,7 @@ stream_info_t* auto_open_streams[] = {
 #ifdef HAVE_CDDA
   &stream_info_cdda,
 #endif
-#ifdef STREAMING
+#ifdef MPLAYER_NETWORK
   &stream_info_netstream,
 #endif
   &stream_info_null,
@@ -167,7 +167,7 @@ int stream_fill_buffer(stream_t *s){
     break;
 #endif    
   case STREAMTYPE_STREAM:
-#ifdef STREAMING
+#ifdef MPLAYER_NETWORK
     if( s->streaming_ctrl!=NULL ) {
 	    len=s->streaming_ctrl->streaming_read(s->fd,s->buffer,STREAM_BUFFER_SIZE, s->streaming_ctrl);break;
     } else {
@@ -299,7 +299,7 @@ if(newpos==0 || newpos!=s->pos){
     // Some streaming protocol allow to seek backward and forward
     // A function call that return -1 can tell that the protocol
     // doesn't support seeking.
-#ifdef STREAMING
+#ifdef MPLAYER_NETWORK
     if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_seek ) {
       if( s->streaming_ctrl->streaming_seek( s->fd, pos, s->streaming_ctrl )<0 ) {
         mp_msg(MSGT_STREAM,MSGL_INFO,"Stream not seekable!\n");
diff --git a/libmpdemux/stream.h b/libmpdemux/stream.h
index 3c3b547289..f9aa74d9d2 100644
--- a/libmpdemux/stream.h
+++ b/libmpdemux/stream.h
@@ -47,7 +47,7 @@
 
 #define STREAM_CTRL_RESET 0
 
-#ifdef STREAMING
+#ifdef MPLAYER_NETWORK
 #include "network.h"
 #endif
 
@@ -93,7 +93,7 @@ typedef struct stream_st {
   void* cache_data;
   void* priv; // used for DVD, TV, RTSP etc
   char* url;  // strdup() of filename/url
-#ifdef STREAMING
+#ifdef MPLAYER_NETWORK
   streaming_ctrl_t *streaming_ctrl;
 #endif
   unsigned char buffer[STREAM_BUFFER_SIZE>VCD_SECTOR_SIZE?STREAM_BUFFER_SIZE:VCD_SECTOR_SIZE];
diff --git a/libmpdemux/stream_netstream.c b/libmpdemux/stream_netstream.c
index eb4888e89e..573571e07d 100644
--- a/libmpdemux/stream_netstream.c
+++ b/libmpdemux/stream_netstream.c
@@ -36,7 +36,7 @@
 
 #include "config.h"
 
-#ifdef STREAMING
+#ifdef MPLAYER_NETWORK
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/libmpdemux/stream_vcd.c b/libmpdemux/stream_vcd.c
index d2427055b2..1904b4bc56 100644
--- a/libmpdemux/stream_vcd.c
+++ b/libmpdemux/stream_vcd.c
@@ -8,6 +8,7 @@
 #include "../m_option.h"
 #include "../m_struct.h"
 
+#include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/ioctl.h>