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

[Rich Felker]

On Sun, Jun 19, 2005 at 01:34:42PM +0200, Dominik 'Rathann' Mierzejewski wrote:
> On Sunday, 19 June 2005 at 13:30, Tobias Diedrich wrote:
> > 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
> 
> > 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
> 
> I'd prefer to do this without string operations, i.e.:
> 
> +SRCS  = mp3_hdr.c \
> +        mpeg_hdr.c \
> +        asfheader.c \
> +        aviheader.c \
> +        aviprint.c
> 
> and so on.

If you do it this way, also include a \ on the last line and a blank
line after it. It will make patches much more readable and less likely
to conflict since they won't senselessly remove and re-add the last
line when a new file is added.

Rich