[MPlayer-cvslog] r19277 - in trunk: Copyright Gui/mplayer/common.c Gui/mplayer/gtk/fs.c Gui/mplayer/gtk/menu.c Gui/mplayer/mw.c Gui/mplayer/pb.c Gui/mplayer/play.c Gui/win32/dialogs.c Gui/win32/gui.c Gui/win32/interface.c Makefile TOOLS/Makefile TOOLS/netstream/Makefile TOOLS/netstream/netstream.c asxparser.c cfg-common.h libmenu/menu.c libmenu/menu_dvbin.c libmpcodecs/Makefile libmpdemux/Makefile libmpdemux/ai_alsa.c libmpdemux/ai_alsa1x.c libmpdemux/ai_oss.c libmpdemux/asf_mmst_streaming.c libmpdemux/asf_streaming.c libmpdemux/audio_in.c libmpdemux/audio_in.h libmpdemux/cache2.c libmpdemux/cdd.h libmpdemux/cdda.c libmpdemux/cddb.c libmpdemux/cdinfo.c libmpdemux/cookies.c libmpdemux/cookies.h libmpdemux/cue_read.c libmpdemux/cue_read.h libmpdemux/dvb_tune.c libmpdemux/dvbin.c libmpdemux/dvbin.h libmpdemux/dvdnav_stream.c libmpdemux/dvdnav_stream.h libmpdemux/freesdp libmpdemux/frequencies.c libmpdemux/frequencies.h libmpdemux/http.c libmpdemux/http.h libmpdemux/librtsp libmpdemux/mf.c libmpdemux/mf.h libmpdemux/netstream.h libmpdemux/network.c libmpdemux/network.h libmpdemux/open.c libmpdemux/pnm.c libmpdemux/realrtsp libmpdemux/rtp.c libmpdemux/rtp.h libmpdemux/stream.c libmpdemux/stream.h libmpdemux/stream_dvd.c libmpdemux/stream_dvd.h libmpdemux/stream_file.c libmpdemux/stream_ftp.c libmpdemux/stream_livedotcom.c libmpdemux/stream_netstream.c libmpdemux/stream_null.c libmpdemux/stream_pvr.c libmpdemux/stream_rtsp.c libmpdemux/stream_smb.c libmpdemux/stream_vcd.c libmpdemux/stream_vstream.c libmpdemux/tv.c libmpdemux/tv.h libmpdemux/tvi_bsdbt848.c libmpdemux/tvi_def.h libmpdemux/tvi_dummy.c libmpdemux/tvi_v4l.c libmpdemux/tvi_v4l2.c libmpdemux/url.c libmpdemux/url.h libmpdemux/vcd_read.h libmpdemux/vcd_read_darwin.h libmpdemux/vcd_read_fbsd.h libmpdemux/vcd_read_nbsd.h m_option.c mencoder.c mplayer.c osdep/macosx_finder_args.c playtreeparser.c stream stream/Makefile stream/ai_alsa.c stream/ai_alsa1x.c stream/ai_oss.c stream/asf_mmst_streaming.c stream/asf_streaming.c stream/audio_in.c stream/audio_in.h stream/cache2.c stream/cdd.h stream/cdda.c stream/cddb.c stream/cdinfo.c stream/cookies.c stream/cookies.h stream/cue_read.c stream/cue_read.h stream/dvb_tune.c stream/dvbin.c stream/dvbin.h stream/dvdnav_stream.c stream/dvdnav_stream.h stream/freesdp stream/frequencies.c stream/frequencies.h stream/http.c stream/http.h stream/librtsp stream/mf.c stream/mf.h stream/netstream.h stream/network.c stream/network.h stream/open.c stream/pnm.c stream/realrtsp stream/rtp.c stream/rtp.h stream/stream.c stream/stream.h stream/stream_dvd.c stream/stream_dvd.h stream/stream_file.c stream/stream_ftp.c stream/stream_livedotcom.c stream/stream_netstream.c stream/stream_null.c stream/stream_pvr.c stream/stream_rtsp.c stream/stream_smb.c stream/stream_vcd.c stream/stream_vstream.c stream/tv.c stream/tv.h stream/tvi_bsdbt848.c stream/tvi_def.h stream/tvi_dummy.c stream/tvi_v4l.c stream/tvi_v4l2.c stream/url.c stream/url.h stream/vcd_read.h stream/vcd_read_darwin.h stream/vcd_read_fbsd.h stream/vcd_read_nbsd.h subreader.c
ben
subversion at mplayerhq.hu
Mon Jul 31 19:39:18 CEST 2006
Author: ben
Date: Mon Jul 31 19:39:17 2006
New Revision: 19277
Added:
trunk/stream/
trunk/stream/Makefile
trunk/stream/ai_alsa.c
- copied unchanged from r19276, /trunk/libmpdemux/ai_alsa.c
trunk/stream/ai_alsa1x.c
- copied unchanged from r19276, /trunk/libmpdemux/ai_alsa1x.c
trunk/stream/ai_oss.c
- copied unchanged from r19276, /trunk/libmpdemux/ai_oss.c
trunk/stream/asf_mmst_streaming.c
- copied unchanged from r19276, /trunk/libmpdemux/asf_mmst_streaming.c
trunk/stream/asf_streaming.c
- copied unchanged from r19276, /trunk/libmpdemux/asf_streaming.c
trunk/stream/audio_in.c
- copied unchanged from r19276, /trunk/libmpdemux/audio_in.c
trunk/stream/audio_in.h
- copied unchanged from r19276, /trunk/libmpdemux/audio_in.h
trunk/stream/cache2.c
- copied unchanged from r19276, /trunk/libmpdemux/cache2.c
trunk/stream/cdd.h
- copied unchanged from r19276, /trunk/libmpdemux/cdd.h
trunk/stream/cdda.c
- copied unchanged from r19276, /trunk/libmpdemux/cdda.c
trunk/stream/cddb.c
- copied unchanged from r19276, /trunk/libmpdemux/cddb.c
trunk/stream/cdinfo.c
- copied unchanged from r19276, /trunk/libmpdemux/cdinfo.c
trunk/stream/cookies.c
- copied unchanged from r19276, /trunk/libmpdemux/cookies.c
trunk/stream/cookies.h
- copied unchanged from r19276, /trunk/libmpdemux/cookies.h
trunk/stream/cue_read.c
- copied unchanged from r19276, /trunk/libmpdemux/cue_read.c
trunk/stream/cue_read.h
- copied unchanged from r19276, /trunk/libmpdemux/cue_read.h
trunk/stream/dvb_tune.c
- copied unchanged from r19276, /trunk/libmpdemux/dvb_tune.c
trunk/stream/dvbin.c
- copied unchanged from r19276, /trunk/libmpdemux/dvbin.c
trunk/stream/dvbin.h
- copied unchanged from r19276, /trunk/libmpdemux/dvbin.h
trunk/stream/dvdnav_stream.c
- copied unchanged from r19276, /trunk/libmpdemux/dvdnav_stream.c
trunk/stream/dvdnav_stream.h
- copied unchanged from r19276, /trunk/libmpdemux/dvdnav_stream.h
trunk/stream/freesdp/
- copied from r19276, /trunk/libmpdemux/freesdp/
trunk/stream/frequencies.c
- copied unchanged from r19276, /trunk/libmpdemux/frequencies.c
trunk/stream/frequencies.h
- copied unchanged from r19276, /trunk/libmpdemux/frequencies.h
trunk/stream/http.c
- copied unchanged from r19276, /trunk/libmpdemux/http.c
trunk/stream/http.h
- copied unchanged from r19276, /trunk/libmpdemux/http.h
trunk/stream/librtsp/
- copied from r19276, /trunk/libmpdemux/librtsp/
trunk/stream/mf.c
- copied unchanged from r19276, /trunk/libmpdemux/mf.c
trunk/stream/mf.h
- copied unchanged from r19276, /trunk/libmpdemux/mf.h
trunk/stream/netstream.h
- copied unchanged from r19276, /trunk/libmpdemux/netstream.h
trunk/stream/network.c
- copied unchanged from r19276, /trunk/libmpdemux/network.c
trunk/stream/network.h
- copied unchanged from r19276, /trunk/libmpdemux/network.h
trunk/stream/open.c
- copied unchanged from r19276, /trunk/libmpdemux/open.c
trunk/stream/pnm.c
- copied unchanged from r19276, /trunk/libmpdemux/pnm.c
trunk/stream/realrtsp/
- copied from r19276, /trunk/libmpdemux/realrtsp/
trunk/stream/rtp.c
- copied unchanged from r19276, /trunk/libmpdemux/rtp.c
trunk/stream/rtp.h
- copied unchanged from r19276, /trunk/libmpdemux/rtp.h
trunk/stream/stream.c
- copied unchanged from r19276, /trunk/libmpdemux/stream.c
trunk/stream/stream.h
- copied unchanged from r19276, /trunk/libmpdemux/stream.h
trunk/stream/stream_dvd.c
- copied unchanged from r19276, /trunk/libmpdemux/stream_dvd.c
trunk/stream/stream_dvd.h
- copied unchanged from r19276, /trunk/libmpdemux/stream_dvd.h
trunk/stream/stream_file.c
- copied unchanged from r19276, /trunk/libmpdemux/stream_file.c
trunk/stream/stream_ftp.c
- copied unchanged from r19276, /trunk/libmpdemux/stream_ftp.c
trunk/stream/stream_livedotcom.c
- copied unchanged from r19276, /trunk/libmpdemux/stream_livedotcom.c
trunk/stream/stream_netstream.c
- copied unchanged from r19276, /trunk/libmpdemux/stream_netstream.c
trunk/stream/stream_null.c
- copied unchanged from r19276, /trunk/libmpdemux/stream_null.c
trunk/stream/stream_pvr.c
- copied unchanged from r19276, /trunk/libmpdemux/stream_pvr.c
trunk/stream/stream_rtsp.c
- copied unchanged from r19276, /trunk/libmpdemux/stream_rtsp.c
trunk/stream/stream_smb.c
- copied unchanged from r19276, /trunk/libmpdemux/stream_smb.c
trunk/stream/stream_vcd.c
- copied unchanged from r19276, /trunk/libmpdemux/stream_vcd.c
trunk/stream/stream_vstream.c
- copied unchanged from r19276, /trunk/libmpdemux/stream_vstream.c
trunk/stream/tv.c
- copied unchanged from r19276, /trunk/libmpdemux/tv.c
trunk/stream/tv.h
- copied unchanged from r19276, /trunk/libmpdemux/tv.h
trunk/stream/tvi_bsdbt848.c
- copied unchanged from r19276, /trunk/libmpdemux/tvi_bsdbt848.c
trunk/stream/tvi_def.h
- copied unchanged from r19276, /trunk/libmpdemux/tvi_def.h
trunk/stream/tvi_dummy.c
- copied unchanged from r19276, /trunk/libmpdemux/tvi_dummy.c
trunk/stream/tvi_v4l.c
- copied unchanged from r19276, /trunk/libmpdemux/tvi_v4l.c
trunk/stream/tvi_v4l2.c
- copied unchanged from r19276, /trunk/libmpdemux/tvi_v4l2.c
trunk/stream/url.c
- copied unchanged from r19276, /trunk/libmpdemux/url.c
trunk/stream/url.h
- copied unchanged from r19276, /trunk/libmpdemux/url.h
trunk/stream/vcd_read.h
- copied unchanged from r19276, /trunk/libmpdemux/vcd_read.h
trunk/stream/vcd_read_darwin.h
- copied unchanged from r19276, /trunk/libmpdemux/vcd_read_darwin.h
trunk/stream/vcd_read_fbsd.h
- copied unchanged from r19276, /trunk/libmpdemux/vcd_read_fbsd.h
trunk/stream/vcd_read_nbsd.h
- copied unchanged from r19276, /trunk/libmpdemux/vcd_read_nbsd.h
Removed:
trunk/libmpdemux/ai_alsa.c
trunk/libmpdemux/ai_alsa1x.c
trunk/libmpdemux/ai_oss.c
trunk/libmpdemux/asf_mmst_streaming.c
trunk/libmpdemux/asf_streaming.c
trunk/libmpdemux/audio_in.c
trunk/libmpdemux/audio_in.h
trunk/libmpdemux/cache2.c
trunk/libmpdemux/cdd.h
trunk/libmpdemux/cdda.c
trunk/libmpdemux/cddb.c
trunk/libmpdemux/cdinfo.c
trunk/libmpdemux/cookies.c
trunk/libmpdemux/cookies.h
trunk/libmpdemux/cue_read.c
trunk/libmpdemux/cue_read.h
trunk/libmpdemux/dvb_tune.c
trunk/libmpdemux/dvbin.c
trunk/libmpdemux/dvbin.h
trunk/libmpdemux/dvdnav_stream.c
trunk/libmpdemux/dvdnav_stream.h
trunk/libmpdemux/freesdp/
trunk/libmpdemux/frequencies.c
trunk/libmpdemux/frequencies.h
trunk/libmpdemux/http.c
trunk/libmpdemux/http.h
trunk/libmpdemux/librtsp/
trunk/libmpdemux/mf.c
trunk/libmpdemux/mf.h
trunk/libmpdemux/netstream.h
trunk/libmpdemux/network.c
trunk/libmpdemux/network.h
trunk/libmpdemux/open.c
trunk/libmpdemux/pnm.c
trunk/libmpdemux/realrtsp/
trunk/libmpdemux/rtp.c
trunk/libmpdemux/rtp.h
trunk/libmpdemux/stream.c
trunk/libmpdemux/stream.h
trunk/libmpdemux/stream_dvd.c
trunk/libmpdemux/stream_dvd.h
trunk/libmpdemux/stream_file.c
trunk/libmpdemux/stream_ftp.c
trunk/libmpdemux/stream_livedotcom.c
trunk/libmpdemux/stream_netstream.c
trunk/libmpdemux/stream_null.c
trunk/libmpdemux/stream_pvr.c
trunk/libmpdemux/stream_rtsp.c
trunk/libmpdemux/stream_smb.c
trunk/libmpdemux/stream_vcd.c
trunk/libmpdemux/stream_vstream.c
trunk/libmpdemux/tv.c
trunk/libmpdemux/tv.h
trunk/libmpdemux/tvi_bsdbt848.c
trunk/libmpdemux/tvi_def.h
trunk/libmpdemux/tvi_dummy.c
trunk/libmpdemux/tvi_v4l.c
trunk/libmpdemux/tvi_v4l2.c
trunk/libmpdemux/url.c
trunk/libmpdemux/url.h
trunk/libmpdemux/vcd_read.h
trunk/libmpdemux/vcd_read_darwin.h
trunk/libmpdemux/vcd_read_fbsd.h
trunk/libmpdemux/vcd_read_nbsd.h
Modified:
trunk/Copyright
trunk/Gui/mplayer/common.c
trunk/Gui/mplayer/gtk/fs.c
trunk/Gui/mplayer/gtk/menu.c
trunk/Gui/mplayer/mw.c
trunk/Gui/mplayer/pb.c
trunk/Gui/mplayer/play.c
trunk/Gui/win32/dialogs.c
trunk/Gui/win32/gui.c
trunk/Gui/win32/interface.c
trunk/Makefile
trunk/TOOLS/Makefile
trunk/TOOLS/netstream/Makefile
trunk/TOOLS/netstream/netstream.c
trunk/asxparser.c
trunk/cfg-common.h
trunk/libmenu/menu.c
trunk/libmenu/menu_dvbin.c
trunk/libmpcodecs/Makefile
trunk/libmpdemux/Makefile
trunk/m_option.c
trunk/mencoder.c
trunk/mplayer.c
trunk/osdep/macosx_finder_args.c
trunk/playtreeparser.c
trunk/subreader.c
Log:
introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
Modified: trunk/Copyright
==============================================================================
--- trunk/Copyright (original)
+++ trunk/Copyright Mon Jul 31 19:39:17 2006
@@ -71,13 +71,13 @@
Name: dvbstream
Version: 0.4.3-pre3 (cvs checkout)
Homepage: http://www.linuxstb.org/dvbstream/
-Directory: libmpdemux
+Directory: stream
License: GNU General Public License
Name: realrtsp
Version: xine CVS 2003/04/17 + patches
Homepage: http://www.xinehq.de
-Directory: libmpdemux/realrtsp/
+Directory: stream/realrtsp/
License: GNU General Public License
Name: id3edit
@@ -107,5 +107,5 @@
Name: FreeSDP
Version: 0.4.1
Homepage: https://savannah.nongnu.org/projects/freesdp/
-Directory: libmpdemux/freesdp/
+Directory: stream/freesdp/
License: GNU General Public License
Modified: trunk/Gui/mplayer/common.c
==============================================================================
--- trunk/Gui/mplayer/common.c (original)
+++ trunk/Gui/mplayer/common.c Mon Jul 31 19:39:17 2006
@@ -17,7 +17,7 @@
#include "../libvo/x11_common.h"
#include "../libvo/fastmemcpy.h"
-#include "../libmpdemux/stream.h"
+#include "../stream/stream.h"
#include "../mixer.h"
#include "../libvo/sub.h"
#include "../mplayer.h"
Modified: trunk/Gui/mplayer/gtk/fs.c
==============================================================================
--- trunk/Gui/mplayer/gtk/fs.c (original)
+++ trunk/Gui/mplayer/gtk/fs.c Mon Jul 31 19:39:17 2006
@@ -16,7 +16,7 @@
#include "../interface.h"
#include "../../config.h"
#include "../../help_mp.h"
-#include "../../libmpdemux/stream.h"
+#include "../../stream/stream.h"
#include "../widgets.h"
#include "fs.h"
Modified: trunk/Gui/mplayer/gtk/menu.c
==============================================================================
--- trunk/Gui/mplayer/gtk/menu.c (original)
+++ trunk/Gui/mplayer/gtk/menu.c Mon Jul 31 19:39:17 2006
@@ -14,7 +14,7 @@
#include "../widgets.h"
#include "app.h"
-#include "../../libmpdemux/stream.h"
+#include "../../stream/stream.h"
#include "../../libmpdemux/demuxer.h"
#include "../pixmaps/ab.xpm"
Modified: trunk/Gui/mplayer/mw.c
==============================================================================
--- trunk/Gui/mplayer/mw.c (original)
+++ trunk/Gui/mplayer/mw.c Mon Jul 31 19:39:17 2006
@@ -17,7 +17,7 @@
#include "../libvo/x11_common.h"
#include "../libvo/fastmemcpy.h"
-#include "../libmpdemux/stream.h"
+#include "../stream/stream.h"
#include "../mixer.h"
#include "../libvo/sub.h"
#include "../mplayer.h"
Modified: trunk/Gui/mplayer/pb.c
==============================================================================
--- trunk/Gui/mplayer/pb.c (original)
+++ trunk/Gui/mplayer/pb.c Mon Jul 31 19:39:17 2006
@@ -17,7 +17,7 @@
#include "../libvo/x11_common.h"
#include "../libvo/fastmemcpy.h"
-#include "../libmpdemux/stream.h"
+#include "../stream/stream.h"
#include "../mixer.h"
#include "../libvo/sub.h"
#include "../mplayer.h"
Modified: trunk/Gui/mplayer/play.c
==============================================================================
--- trunk/Gui/mplayer/play.c (original)
+++ trunk/Gui/mplayer/play.c Mon Jul 31 19:39:17 2006
@@ -28,7 +28,7 @@
#include "skin/skin.h"
#include "skin/font.h"
-#include "libmpdemux/stream.h"
+#include "stream/stream.h"
extern float rel_seek_secs;
extern int abs_seek_pos;
Modified: trunk/Gui/win32/dialogs.c
==============================================================================
--- trunk/Gui/win32/dialogs.c (original)
+++ trunk/Gui/win32/dialogs.c Mon Jul 31 19:39:17 2006
@@ -24,7 +24,7 @@
#include <interface.h>
#include <mp_msg.h>
#include <help_mp.h>
-#include <libmpdemux/stream.h>
+#include <stream/stream.h>
#include <libmpdemux/demuxer.h>
#include <libmpdemux/stheader.h>
#include "gui.h"
Modified: trunk/Gui/win32/gui.c
==============================================================================
--- trunk/Gui/win32/gui.c (original)
+++ trunk/Gui/win32/gui.c Mon Jul 31 19:39:17 2006
@@ -34,7 +34,7 @@
#include <input/input.h>
#include <input/mouse.h>
#include <osdep/keycodes.h>
-#include <libmpdemux/stream.h>
+#include <stream/stream.h>
#include <libvo/video_out.h>
#include <interface.h>
#include "gui.h"
Modified: trunk/Gui/win32/interface.c
==============================================================================
--- trunk/Gui/win32/interface.c (original)
+++ trunk/Gui/win32/interface.c Mon Jul 31 19:39:17 2006
@@ -26,11 +26,11 @@
#include <mp_msg.h>
#include <help_mp.h>
#include <codec-cfg.h>
-#include <libmpdemux/stream.h>
+#include <stream/stream.h>
#include <libmpdemux/demuxer.h>
#include <libmpdemux/stheader.h>
#ifdef USE_DVDREAD
-#include <libmpdemux/stream_dvd.h>
+#include <stream/stream_dvd.h>
#endif
#include <input/input.h>
#include <libvo/video_out.h>
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Mon Jul 31 19:39:17 2006
@@ -105,6 +105,7 @@
$(W32_LIB) \
libaf/libaf.a \
libmpdemux/libmpdemux.a \
+ stream/stream.a \
libswscale/libswscale.a \
osdep/libosdep.a \
$(DVDREAD_LIB) \
@@ -139,6 +140,7 @@
endif
PARTS = libmpdemux \
+ stream \
libmpcodecs \
libavutil \
libavcodec \
@@ -195,6 +197,7 @@
COMMON_DEPS = $(W32_DEP) \
$(AV_DEP) \
libmpdemux/libmpdemux.a \
+ stream/stream.a \
libmpcodecs/libmpcodecs.a \
libao2/libao2.a \
osdep/libosdep.a \
@@ -274,6 +277,9 @@
libmpdemux/libmpdemux.a:
$(MAKE) -C libmpdemux
+stream/stream.a:
+ $(MAKE) -C stream
+
libmpcodecs/libmpcodecs.a:
$(MAKE) -C libmpcodecs
@@ -546,6 +552,7 @@
libmpdvdkit2/libmpdvdkit.a: $(wildcard libmpdvdkit2/*.[ch])
libmpdemux/libmpdemux.a: $(wildcard libmpdemux/*.[ch] libmpdemux/*/*.[ch])
+stream/stream.a: $(wildcard stream/*.[ch] stream/*/*.[ch])
libmpcodecs/libmpcodecs.a: $(wildcard libmpcodecs/*.[ch]) $(wildcard libmpcodecs/native/*.[ch])
libmpcodecs/libmpencoders.a: $(wildcard libmpcodecs/*.[ch])
Modified: trunk/TOOLS/Makefile
==============================================================================
--- trunk/TOOLS/Makefile (original)
+++ trunk/TOOLS/Makefile Mon Jul 31 19:39:17 2006
@@ -31,7 +31,7 @@
../libswscale/yuv2rgb.o ../libmpcodecs/img_format.o -lm
vivodump: vivodump.c
- $(CC) $(CFLAGS) -o $@ $< ../mp_msg.o ../libmpdemux/libmpdemux.a
+ $(CC) $(CFLAGS) -o $@ $< ../mp_msg.o ../libmpdemux/libmpdemux.a ../stream/stream.a
fastmemcpybench: fastmemcpybench.c
$(CC) $(CFLAGS) -g $< -o fastmem-mmx ../libvo/aclib.o -DNAME=\"mmx\" -DHAVE_MMX
Modified: trunk/TOOLS/netstream/Makefile
==============================================================================
--- trunk/TOOLS/netstream/Makefile (original)
+++ trunk/TOOLS/netstream/Makefile Mon Jul 31 19:39:17 2006
@@ -19,6 +19,7 @@
# FIXME: linking is a mess that should be fixed properly some day
# it does not work with either GUI, live.com or libavformat enabled
DEPS = $(MPROOT)/libmpdemux/libmpdemux.a \
+ $(MPROOT)/stream/stream.a \
$(MPROOT)/libmpdvdkit2/libmpdvdkit.a \
$(MPROOT)/libmpcodecs/native/minilzo.o \
$(MPROOT)/libvo/aclib.o \
@@ -45,7 +46,7 @@
DEPS += $(MPROOT)/osdep/glob-win.o $(WIN32_LIB) -lwsock32
endif
-netstream: $(MPROOT)/libmpdemux/libmpdemux.a netstream.o
+netstream: $(MPROOT)/libmpdemux/libmpdemux.a $(MPROOT)/libmpdemux/stream.a netstream.o
$(CC) $(CFLAGS) netstream.o -o netstream $(DEPS)
Modified: trunk/TOOLS/netstream/netstream.c
==============================================================================
--- trunk/TOOLS/netstream/netstream.c (original)
+++ trunk/TOOLS/netstream/netstream.c Mon Jul 31 19:39:17 2006
@@ -41,13 +41,13 @@
#include <ws2tcpip.h>
#endif
-#include <libmpdemux/stream.h>
+#include <stream/stream.h>
#include <libmpdemux/demuxer.h>
#include <mp_msg.h>
#include <bswap.h>
/// Netstream packets def and some helpers
-#include <libmpdemux/netstream.h>
+#include <stream/netstream.h>
//Set some standard variables
Modified: trunk/asxparser.c
==============================================================================
--- trunk/asxparser.c (original)
+++ trunk/asxparser.c Mon Jul 31 19:39:17 2006
@@ -8,7 +8,7 @@
#include "playtree.h"
#include "playtreeparser.h"
-#include "libmpdemux/stream.h"
+#include "stream/stream.h"
#include "libmpdemux/demuxer.h"
#include "asxparser.h"
#include "mp_msg.h"
Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h (original)
+++ trunk/cfg-common.h Mon Jul 31 19:39:17 2006
@@ -366,7 +366,7 @@
extern int ts_keep_broken;
extern off_t ts_probe;
-#include "libmpdemux/tv.h"
+#include "stream/tv.h"
extern char* edl_filename;
extern char* edl_output_filename;
@@ -444,7 +444,7 @@
#endif
#ifdef HAS_DVBIN_SUPPORT
-#include "libmpdemux/dvbin.h"
+#include "stream/dvbin.h"
extern m_config_t dvbin_opts_conf[];
#endif
Modified: trunk/libmenu/menu.c
==============================================================================
--- trunk/libmenu/menu.c (original)
+++ trunk/libmenu/menu.c Mon Jul 31 19:39:17 2006
@@ -13,7 +13,7 @@
#include "libvo/font_load.h"
#include "osdep/keycodes.h"
#include "asxparser.h"
-#include "libmpdemux/stream.h"
+#include "stream/stream.h"
#include "img_format.h"
#include "mp_image.h"
Modified: trunk/libmenu/menu_dvbin.c
==============================================================================
--- trunk/libmenu/menu_dvbin.c (original)
+++ trunk/libmenu/menu_dvbin.c Mon Jul 31 19:39:17 2006
@@ -24,7 +24,7 @@
#include "input/input.h"
#include "osdep/keycodes.h"
-#include "libmpdemux/dvbin.h"
+#include "stream/dvbin.h"
Modified: trunk/libmpcodecs/Makefile
==============================================================================
--- trunk/libmpcodecs/Makefile (original)
+++ trunk/libmpcodecs/Makefile Mon Jul 31 19:39:17 2006
@@ -321,6 +321,7 @@
-I. -I.. \
-Inative \
-I../libmpdemux \
+ -I../stream \
-I../loader \
$(LIBAV_INC) \
-D_GNU_SOURCE \
Modified: trunk/libmpdemux/Makefile
==============================================================================
--- trunk/libmpdemux/Makefile (original)
+++ trunk/libmpdemux/Makefile Mon Jul 31 19:39:17 2006
@@ -12,89 +12,15 @@
# Core
SRCS += extension.c \
- mf.c \
- open.c \
- url.c \
video.c \
-ifeq ($(STREAM_CACHE),yes)
-SRCS += cache2.c
-endif
-
# Miscellaneous
-SRCS += cdinfo.c \
- cue_read.c \
- parse_es.c \
+SRCS += parse_es.c \
parse_mp4.c \
mpeg_packetizer.c \
yuv4mpeg.c \
yuv4mpeg_ratio.c \
-ifeq ($(CDDA),yes)
-SRCS += cdda.c
- ifeq ($(MPLAYER_NETWORK),yes)
- SRCS += cddb.c
- endif
-endif
-
-# Stream readers/writers
-SRCS += stream.c \
- stream_file.c \
- stream_null.c \
-
-ifeq ($(HAVE_DVD),yes)
-SRCS += stream_dvd.c
-endif
-ifeq ($(DVDNAV),yes)
-SRCS += dvdnav_stream.c
-endif
-ifeq ($(VCD),yes)
-SRCS += stream_vcd.c
-endif
-ifeq ($(FTP),yes)
-SRCS += stream_ftp.c
-endif
-ifeq ($(LIBSMBCLIENT),yes)
-SRCS += stream_smb.c
-endif
-ifeq ($(MPLAYER_NETWORK),yes)
- SRCS += stream_netstream.c
- ifeq ($(STREAMING_LIVE555),yes)
- SRCS += stream_livedotcom.c
- endif
-endif
-ifeq ($(VSTREAM),yes)
-SRCS += stream_vstream.c
-endif
-
-# TV in
-ifeq ($(TV),yes)
-SRCS += tv.c frequencies.c tvi_dummy.c
- ifeq ($(TV_BSDBT848),yes)
- SRCS += tvi_bsdbt848.c
- endif
- ifeq ($(TV_V4L2),yes)
- SRCS += tvi_v4l2.c audio_in.c
- ifeq ($(PVR),yes)
- SRCS += stream_pvr.c
- endif
- endif
- ifeq ($(TV_V4L1),yes)
- SRCS += tvi_v4l.c audio_in.c
- endif
- ifeq ($(TV_V4L),yes)
- ifeq ($(ALSA1X),yes)
- SRCS += ai_alsa1x.c
- endif
- ifeq ($(ALSA9),yes)
- SRCS += ai_alsa.c
- endif
- ifeq ($(OSS),yes)
- SRCS += ai_oss.c
- endif
- endif
-endif
-
# Demuxers
SRCS += demuxer.c \
demux_aac.c \
@@ -166,48 +92,18 @@
MUXERS += muxer_lavf.c
endif
-ifeq ($(MPLAYER_NETWORK),yes)
-SRCS += asf_streaming.c \
- http.c \
- network.c \
- cookies.c \
- asf_mmst_streaming.c \
- pnm.c \
- rtp.c \
- stream_rtsp.c \
-
-SRCS += realrtsp/asmrp.c \
- realrtsp/real.c \
- realrtsp/rmff.c \
- realrtsp/sdpplin.c \
- realrtsp/xbuffer.c \
-
-SRCS += librtsp/rtsp.c \
- librtsp/rtsp_rtp.c \
- librtsp/rtsp_session.c \
-
-SRCS += freesdp/common.c \
- freesdp/errorlist.c \
- freesdp/parser.c \
+ifeq ($(MENCODER),yes)
+SRCS += $(MUXERS)
+endif
ifeq ($(STREAMING_LIVE555),yes)
CPLUSPLUSSRCS = demux_rtp.cpp demux_rtp_codec.cpp
CPLUSPLUSINCLUDE = $(LIVE_INCLUDES)
endif
-endif
-
-ifeq ($(DVBIN),yes)
-SRCS += dvbin.c
-SRCS += dvb_tune.c
-endif
-
-ifeq ($(MENCODER),yes)
-SRCS += $(MUXERS)
-endif
OBJS = $(SRCS:.c=.o)
OBJS += $(CPLUSPLUSSRCS:.cpp=.o)
-INCLUDE = -I.. -I../loader $(LIBAV_INC)
+INCLUDE = -I.. -I../stream -I../loader $(LIBAV_INC)
CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS)
CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE) -D__STDC_LIMIT_MACROS
CPLUSPLUS = $(CC)
@@ -229,16 +125,14 @@
test: $(LIBNAME) test.c
$(CC) $(CFLAGS) test.c ../mp_msg.c ../osdep/shmem.c -o test \
- ./libmpdemux.a ../libmpdvdkit2/libmpdvdkit.a ../libvo/aclib.o \
+ ./libmpdemux.a ../stream/stream.a \
+ ../libmpdvdkit2/libmpdvdkit.a ../libvo/aclib.o \
../libmpcodecs/img_format.o ../libao2/afmt.o ../sub_cc.o \
../m_option.o ../subreader.o \
$(ALSA_LIB) $(VORBIS_LIB) $(CDPARANOIA_LIB) -lz -lpthread
clean:
- rm -f *.o *.a *~ \
- realrtsp/*.o realrtsp/*.a realrtsp/*~ \
- librtsp/*.o librtsp/*.a librtsp/*~ \
- freesdp/*.o freesdp/*.a freesdp/*~
+ rm -f *.o *.a *~
distclean: clean
rm -f .depend test
Modified: trunk/m_option.c
==============================================================================
--- trunk/m_option.c (original)
+++ trunk/m_option.c Mon Jul 31 19:39:17 2006
@@ -15,7 +15,7 @@
#include "m_option.h"
//#include "m_config.h"
#include "mp_msg.h"
-#include "libmpdemux/url.h"
+#include "stream/url.h"
// Don't free for 'production' atm
#ifndef MP_DEBUG
Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c (original)
+++ trunk/mencoder.c Mon Jul 31 19:39:17 2006
@@ -48,7 +48,7 @@
#include "m_config.h"
#include "parser-mecmd.h"
-#include "libmpdemux/stream.h"
+#include "stream/stream.h"
#include "libmpdemux/demuxer.h"
#include "libmpdemux/stheader.h"
#include "libmpdemux/mp3_hdr.h"
@@ -76,7 +76,7 @@
#include "get_path.c"
#ifdef USE_DVDREAD
-#include "libmpdemux/stream_dvd.h"
+#include "stream/stream_dvd.h"
#endif
#ifdef USE_LIBAVCODEC
Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c (original)
+++ trunk/mplayer.c Mon Jul 31 19:39:17 2006
@@ -106,11 +106,11 @@
#endif /* HAVE_RTC */
#ifdef USE_TV
-#include "libmpdemux/tv.h"
+#include "stream/tv.h"
#endif
#ifdef HAS_DVBIN_SUPPORT
-#include "libmpdemux/dvbin.h"
+#include "stream/dvbin.h"
static int last_dvb_step = 1;
static int dvbin_reopen = 0;
extern void cache_uninit(stream_t *s);
@@ -175,14 +175,14 @@
static int max_framesize=0;
-#include "libmpdemux/stream.h"
+#include "stream/stream.h"
#include "libmpdemux/demuxer.h"
#include "libmpdemux/stheader.h"
//#include "parse_es.h"
#include "libmpdemux/matroska.h"
#ifdef USE_DVDREAD
-#include "libmpdemux/stream_dvd.h"
+#include "stream/stream_dvd.h"
#endif
#include "libmpcodecs/dec_audio.h"
Modified: trunk/osdep/macosx_finder_args.c
==============================================================================
--- trunk/osdep/macosx_finder_args.c (original)
+++ trunk/osdep/macosx_finder_args.c Mon Jul 31 19:39:17 2006
@@ -1,6 +1,6 @@
#include <Carbon/Carbon.h>
#include <ApplicationServices/ApplicationServices.h>
-#include "libmpdemux/url.h"
+#include "stream/url.h"
#include "mp_msg.h"
#include "m_option.h"
#include "m_config.h"
Modified: trunk/playtreeparser.c
==============================================================================
--- trunk/playtreeparser.c (original)
+++ trunk/playtreeparser.c Mon Jul 31 19:39:17 2006
@@ -18,7 +18,7 @@
#include "m_config.h"
#include "playtree.h"
#include "playtreeparser.h"
-#include "libmpdemux/stream.h"
+#include "stream/stream.h"
#include "libmpdemux/demuxer.h"
#include "mp_msg.h"
Added: trunk/stream/Makefile
==============================================================================
--- (empty file)
+++ trunk/stream/Makefile Mon Jul 31 19:39:17 2006
@@ -0,0 +1,151 @@
+
+LIBNAME = stream.a
+
+include ../config.mak
+
+# Core
+SRCS += mf.c \
+ open.c \
+ url.c \
+
+ifeq ($(STREAM_CACHE),yes)
+SRCS += cache2.c
+endif
+
+# Miscellaneous
+SRCS += cdinfo.c \
+ cue_read.c \
+
+ifeq ($(CDDA),yes)
+SRCS += cdda.c
+ ifeq ($(MPLAYER_NETWORK),yes)
+ SRCS += cddb.c
+ endif
+endif
+
+# Stream readers/writers
+SRCS += stream.c \
+ stream_file.c \
+ stream_null.c \
+
+ifeq ($(HAVE_DVD),yes)
+SRCS += stream_dvd.c
+endif
+ifeq ($(DVDNAV),yes)
+SRCS += dvdnav_stream.c
+endif
+ifeq ($(VCD),yes)
+SRCS += stream_vcd.c
+endif
+ifeq ($(FTP),yes)
+SRCS += stream_ftp.c
+endif
+ifeq ($(LIBSMBCLIENT),yes)
+SRCS += stream_smb.c
+endif
+ifeq ($(MPLAYER_NETWORK),yes)
+ SRCS += stream_netstream.c
+ ifeq ($(STREAMING_LIVE555),yes)
+ SRCS += stream_livedotcom.c
+ endif
+endif
+ifeq ($(VSTREAM),yes)
+SRCS += stream_vstream.c
+endif
+
+# TV in
+ifeq ($(TV),yes)
+SRCS += tv.c frequencies.c tvi_dummy.c
+ ifeq ($(TV_BSDBT848),yes)
+ SRCS += tvi_bsdbt848.c
+ endif
+ ifeq ($(TV_V4L2),yes)
+ SRCS += tvi_v4l2.c audio_in.c
+ ifeq ($(PVR),yes)
+ SRCS += stream_pvr.c
+ endif
+ endif
+ ifeq ($(TV_V4L1),yes)
+ SRCS += tvi_v4l.c audio_in.c
+ endif
+ ifeq ($(TV_V4L),yes)
+ ifeq ($(ALSA1X),yes)
+ SRCS += ai_alsa1x.c
+ endif
+ ifeq ($(ALSA9),yes)
+ SRCS += ai_alsa.c
+ endif
+ ifeq ($(OSS),yes)
+ SRCS += ai_oss.c
+ endif
+ endif
+endif
+
+ifeq ($(MPLAYER_NETWORK),yes)
+SRCS += asf_streaming.c \
+ http.c \
+ network.c \
+ cookies.c \
+ asf_mmst_streaming.c \
+ pnm.c \
+ rtp.c \
+ stream_rtsp.c \
+
+SRCS += realrtsp/asmrp.c \
+ realrtsp/real.c \
+ realrtsp/rmff.c \
+ realrtsp/sdpplin.c \
+ realrtsp/xbuffer.c \
+
+SRCS += librtsp/rtsp.c \
+ librtsp/rtsp_rtp.c \
+ librtsp/rtsp_session.c \
+
+SRCS += freesdp/common.c \
+ freesdp/errorlist.c \
+ freesdp/parser.c \
+
+endif
+
+ifeq ($(DVBIN),yes)
+SRCS += dvbin.c
+SRCS += dvb_tune.c
+endif
+
+OBJS = $(SRCS:.c=.o)
+INCLUDE = -I.. -I../libmpdemux -I../loader $(LIBAV_INC)
+CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS)
+
+.SUFFIXES: .c .o
+
+# .PHONY: all clean
+
+all: $(LIBNAME)
+
+.c.o:
+ $(CC) -c $(CFLAGS) -o $@ $<
+
+$(LIBNAME): $(OBJS)
+ $(AR) r $(LIBNAME) $(OBJS)
+ $(RANLIB) $(LIBNAME)
+
+clean:
+ rm -f *.o *.a *~ \
+ realrtsp/*.o realrtsp/*.a realrtsp/*~ \
+ librtsp/*.o librtsp/*.a librtsp/*~ \
+ freesdp/*.o freesdp/*.a freesdp/*~
+
+distclean: clean
+ rm -f .depend test
+
+dep: depend
+
+depend:
+ $(CC) -MM $(CFLAGS) test.c $(SRCS) 1>.depend
+
+#
+# include dependency files if they exist
+#
+ifneq ($(wildcard .depend),)
+include .depend
+endif
Modified: trunk/subreader.c
==============================================================================
--- trunk/subreader.c (original)
+++ trunk/subreader.c Mon Jul 31 19:39:17 2006
@@ -18,7 +18,7 @@
#include "config.h"
#include "mp_msg.h"
#include "subreader.h"
-#include "libmpdemux/stream.h"
+#include "stream/stream.h"
#ifdef HAVE_ENCA
#include <enca.h>
More information about the MPlayer-cvslog
mailing list