From 02135001b44afc5446228228055c9ce7f29df5be Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 3 Aug 2008 15:21:40 +0000
Subject: Change a bunch of video/audio-output-specific preprocessor directives
 from a HAVE_ prefix to a CONFIG_ prefix.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 stream/stream.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'stream/stream.c')

diff --git a/stream/stream.c b/stream/stream.c
index 533bf7cd2e..d9636da1f6 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -65,7 +65,7 @@ extern const stream_info_t stream_info_ifo;
 extern const stream_info_t stream_info_dvd;
 
 static const stream_info_t* const auto_open_streams[] = {
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
   &stream_info_vcd,
 #endif
 #ifdef HAVE_CDDA
@@ -85,7 +85,7 @@ static const stream_info_t* const auto_open_streams[] = {
   &stream_info_udp,
   &stream_info_http2,
 #endif
-#ifdef HAS_DVBIN_SUPPORT
+#ifdef CONFIG_DVBIN
   &stream_info_dvb,
 #endif
 #ifdef CONFIG_TV
@@ -94,7 +94,7 @@ static const stream_info_t* const auto_open_streams[] = {
 #ifdef CONFIG_RADIO
   &stream_info_radio,
 #endif
-#ifdef HAVE_PVR
+#ifdef CONFIG_PVR
   &stream_info_pvr,
 #endif
 #ifdef HAVE_FTP
-- 
cgit v1.2.3


From 141e81cce4fb780a1e2f791c79c1664956401af7 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 7 Aug 2008 08:58:07 +0000
Subject: Rename a bunch of miscellaneous preprocessor directives. Switch them
 from a HAVE_ to a CONFIG_ prefix.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27423 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 stream/stream.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'stream/stream.c')

diff --git a/stream/stream.c b/stream/stream.c
index d9636da1f6..da2f8731d8 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -68,7 +68,7 @@ static const stream_info_t* const auto_open_streams[] = {
 #ifdef CONFIG_VCD
   &stream_info_vcd,
 #endif
-#ifdef HAVE_CDDA
+#ifdef CONFIG_CDDA
   &stream_info_cdda,
 #endif
 #ifdef MPLAYER_NETWORK
@@ -97,10 +97,10 @@ static const stream_info_t* const auto_open_streams[] = {
 #ifdef CONFIG_PVR
   &stream_info_pvr,
 #endif
-#ifdef HAVE_FTP
+#ifdef CONFIG_FTP
   &stream_info_ftp,
 #endif
-#ifdef HAVE_VSTREAM
+#ifdef CONFIG_VSTREAM
   &stream_info_vstream,
 #endif
 #ifdef LIBSMBCLIENT
-- 
cgit v1.2.3


From e0b1c9a6b772683af9cb2a4f555cec1c5aa56afb Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 7 Aug 2008 12:20:50 +0000
Subject: 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
---
 stream/stream.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'stream/stream.c')

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");
-- 
cgit v1.2.3