Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv19688/libmpdemux Modified Files: Makefile asfheader.c open.c stream.c stream.h cdda.c cddb.c stream_netstream.c stream_vcd.c Log Message: Changed the STREAMING defines to MPLAYER_NETWORK to avoid name definition clash. Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/Makefile,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- Makefile 3 May 2003 06:24:37 -0000 1.63 +++ Makefile 17 May 2003 12:24:01 -0000 1.64 @@ -7,7 +7,7 @@ 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) Index: asfheader.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/asfheader.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- asfheader.c 16 Nov 2002 03:42:14 -0000 1.37 +++ asfheader.c 17 May 2003 12:24:01 -0000 1.38 @@ -327,7 +327,7 @@ 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; Index: open.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/open.c,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- open.c 5 May 2003 01:22:45 -0000 1.80 +++ open.c 17 May 2003 12:24:01 -0000 1.81 @@ -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 @@ } #endif -#ifdef STREAMING +#ifdef MPLAYER_NETWORK #ifdef STREAMING_LIVE_DOT_COM // Check for a SDP file: if (strncmp("sdp://",filename,6) == 0) { Index: stream.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/stream.c,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- stream.c 12 Apr 2003 13:53:33 -0000 1.64 +++ stream.c 17 May 2003 12:24:01 -0000 1.65 @@ -47,7 +47,7 @@ #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 @@ #ifdef HAVE_CDDA &stream_info_cdda, #endif -#ifdef STREAMING +#ifdef MPLAYER_NETWORK &stream_info_netstream, #endif &stream_info_null, @@ -167,7 +167,7 @@ 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 @@ // 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"); Index: stream.h =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/stream.h,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- stream.h 9 Apr 2003 07:31:11 -0000 1.63 +++ stream.h 17 May 2003 12:24:01 -0000 1.64 @@ -47,7 +47,7 @@ #define STREAM_CTRL_RESET 0 -#ifdef STREAMING +#ifdef MPLAYER_NETWORK #include "network.h" #endif @@ -93,7 +93,7 @@ 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]; Index: cdda.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/cdda.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- cdda.c 2 Apr 2003 19:29:26 -0000 1.10 +++ cdda.c 17 May 2003 12:24:01 -0000 1.11 @@ -101,7 +101,7 @@ 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 @@ 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; Index: cddb.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/cddb.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- cddb.c 2 Apr 2003 19:29:26 -0000 1.13 +++ cddb.c 17 May 2003 12:24:01 -0000 1.14 @@ -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> Index: stream_netstream.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/stream_netstream.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- stream_netstream.c 6 Apr 2003 18:15:43 -0000 1.2 +++ stream_netstream.c 17 May 2003 12:24:01 -0000 1.3 @@ -36,7 +36,7 @@ #include "config.h" -#ifdef STREAMING +#ifdef MPLAYER_NETWORK #include <sys/types.h> #include <sys/stat.h> Index: stream_vcd.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/stream_vcd.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- stream_vcd.c 9 Apr 2003 07:31:11 -0000 1.1 +++ stream_vcd.c 17 May 2003 12:24:01 -0000 1.2 @@ -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>