[MPlayer-dev-eng] Re: audio out feature (not a request)

[Tobias Diedrich]

Diego Biurrun wrote:

> > >This annoys me personally to no end.  It also makes diffs completely
> > >unreadable.  In a word: I support splitting into multiple lines.
> > 
> > so do I (as I did in libmpcodecs for audio encoders)
> 
> So Tobias, commit quickly before anybody protests ;)

*g* :-)

Well, I was thinking about something like the attached patch.

-- 
Tobias						PGP: http://9ac7e0bc.uguu.de
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/Makefile,v
retrieving revision 1.93
diff -u -r1.93 Makefile
--- Makefile	19 Jun 2005 09:12:43 -0000	1.93
+++ Makefile	19 Jun 2005 11:28:29 -0000
@@ -3,10 +3,111 @@
 
 include ../config.mak
 
-SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c muxer.c muxer_avi.c muxer_mpeg.c demux_asf.c demux_avi.c demux_mov.c parse_mp4.c demux_mpg.c demux_ty.c demux_ty_osd.c demux_pva.c demux_viv.c demuxer.c dvdnav_stream.c open.c parse_es.c stream.c stream_file.c stream_netstream.c stream_vcd.c stream_null.c stream_ftp.c stream_smb.c stream_vstream.c tv.c tvi_dummy.c tvi_v4l.c tvi_v4l2.c tvi_bsdbt848.c frequencies.c demux_fli.c demux_real.c demux_y4m.c yuv4mpeg.c yuv4mpeg_ratio.c demux_nuv.c demux_film.c demux_roq.c mf.c demux_mf.c demux_audio.c demux_demuxers.c demux_ogg.c cdda.c demux_rawaudio.c demux_rawvideo.c cddb.c cdinfo.c demux_rawdv.c ai_alsa.c ai_alsa1x.c ai_oss.c audio_in.c demux_smjpeg.c demux_lmlm4.c cue_read.c extension.c demux_gif.c demux_ts.c demux_realaud.c url.c muxer_rawvideo.c muxer_rawaudio.c demux_lavf.c demux_nsv.c demux_vqf.c stream_dvd.c stream_livedotcom.c demux_aac.c
+# Headers and header-dumpers
+SRCS  = mp3_hdr.c
+SRCS += mpeg_hdr.c
+SRCS += asfheader.c
+SRCS += aviheader.c
+SRCS += aviprint.c
+
+# Core
+SRCS += cache2.c
+SRCS += extension.c
+SRCS += mf.c
+SRCS += open.c
+SRCS += url.c
+SRCS += video.c
+
+# Miscellaneous
+SRCS += cdda.c
+SRCS += cddb.c
+SRCS += cdinfo.c
+SRCS += cue_read.c
+SRCS += dvdnav_stream.c
+SRCS += parse_es.c
+SRCS += parse_mp4.c
+SRCS += yuv4mpeg.c
+SRCS += yuv4mpeg_ratio.c
+
+# Stream readers/writers
+SRCS += stream.c
+SRCS += stream_dvd.c
+SRCS += stream_file.c
+SRCS += stream_ftp.c
+SRCS += stream_livedotcom.c
+SRCS += stream_netstream.c
+SRCS += stream_null.c
+SRCS += stream_smb.c
+SRCS += stream_vcd.c
+SRCS += stream_vstream.c
+
+# TV in
+SRCS += tv.c
+SRCS += frequencies.c
+SRCS += tvi_bsdbt848.c
+SRCS += tvi_dummy.c
+SRCS += tvi_v4l2.c
+SRCS += tvi_v4l.c
+
+# Audio in
+SRCS += audio_in.c
+SRCS += ai_alsa1x.c
+SRCS += ai_alsa.c
+SRCS += ai_oss.c
+
+# Demuxers
+SRCS += demuxer.c
+SRCS += demux_aac.c
+SRCS += demux_asf.c
+SRCS += demux_audio.c
+SRCS += demux_avi.c
+SRCS += demux_demuxers.c
+SRCS += demux_film.c
+SRCS += demux_fli.c
+SRCS += demux_gif.c
+SRCS += demux_lavf.c
+SRCS += demux_lmlm4.c
+SRCS += demux_mf.c
+SRCS += demux_mov.c
+SRCS += demux_mpg.c
+SRCS += demux_nsv.c
+SRCS += demux_nuv.c
+SRCS += demux_ogg.c
+SRCS += demux_pva.c
+SRCS += demux_rawaudio.c
+SRCS += demux_rawdv.c
+SRCS += demux_rawvideo.c
+SRCS += demux_realaud.c
+SRCS += demux_real.c
+SRCS += demux_roq.c
+SRCS += demux_smjpeg.c
+SRCS += demux_ts.c
+SRCS += demux_ty.c
+SRCS += demux_ty_osd.c
+SRCS += demux_viv.c
+SRCS += demux_vqf.c
+SRCS += demux_y4m.c
 ifeq ($(XMMS_PLUGINS),yes)
 SRCS += demux_xmms.c
 endif 
+ifneq ($(W32_LIB),)
+SRCS += demux_avs.c
+endif
+ifeq ($(MATROSKA),yes)
+SRCS += demux_mkv.c ebml.c
+endif
+
+# Muxers
+SRCS += muxer.c
+SRCS += muxer_avi.c
+SRCS += muxer_mpeg.c
+SRCS += muxer_rawaudio.c
+SRCS += muxer_rawvideo.c
+ifeq ($(CONFIG_LIBAVFORMAT),yes)
+LIBAV_INC = -I../libavcodec -I../libavformat
+SRCS += 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
 SRCS += realrtsp/asmrp.c realrtsp/real.c realrtsp/rmff.c realrtsp/rtsp.c realrtsp/rtsp_session.c realrtsp/sdpplin.c realrtsp/xbuffer.c
@@ -21,19 +122,6 @@
 SRCS += dvb_tune.c
 endif
 
-ifneq ($(W32_LIB),)
-SRCS += demux_avs.c
-endif
-
-ifeq ($(MATROSKA),yes)
-SRCS += demux_mkv.c ebml.c
-endif
-
-ifeq ($(CONFIG_LIBAVFORMAT),yes)
-LIBAV_INC = -I../libavcodec -I../libavformat
-SRCS += muxer_lavf.c
-endif
-
 OBJS	= $(SRCS:.c=.o)
 OBJS   += $(CPLUSPLUSSRCS:.cpp=.o)
 INCLUDE = -I.. -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC)