Mercurial > hg > xemacs-beta
view src/miscplay.h @ 4539:061e030e3270
Fix some bugs in load-history construction, built-in symbol file names.
lib-src/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* make-docfile.c (main): Allow more than one -d argument, followed
by a directory to change to.
(put_filename): Don't strip directory information; with previous
change, allows retrieval of Lisp function and variable origin
files from #'built-in-symbol-file relative to lisp-directory.
(scan_lisp_file): Don't add an extraneous newline after the file
name, put_filename has added the newline already.
lisp/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* loadup.el (load-history):
Add the contents of current-load-list to load-history before
clearing it. Move the variable declarations earlier in the file to
a format understood by make-docfile.c.
* custom.el (custom-declare-variable): Add the variable's symbol
to the current file's load history entry correctly, don't use a
cons. Eliminate a comment that we don't need to worry about, we
don't need to check the `initialized' C variable in Lisp.
* bytecomp.el (byte-compile-output-file-form):
Merge Andreas Schwab's pre-GPLv3 GNU change of 19970831 here;
treat #'custom-declare-variable correctly, generating the
docstrings in a format understood by make-docfile.c.
* loadhist.el (symbol-file): Correct behaviour for checking
autoloaded macros and functions when supplied with a TYPE
argument. Accept fully-qualified paths from
#'built-in-symbol-file; if a path is not fully-qualified, return
it relative to lisp-directory if the filename corresponds to a
Lisp file, and relative to (concat source-directory "/src/")
otherwise.
* make-docfile.el (preloaded-file-list):
Rationalise some let bindings a little. Use the "-d" argument to
make-docfile.c to supply Lisp paths relative to lisp-directory,
not absolutely. Add in loadup.el explicitly to the list of files
to be processed by make-docfile.c--it doesn't make sense to add it
to preloaded-file-list, since that is used for purposes of
byte-compilation too.
src/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* doc.c (Fbuilt_in_symbol_file):
Return a subr's filename immediately if we've found it. Check for
compiled function and compiled macro docstrings in DOC too, and
return them if they exist.
The branch of the if statement focused on functions may have
executed, but we may still want to check variable bindings; an
else clause isn't appropriate.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 27 Dec 2008 14:05:50 +0000 |
parents | ecf1ebac70d8 |
children |
line wrap: on
line source
/* miscplay.h - general routines related to playing sounds ** ** Copyright (C) 1995,96 by Markus Gutschke (gutschk@math.uni-muenster.de) ** This was sawed out from version 1.3 of linuxplay.c by ** Robert Bihlmeyer <robbe@orcus.priv.at>. ** ** Parts of this code were inspired by sunplay.c, which is copyright 1989 by ** Jef Poskanzer and 1991,92 by Jamie Zawinski; c.f. sunplay.c for further ** information. ** ** Permission to use, copy, modify, and distribute this software and its ** documentation for any purpose and without fee is hereby granted, provided ** that the above copyright notice appear in all copies and that both that ** copyright notice and this permission notice appear in supporting ** documentation. This software is provided "as is" without express or ** implied warranty. */ /* Synched up with: Not in FSF. */ /* This file Mule-ized by Ben Wing, 5-15-01. */ #ifndef INCLUDED_miscplay_h_ #define INCLUDED_miscplay_h_ #define HEADERSZ 256 /* has to be at least as big as the biggest header */ #define SNDBUFSZ 2048 /* has to be at least as big as HEADERSZ */ /* Audio data formats from <linux/soundcard.h> */ #define AFMT_MU_LAW 0x00000001 #define AFMT_A_LAW 0x00000002 #define AFMT_IMA_ADPCM 0x00000004 #define AFMT_U8 0x00000008 #define AFMT_S16_LE 0x00000010 /* Little endian signed 16*/ #define AFMT_S16_BE 0x00000020 /* Big endian signed 16 */ #define AFMT_S8 0x00000040 #define AFMT_U16_LE 0x00000080 /* Little endian U16 */ #define AFMT_U16_BE 0x00000100 /* Big endian U16 */ #define AFMT_MPEG 0x00000200 /* MPEG (2) audio */ typedef enum {fmtIllegal,fmtRaw,fmtVoc,fmtWave,fmtSunAudio} fmtType; size_t sndcnvnop(void **data,size_t *sz,void **outbuf); size_t sndcnv8U_2mono(void **data,size_t *sz,void **outbuf); size_t sndcnv8S_2mono(void **data,size_t *sz,void **outbuf); size_t sndcnv2monounsigned(void **data,size_t *sz,void **outbuf); size_t sndcnv2unsigned(void **data,size_t *sz,void **outbuf); size_t sndcnvULaw_2linear(void **data,size_t *sz,void **outbuf); size_t sndcnvULaw_2mono(void **data,size_t *sz,void **outbuf); size_t sndcnv16swap(void **data,size_t *sz,void **outbuf); size_t sndcnv16_2monoLE(void **data,size_t *sz,void **outbuf); size_t sndcnv16_2monoBE(void **data,size_t *sz,void **outbuf); size_t sndcnv2byteLE(void **data,size_t *sz,void **outbuf); size_t sndcnv2byteBE(void **data,size_t *sz,void **outbuf); size_t sndcnv2monobyteLE(void **data,size_t *sz,void **outbuf); size_t sndcnv2monobyteBE(void **data,size_t *sz,void **outbuf); fmtType analyze_format(Binbyte *format,int *fmt,int *speed, int *tracks, size_t (**parsesndfile)(void **,size_t *sz, void **)); void reset_parsestate(void); int parse_wave_complete(void); #endif /* INCLUDED_miscplay_h_ */