Give a CONFIG_ prefix to preprocessor directives that lacked one and

change arbitrary prefixes to CONFIG_.


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

2 files changed, 8 insertions, 8 deletions

diff --git a/stream/stream.c b/stream/stream.c
index da2f8731d8..041fd0b2d1 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -71,13 +71,13 @@ static const stream_info_t* const auto_open_streams[] = {
 #ifdef CONFIG_CDDA
   &stream_info_cdda,
 #endif
-#ifdef MPLAYER_NETWORK
+#ifdef CONFIG_NETWORK
   &stream_info_netstream,
   &stream_info_http1,
   &stream_info_asf,
   &stream_info_pnm,
   &stream_info_rtsp,
-#ifdef STREAMING_LIVE555
+#ifdef CONFIG_LIVE555
   &stream_info_sdp,
   &stream_info_rtsp_sip,
 #endif
@@ -103,7 +103,7 @@ static const stream_info_t* const auto_open_streams[] = {
 #ifdef CONFIG_VSTREAM
   &stream_info_vstream,
 #endif
-#ifdef LIBSMBCLIENT
+#ifdef CONFIG_LIBSMBCLIENT
   &stream_info_smb,
 #endif
   &stream_info_cue,
@@ -156,7 +156,7 @@ stream_t* open_stream_plugin(const stream_info_t* sinfo,char* filename,int mode,
   s->flags |= mode;
   *ret = sinfo->open(s,mode,arg,file_format);
   if((*ret) != STREAM_OK) {
-#ifdef MPLAYER_NETWORK
+#ifdef CONFIG_NETWORK
     if (*ret == STREAM_REDIRECTED && redirected_url) {
         if (s->streaming_ctrl && s->streaming_ctrl->url
             && s->streaming_ctrl->url->url)
@@ -247,7 +247,7 @@ int stream_fill_buffer(stream_t *s){
   if (/*s->fd == NULL ||*/ s->eof) { s->buf_pos = s->buf_len = 0; return 0; }
   switch(s->type){
   case STREAMTYPE_STREAM:
-#ifdef MPLAYER_NETWORK
+#ifdef CONFIG_NETWORK
     if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_read ) {
 	    len=s->streaming_ctrl->streaming_read(s->fd,s->buffer,STREAM_BUFFER_SIZE, s->streaming_ctrl);break;
     } else {
@@ -314,7 +314,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 MPLAYER_NETWORK
+#ifdef CONFIG_NETWORK
     if(s->seek) { // new stream seek is much cleaner than streaming_ctrl one
       if(!s->seek(s,newpos)) {
       	mp_msg(MSGT_STREAM,MSGL_ERR, "Seek failed\n");
diff --git a/stream/stream.h b/stream/stream.h
index d6ba8b2274..4e872195a5 100644
--- a/stream/stream.h
+++ b/stream/stream.h
@@ -65,7 +65,7 @@
 #define STREAM_CTRL_GET_ANGLE 10
 #define STREAM_CTRL_SET_ANGLE 11
 
-#ifdef MPLAYER_NETWORK
+#ifdef CONFIG_NETWORK
 #include "network.h"
 #endif
 
@@ -112,7 +112,7 @@ typedef struct stream_st {
   void* cache_data;
   void* priv; // used for DVD, TV, RTSP etc
   char* url;  // strdup() of filename/url
-#ifdef MPLAYER_NETWORK
+#ifdef CONFIG_NETWORK
   streaming_ctrl_t *streaming_ctrl;
 #endif
   unsigned char buffer[STREAM_BUFFER_SIZE>VCD_SECTOR_SIZE?STREAM_BUFFER_SIZE:VCD_SECTOR_SIZE];