diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | cfg-common.h | 4 | ||||
| -rwxr-xr-x | configure | 43 | ||||
| -rw-r--r-- | libmpdemux/Makefile | 2 | ||||
| -rw-r--r-- | libmpdemux/asfheader.c | 2 | ||||
| -rw-r--r-- | libmpdemux/cdda.c | 4 | ||||
| -rw-r--r-- | libmpdemux/cddb.c | 2 | ||||
| -rw-r--r-- | libmpdemux/open.c | 4 | ||||
| -rw-r--r-- | libmpdemux/stream.c | 8 | ||||
| -rw-r--r-- | libmpdemux/stream.h | 4 | ||||
| -rw-r--r-- | libmpdemux/stream_netstream.c | 2 | ||||
| -rw-r--r-- | libmpdemux/stream_vcd.c | 1 |
12 files changed, 39 insertions, 39 deletions
@@ -36,7 +36,7 @@ OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o) 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 diff --git a/cfg-common.h b/cfg-common.h index 9f3d03bbbd..238a26c195 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -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 @@ extern int flip; /* 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; @@ -153,8 +153,7 @@ Optional features: --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=yes _tv_v4l=auto _tv_bsdbt848=auto _edl=yes -_streaming=yes +_network=yes _smbsupport=auto _vidix=auto _joystick=no @@ -1229,8 +1228,8 @@ for ac_option do --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 @@ EOF 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 @@ if test -z "$_livelibdir" ; then 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 @@ fi 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 @@ STRIPBINARIES = $_stripbinaries $_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_matroska_gcc2 $_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 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> |