Mercurial > hg > xemacs-beta
view src/nas.c @ 5353:38e24b8be4ea
Improve the lexical scoping in #'block, #'return-from.
lisp/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
* bytecomp.el (byte-compile-initial-macro-environment):
Shadow `block', `return-from' here, we implement them differently
when byte-compiling.
* bytecomp.el (byte-compile-active-blocks): New.
* bytecomp.el (byte-compile-block-1): New.
* bytecomp.el (byte-compile-return-from-1): New.
* bytecomp.el (return-from-1): New.
* bytecomp.el (block-1): New.
These are two aliases that exist to have their own associated
byte-compile functions, which functions implement `block' and
`return-from'.
* cl-extra.el (cl-macroexpand-all):
Fix a bug here when macros in the environment have been compiled.
* cl-macs.el (block):
* cl-macs.el (return):
* cl-macs.el (return-from):
Be more careful about lexical scope in these macros.
* cl.el:
* cl.el ('cl-block-wrapper): Removed.
* cl.el ('cl-block-throw): Removed.
These aren't needed in code generated by this XEmacs. They
shouldn't be needed in code generated by XEmacs 21.4, but if it
turns out the packages do need them, we can put them back.
2011-01-30 Mike Sperber <mike@xemacs.org>
* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
`font-lock-mode' is unset, which can happen in the middle of
`revert-buffer'.
2011-01-23 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete):
* cl-macs.el (delq):
* cl-macs.el (remove):
* cl-macs.el (remq):
Don't use the compiler macro if these functions were given the
wrong number of arguments, as happens in lisp-tests.el.
* cl-seq.el (remove, remq): Removed.
I added these to subr.el, and forgot to remove them from here.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-setq, byte-compile-set):
Remove kludge allowing keywords' values to be set, all the code
that does that is gone.
* cl-compat.el (elt-satisfies-test-p):
* faces.el (set-face-parent):
* faces.el (face-doc-string):
* gtk-font-menu.el:
* gtk-font-menu.el (gtk-reset-device-font-menus):
* msw-font-menu.el:
* msw-font-menu.el (mswindows-reset-device-font-menus):
* package-get.el (package-get-installedp):
* select.el (select-convert-from-image-data):
* sound.el:
* sound.el (load-sound-file):
* x-font-menu.el (x-reset-device-font-menus-core):
Don't quote keywords, they're self-quoting, and the
win from backward-compatibility is sufficiently small now that the
style problem overrides it.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
2011-01-15 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
function, handing the sequences over to #'coerce if we don't
understand them here.
* cl-macs.el (inline): Don't proclaim #'concatenate as inline, its
compiler macro is more useful than doing that.
2011-01-11 Aidan Kehoe <kehoea@parhasard.net>
* subr.el (delete, delq, remove, remq): Move #'remove, #'remq
here, they don't belong in cl-seq.el; move #'delete, #'delq here
from fns.c, implement them in terms of #'delete*, allowing support
for sequences generally.
* update-elc.el (do-autoload-commands): Use #'delete*, not #'delq
here, now the latter's no longer dumped.
* cl-macs.el (delete, delq): Add compiler macros transforming
#'delete and #'delq to #'delete* calls.
2011-01-10 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box): Correct a misplaced parenthesis
here, thank you Mats Lidell in 87zkr9gqrh.fsf@mail.contactor.se !
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box):
* list-mode.el (display-completion-list):
These functions used to use cl-parsing-keywords; change them to
use defun* instead, fixing the build. (Not sure what led to me
not including this change in d1b17a33450b!)
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (define-star-compiler-macros):
Make sure the form has ITEM and LIST specified before attempting
to change to calls with explicit tests; necessary for some tests
in lisp-tests.el to compile correctly.
(stable-union, stable-intersection): Add compiler macros for these
functions, in the same way we do for most of the other functions
in cl-seq.el.
2011-01-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (dolist, dotimes, do-symbols, macrolet)
(symbol-macrolet):
Define these macros with defmacro* instead of parsing the argument
list by hand, for the sake of style and readability; use backquote
where appropriate, instead of calling #'list and and friends, for
the same reason.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* x-misc.el (device-x-display):
Provide this function, documented in the Lispref for years, but
not existing previously. Thank you Julian Bradfield, thank you
Jeff Mincy.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el:
Move the heavy lifting from this file to C. Dump the
cl-parsing-keywords macro, but don't use defun* for the functions
we define that do take keywords, dynamic scope lossage makes that
not practical.
* subr.el (sort, fillarray): Move these aliases here.
(map-plist): #'nsublis is now built-in, but at this point #'eql
isn't necessarily available as a test; use #'eq.
* obsolete.el (cl-delete-duplicates): Make this available for old
compiler macros and old code.
(memql): Document that this is equivalent to #'member*, and worse.
* cl.el (adjoin, subst): Removed. These are in C.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (assoc-ignore-case): Remove a duplicate definition of
this function (it's already in subr.el).
* iso8859-1.el (char-width):
On non-Mule, make this function equivalent to that produced by
(constantly 1), but preserve its docstring.
* subr.el (subst-char-in-string): Define this in terms of
#'substitute, #'nsubstitute.
(string-width): Define this using #'reduce and #'char-width.
(char-width): Give this a simpler definition, it makes far more
sense to check for mule at load time and redefine, as we do in
iso8859-1.el.
(store-substring): Implement this in terms of #'replace, now
#'replace is cheap.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* update-elc.el (lisp-files-needed-for-byte-compilation)
(lisp-files-needing-early-byte-compilation):
cl-macs belongs in the former, not the latter, it is as
fundamental as bytecomp.el.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.el:
Provde the Common Lisp program-error, type-error as error
symbols. This doesn't nearly go far enough for anyone using the
Common Lisp errors.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete-duplicates):
If the form has an incorrect number of arguments, don't attempt a
compiler macroexpansion.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (cl-safe-expr-p):
Forms that start with the symbol lambda are also safe.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
For these functions' compiler macros, the optimisation is safe
even if the first and the last arguments have side effects, since
they're only used the once.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (inline-side-effect-free-compiler-macros):
Unroll a loop here at macro-expansion time, so these compiler
macros are compiled. Use #'eql instead of #'eq in a couple of
places for better style.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (notany, notevery): Avoid some dynamic scope
stupidity with local variable names in these functions, when they
weren't prefixed with cl-; go into some more detail in the doc
strings.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns): #'remove, #'remq are
free of side-effects.
(side-effect-and-error-free-fns):
Drop dot, dot-marker from the list.
2010-11-17 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (coerce):
In the argument list, name the first argument OBJECT, not X; the
former name was always used in the doc string and is clearer.
Handle vector type specifications which include the length of the
target sequence, error if there's a mismatch.
* cl-macs.el (cl-make-type-test): Handle type specifications
starting with the symbol 'eql.
2010-11-14 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (eql): Don't remove the byte-compile property of this
symbol. That was necessary to override a bug in bytecomp.el where
#'eql was confused with #'eq, which bug we no longer have.
If neither expression is constant, don't attempt to handle the
expression in this compiler macro, leave it to byte-compile-eql,
which produces better code anyway.
* bytecomp.el (eq): #'eql is not the function associated with the
byte-eq byte code.
(byte-compile-eql): Add an explicit compile method for this
function, for cases where the cl-macs compiler macro hasn't
reduced it to #'eq or #'equal.
2010-10-25 Aidan Kehoe <kehoea@parhasard.net>
Add compiler macros and compilation sanity-checking for various
functions that take keywords.
* byte-optimize.el (side-effect-free-fns): #'symbol-value is
side-effect free and not error free.
* bytecomp.el (byte-compile-normal-call): Check keyword argument
lists for sanity; store information about the positions where
keyword arguments start using the new byte-compile-keyword-start
property.
* cl-macs.el (cl-const-expr-val): Take a new optional argument,
cl-not-constant, defaulting to nil, in this function; return it if
the expression is not constant.
(cl-non-fixnum-number-p): Make this into a separate function, we
want to pass it to #'every.
(eql): Use it.
(define-star-compiler-macros): Use the same code to generate the
member*, assoc* and rassoc* compiler macros; special-case some
code in #'add-to-list in subr.el.
(remove, remq): Add compiler macros for these two functions, in
preparation for #'remove being in C.
(define-foo-if-compiler-macros): Transform (remove-if-not ...) calls to
(remove ... :if-not) at compile time, which will be a real win
once the latter is in C.
(define-substitute-if-compiler-macros)
(define-subst-if-compiler-macros): Similarly for these functions.
(delete-duplicates): Change this compiler macro to use
#'plists-equal; if we don't have information about the type of
SEQUENCE at compile time, don't bother attempting to inline the
call, the function will be in C soon enough.
(equalp): Remove an old commented-out compiler macro for this, if
we want to see it it's in version control.
(subst-char-in-string): Transform this to a call to nsubstitute or
nsubstitute, if that is appropriate.
* cl.el (ldiff): Don't call setf here, this makes for a load-time
dependency problem in cl-macs.el
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* term/vt100.el:
Refer to XEmacs, not GNU Emacs, in permissions.
* term/bg-mouse.el:
* term/sup-mouse.el:
Put copyright notice in canonical "Copyright DATE AUTHOR" form.
Refer to XEmacs, not GNU Emacs, in permissions.
* site-load.el:
Add permission boilerplate.
* mule/canna-leim.el:
* alist.el:
Refer to XEmacs, not APEL/this program, in permissions.
* mule/canna-leim.el:
Remove my copyright, I've assigned it to the FSF.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* gtk.el:
* gtk-widget-accessors.el:
* gtk-package.el:
* gtk-marshal.el:
* gtk-compose.el:
* gnome.el:
Add copyright notice based on internal evidence.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* easymenu.el: Add reference to COPYING to permission notice.
* gutter.el:
* gutter-items.el:
* menubar-items.el:
Fix typo "Xmacs" in permissions notice.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* auto-save.el:
* font.el:
* fontconfig.el:
* mule/kinsoku.el:
Add "part of XEmacs" text to permission notice.
2010-10-14 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns):
* cl-macs.el (remf, getf):
* cl-extra.el (tailp, cl-set-getf, cl-do-remf):
* cl.el (ldiff, endp):
Tighten up Common Lisp compatibility for #'ldiff, #'endp, #'tailp;
add circularity checking for the first two.
#'cl-set-getf and #'cl-do-remf were Lisp implementations of
#'plist-put and #'plist-remprop; change the names to aliases,
changes the macros that use them to using #'plist-put and
#'plist-remprop directly.
2010-10-12 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.el (fundamental-mode-abbrev-table, global-abbrev-table):
Create both these abbrev tables using the usual
#'define-abbrev-table calls, rather than attempting to
special-case them.
* cl-extra.el: Force cl-macs to be loaded here, if cl-extra.el is
being loaded interpreted. Previously other, later files would
redundantly call (load "cl-macs") when interpreted, it's more
reasonable to do it here, once.
* cmdloop.el (read-quoted-char-radix): Use defcustom here, we
don't have any dump-order dependencies that would prevent that.
* custom.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling, rely on cl-extra.el in the
former case and the appropriate entry in bytecomp-load-hook in the
latter. Get rid of custom-declare-variable-list, we have no
dump-time dependencies that would require it.
* faces.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling.
* packages.el: Remove some inaccurate comments.
* post-gc.el (cleanup-simple-finalizers): Use #'delete-if-not
here, now the order of preloaded-file-list has been changed to
make it available.
* subr.el (custom-declare-variable-list): Remove. No need for it.
Also remove a stub define-abbrev-table from this file, given the
current order of preloaded-file-list there's no need for it.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-constp) Forms quoted with FUNCTION are
also constant.
(byte-compile-initial-macro-environment): In #'the, if FORM is
constant and does not match TYPE, warn at byte-compile time.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* backquote.el (bq-vector-contents, bq-list*): Remove; the former
is equivalent to (append VECTOR nil), the latter to (list* ...).
(bq-process-2): Use (append VECTOR nil) instead of using
#'bq-vector-contents to convert to a list.
(bq-process-1): Now we use list* instead of bq-list
* subr.el (list*): Moved from cl.el, since it is now required to
be available the first time a backquoted form is encountered.
* cl.el (list*): Move to subr.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* test-harness.el (Check-Message):
Add an omitted comma here, thank you the buildbot.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* hash-table.el (hash-table-key-list, hash-table-value-list)
(hash-table-key-value-alist, hash-table-key-value-plist):
Remove some useless #'nreverse calls in these files; our hash
tables have no order, it's not helpful to pretend they do.
* behavior.el (read-behavior):
Do the same in this file, in some code evidently copied from
hash-table.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* info.el (Info-insert-dir):
* format.el (format-deannotate-region):
* files.el (cd, save-buffers-kill-emacs):
Use #'some, #'every and related functions for applying boolean
operations to lists, instead of rolling our own ones that cons and
don't short-circuit.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
* cl-macs.el (the):
Rephrase the docstring, make its implementation when compiling
files a little nicer.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* descr-text.el (unidata-initialize-unicodedata-database)
(unidata-initialize-unihan-database, describe-char-unicode-data)
(describe-char-unicode-data):
Wrap calls to the database functions with (with-fboundp ...),
avoiding byte compile warnings on builds without support for the
database functions.
(describe-char): (reduce #'max ...), not (apply #'max ...), no
need to cons needlessly.
(describe-char): Remove a redundant lambda wrapping
#'extent-properties.
(describe-char-unicode-data): Call #'nsubst when replacing "" with
nil in the result of #'split-string, instead of consing inside
mapcar.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* x-faces.el (x-available-font-sizes):
* specifier.el (let-specifier):
* package-ui.el (pui-add-required-packages):
* msw-faces.el (mswindows-available-font-sizes):
* modeline.el (modeline-minor-mode-menu):
* minibuf.el (minibuf-directory-files):
Replace the O2N (delq nil (mapcar (lambda (W) (and X Y)) Z)) with
the ON (mapcan (lambda (W) (and X (list Y))) Z) in these files.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
When these functions are handed more than two arguments, and those
arguments have no side effects, transform to a series of two
argument calls, avoiding funcall in the byte-compiled code.
* mule/mule-cmds.el (finish-set-language-environment):
Take advantage of this change in a function called 256 times at
startup.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-function-form, byte-compile-quote)
(byte-compile-quote-form):
Warn at compile time, and error at runtime, if a (quote ...) or a
(function ...) form attempts to quote more than one object.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-apply): Transform (apply 'nconc
(mapcar ...)) to (mapcan ...); warn about use of the first idiom.
* update-elc.el (do-autoload-commands):
* packages.el (packages-find-package-library-path):
* frame.el (frame-list):
* extents.el (extent-descendants):
* etags.el (buffer-tag-table-files):
* dumped-lisp.el (preloaded-file-list):
* device.el (device-list):
* bytecomp-runtime.el (proclaim-inline, proclaim-notinline)
Use #'mapcan, not (apply #'nconc (mapcar ...) in all these files.
* bytecomp-runtime.el (eval-when-compile, eval-and-compile):
In passing, mention that these macros also evaluate the body when
interpreted.
tests/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test lexical scope for `block', `return-from'; add a
Known-Bug-Expect-Failure for a contorted example that fails when
byte-compiled.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Mon, 07 Feb 2011 12:01:24 +0000 |
parents | 8b63e21b0436 |
children |
line wrap: on
line source
/* nas.c --- XEmacs support for the Network Audio System server. * * Author: Richard Caley <R.Caley@ed.ac.uk> * * Copyright 1994 Free Software Foundation, Inc. * Copyright 1993 Network Computing Devices, Inc. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided * that the above copyright notice appear in all copies and that both that * copyright notice and this permission notice appear in supporting * documentation, and that the name Network Computing Devices, Inc. not be * used in advertising or publicity pertaining to distribution of this * software without specific, written prior permission. * * THIS SOFTWARE IS PROVIDED 'AS-IS'. NETWORK COMPUTING DEVICES, INC., * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT * LIMITATION ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * PARTICULAR PURPOSE, OR NONINFRINGEMENT. IN NO EVENT SHALL NETWORK * COMPUTING DEVICES, INC., BE LIABLE FOR ANY DAMAGES WHATSOEVER, INCLUDING * SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES, INCLUDING LOSS OF USE, DATA, * OR PROFITS, EVEN IF ADVISED OF THE POSSIBILITY THEREOF, AND REGARDLESS OF * WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ /* Synched up with: Not in FSF. */ /* This file Mule-ized by Ben Wing, 5-15-01. */ /* There are four compile-time options. * * XTOOLKIT This will be part of an Xt program. * * XTEVENTS The playing will be supervised asynchronously by the Xt event * loop. If not set, playing will be completed within the call * to play_file etc. * * ROBUST_PLAY Causes errors in nas to be caught. This means that the * program will attempt not to die if the nas server does. * * CACHE_SOUNDS Causes the sounds to be played in buckets in the NAS * server. They are named by their comment field, or if that is * empty by the filename, or for play_sound_data by a name made up * from the sample itself. */ /* CHANGES: * 10/8/94, rjc Changed names from netaudio to nas * Added back asynchronous play if nas library has * correct error facilities. * 4/11/94, rjc Added wait_for_sounds to be called when user wants to * be sure all play has finished. * 1998-10-01 rlt Added support for WAVE files. * 2002-10-16 Jon Trulson modifed this to work with NAS releases * 1.5f and higher. We were using the private variable * SoundFileInfo that doesn't exist anymore. But preserve * backward compatibility. This will not work for some * versions of NAS around 1.5b to 1.5f or so. Known to * work on 1.2p5 and 1.6. */ #include <config.h> #include "lisp.h" #include "sound.h" #include "sysdep.h" #include "syssignal.h" /* NAS <= 1.2p5 defines {BIG,LITTLE}_ENDIAN in <audio/fileutil.h>, conflicting with GNU libc (at least); newer versions avoid this name space pollution. DO NOT USE THOSE MACROS in this file. Use NAS_{BIG,LITTLE}_ENDIAN. It would be slightly more reliable to do this via configure, but that seems unnecessarily complex. */ #undef LITTLE_ENDIAN #undef BIG_ENDIAN BEGIN_C_DECLS #include <audio/audiolib.h> #include <audio/soundlib.h> #include <audio/snd.h> #include <audio/wave.h> #include <audio/fileutil.h> END_C_DECLS /* NAS <= 1.2p5 <audio/fileutil.h> doesn't define the NAS_ versions */ #ifndef NAS_LITTLE_ENDIAN # define NAS_LITTLE_ENDIAN LITTLE_ENDIAN # define NAS_BIG_ENDIAN BIG_ENDIAN #endif #define XTOOLKIT #define XTEVENTS #define ROBUST_PLAY #define CACHE_SOUNDS /* * For old NAS libraries, force playing to be synchronous * and declare the long jump point locally. */ #if defined (NAS_NO_ERROR_JUMP) # undef XTEVENTS # include <setjmp.h> jmp_buf AuXtErrorJump; #endif #ifdef XTOOLKIT # include <X11/Intrinsic.h> # include <audio/Xtutil.h> #endif /* audiolib <= some version doesn't define major and minor versions */ /* Do NOT use AudioLibraryVersion in this file. */ #ifndef AudioLibraryVersion #define AudioLibraryVersion 1 #endif #ifndef AudioLibraryVersionMajor #define AudioLibraryVersionMajor AudioLibraryVersion #endif #ifndef AudioLibraryVersionMinor #define AudioLibraryVersionMinor 0 #endif #if defined (ROBUST_PLAY) static AuBool CatchIoErrorAndJump (AuServer *aud); static AuBool CatchErrorAndJump (AuServer *aud, AuErrorEvent *event); SIGTYPE sigpipe_handle (int signo); #endif extern Lisp_Object Vsynchronous_sounds; static Sound SoundOpenDataForReading (Binbyte *data, int length); static AuServer *aud; /* count of sounds currently being played. */ static int sounds_in_play; #ifdef XTOOLKIT static Display *aud_server; static XtInputId input_id; #else static Extbyte *aud_server; #endif /* XTOOLKIT */ Extbyte * nas_init_play ( #ifdef XTOOLKIT Display *display #else Extbyte *server #endif ); Extbyte * nas_init_play ( #ifdef XTOOLKIT Display *display #else Extbyte *server #endif ) { Extbyte *err_message; SIGTYPE (*old_sigpipe) (int); #ifdef XTOOLKIT Extbyte * server = DisplayString (display); XtAppContext app_context = XtDisplayToApplicationContext (display); aud_server = display; #else aud_server = server; #endif #ifdef ROBUST_PLAY old_sigpipe = EMACS_SIGNAL (SIGPIPE, sigpipe_handle); if (setjmp (AuXtErrorJump)) { EMACS_SIGNAL (SIGPIPE, old_sigpipe); start_interrupts (); return (Extbyte *) "error in NAS"; } #endif #if defined (ROBUST_PLAY) && !defined (NAS_NO_ERROR_JUMP) AuDefaultIOErrorHandler = CatchIoErrorAndJump; AuDefaultErrorHandler = CatchErrorAndJump; #endif stop_interrupts (); aud = AuOpenServer (server, 0, NULL, 0, NULL, &err_message); start_interrupts (); if (!aud) { #ifdef ROBUST_PLAY EMACS_SIGNAL (SIGPIPE, old_sigpipe); #endif if (err_message == NULL) return (Extbyte *) "Can't connect to audio server"; else return err_message; } #if defined (ROBUST_PLAY) # if defined (NAS_NO_ERROR_JUMP) aud->funcs.ioerror_handler = CatchIoErrorAndJump; aud->funcs.error_handler = CatchErrorAndJump; # else /* !NAS_NO_ERROR_JUMP */ AuDefaultIOErrorHandler = NULL; AuDefaultErrorHandler = NULL; # endif #endif #ifdef XTEVENTS input_id = AuXtAppAddAudioHandler (app_context, aud); #endif #ifdef CACHE_SOUNDS AuSetCloseDownMode (aud, AuCloseDownRetainPermanent, NULL); #endif #ifdef ROBUST_PLAY EMACS_SIGNAL (SIGPIPE, old_sigpipe); #endif sounds_in_play = 0; return NULL; } # if 0 /* not currently used */ static void nas_close_down_play (void) { AuCloseServer (aud); sound_warn ("disconnected from audio server"); } #endif /********************************************************************\ * * * Callback which is run when the sound finishes playing. * * * \********************************************************************/ static void doneCB (AuServer *UNUSED (auserver), AuEventHandlerRec *UNUSED (handler), AuEvent *UNUSED (ev), AuPointer data) { int *in_play_p = (int *) data; (*in_play_p) --; } #ifdef CACHE_SOUNDS /********************************************************************\ * * * Play a sound by playing the relevant bucket, if any or * * downloading it if not. * * * \********************************************************************/ static void do_caching_play (Sound s, int volume, Binbyte *buf) { AuBucketAttributes *list, b; AuBucketID id; int n; AuSetString (AuBucketDescription (&b), AuStringLatin1, strlen (SoundComment (s)), SoundComment (s)); list = AuListBuckets (aud, AuCompCommonDescriptionMask, &b, &n, NULL); if (list == NULL) { AuPointer my_buf; if (buf==NULL) { if ((my_buf= (AuPointer) malloc (SoundNumBytes (s)))==NULL) { return; } if (SoundReadFile ((Extbyte *) my_buf, SoundNumBytes (s), s) != SoundNumBytes (s)) { free (my_buf); return; } } else my_buf = (AuPointer) buf; id = AuSoundCreateBucketFromData (aud, s, my_buf, AuAccessAllMasks, NULL, NULL); if (buf == NULL) free (my_buf); } else /* found cached sound */ { id = AuBucketIdentifier (list); AuFreeBucketAttributes (aud, n, list); } sounds_in_play++; AuSoundPlayFromBucket (aud, id, AuNone, AuFixedPointFromFraction (volume, 100), doneCB, (AuPointer) &sounds_in_play, 1, NULL, NULL, NULL, NULL); } #endif /* CACHE_SOUNDS */ void nas_wait_for_sounds (void); void nas_wait_for_sounds (void) { AuEvent ev; while (sounds_in_play>0) { AuNextEvent (aud, AuTrue, &ev); AuDispatchEvent (aud, &ev); } } int nas_play_sound_file (Extbyte *sound_file, int volume); int nas_play_sound_file (Extbyte *sound_file, int volume) { SIGTYPE (*old_sigpipe) (int); #ifdef ROBUST_PLAY old_sigpipe = EMACS_SIGNAL (SIGPIPE, sigpipe_handle); if (setjmp (AuXtErrorJump)) { EMACS_SIGNAL (SIGPIPE, old_sigpipe); return 0; } #endif if (aud==NULL) { if (aud_server != NULL) { Extbyte *m; /* attempt to reconect */ if ((m = nas_init_play (aud_server)) != NULL) { #ifdef ROBUST_PLAY EMACS_SIGNAL (SIGPIPE, old_sigpipe); #endif return 0; } } else { sound_warn ("Attempt to play with no audio init\n"); #ifdef ROBUST_PLAY EMACS_SIGNAL (SIGPIPE, old_sigpipe); #endif return 0; } } #ifndef CACHE_SOUNDS sounds_in_play++; AuSoundPlayFromFile (aud, sound_file, AuNone, AuFixedPointFromFraction (volume,100), doneCB, (AuPointer) &sounds_in_play, NULL, NULL, NULL, NULL); #else /* Cache the sounds in buckets on the server */ { Sound s; if ((s = SoundOpenFileForReading (sound_file))==NULL) { #ifdef ROBUST_PLAY EMACS_SIGNAL (SIGPIPE, old_sigpipe); #endif return 0; } if (SoundComment (s) == NULL || SoundComment (s)[0] == '\0') { SoundComment (s) = FileCommentFromFilename (sound_file); } do_caching_play (s, volume, NULL); SoundCloseFile (s); } #endif /* CACHE_SOUNDS */ #ifndef XTEVENTS nas_wait_for_sounds (); #else if (!NILP (Vsynchronous_sounds)) nas_wait_for_sounds (); #endif #ifdef ROBUST_PLAY EMACS_SIGNAL (SIGPIPE, old_sigpipe); #endif return 1; } int nas_play_sound_data (Binbyte *data, int length, int volume); int nas_play_sound_data (Binbyte *data, int length, int volume) { Sound s; int offset; SIGTYPE (*old_sigpipe) (int); #if !defined (XTEVENTS) AuEvent ev; #endif #ifdef ROBUST_PLAY old_sigpipe = EMACS_SIGNAL (SIGPIPE, sigpipe_handle); if (setjmp (AuXtErrorJump) != 0) { EMACS_SIGNAL (SIGPIPE, old_sigpipe); return 0; } #endif if (aud == NULL) { if (aud_server != NULL) { Extbyte *m; /* attempt to reconect */ if ((m = nas_init_play (aud_server)) != NULL) { #ifdef ROBUST_PLAY EMACS_SIGNAL (SIGPIPE, old_sigpipe); #endif return 0; } } else { sound_warn ("Attempt to play with no audio init\n"); #ifdef ROBUST_PLAY EMACS_SIGNAL (SIGPIPE, old_sigpipe); #endif return 0; } } if ((s=SoundOpenDataForReading (data, length))==NULL) { sound_warn ("unknown sound type"); #ifdef ROBUST_PLAY EMACS_SIGNAL (SIGPIPE, old_sigpipe); #endif return 0; } if (SoundFileFormat (s) == SoundFileFormatSnd) { /* hack, hack */ offset = ((SndInfo *) (s->formatInfo))->h.dataOffset; } else if (SoundFileFormat (s) == SoundFileFormatWave) { offset = ((WaveInfo *) (s->formatInfo))->dataOffset; } else { sound_warn ("only understand snd and wave files at the moment"); SoundCloseFile (s); #ifdef ROBUST_PLAY EMACS_SIGNAL (SIGPIPE, old_sigpipe); #endif return 0; } #ifndef CACHE_SOUNDS sounds_in_play++; AuSoundPlayFromData (aud, s, data+offset, AuNone, AuFixedPointFromFraction (volume,100), doneCB, (AuPointer) &sounds_in_play, NULL, NULL, NULL, NULL); #else /* Cache the sounds in buckets on the server */ do_caching_play (s, volume, data+offset); #endif /* CACHE_SOUNDS */ #ifndef XTEVENTS nas_wait_for_sounds (); #else if (!NILP (Vsynchronous_sounds)) nas_wait_for_sounds (); #endif SoundCloseFile (s); #ifdef ROBUST_PLAY EMACS_SIGNAL (SIGPIPE, old_sigpipe); #endif return 1; } #if defined (ROBUST_PLAY) /********************************************************************\ * * * Code to protect the client from server shutdowns. * * * * This is unbelievably horrible. * * * \********************************************************************/ static AuBool CatchIoErrorAndJump (AuServer *old_aud) { if (old_aud) sound_warn ("Audio Server connection broken"); else sound_warn ("Audio Server connection broken because of signal"); #ifdef XTEVENTS #ifdef XTOOLKIT AuXtAppRemoveAudioHandler (aud, input_id); #endif if (aud) AuCloseServer (aud); aud = NULL; sounds_in_play = 0; longjmp (AuXtErrorJump, 1); #else /* not XTEVENTS */ if (aud) AuCloseServer (aud); aud = NULL; sounds_in_play = 0; longjmp (AuXtErrorJump, 1); #endif /* XTEVENTS */ return 0; } SIGTYPE sigpipe_handle (int UNUSED (signo)) { CatchIoErrorAndJump (NULL); } static AuBool CatchErrorAndJump (AuServer *old_aud, AuErrorEvent *UNUSED (event)) { return CatchIoErrorAndJump (old_aud); } #endif /* ROBUST_PLAY */ /********************************************************************\ * * * This code is here because the nas Sound library doesn't * * support playing from a file buffered in memory. It's a fairly * * direct translation of the file-based equivalent. * * * * Since we don't have a filename, samples with no comment field * * are named by a section of their content. * * * \********************************************************************/ /* Create a name from the sound. */ static Extbyte * NameFromData (const CBinbyte *buf, int len) { Extbyte name[9]; int i; Extbyte *s; buf+=len/2; len -= len/2; i=0; while (i<8 && len >0) { while (*buf < 32 && len>0) { buf++; len--; } name[i]= *buf; i++; buf++; len--; } name[i]='\0'; if (i==8) { strcpy (s = (Extbyte *) malloc (10), name); } else { strcpy (s = (Extbyte *) malloc (15), "short sound"); } return s; } /* Code to do a pseudo-open on a data buffer. Only for snd files at the moment. */ static SndInfo * SndOpenDataForReading (const CBinbyte *data, int length) { SndInfo *si; int size; if (!(si = (SndInfo *) malloc (sizeof (SndInfo)))) return NULL; si->comment = NULL; si->writing = 0; memcpy (&si->h, data, sizeof (SndHeader)); if (NAS_LITTLE_ENDIAN) { CBinbyte n; swapl (&si->h.magic, n); swapl (&si->h.dataOffset, n); swapl (&si->h.dataSize, n); swapl (&si->h.format, n); swapl (&si->h.sampleRate, n); swapl (&si->h.tracks, n); } if (si->h.magic != SND_MAGIC_NUM) { free (si); return NULL; } size = si->h.dataOffset - sizeof (SndHeader); if (size) { if (!(si->comment = (Extbyte *) malloc (size + 1))) { free (si); return NULL; } memcpy (si->comment, data+sizeof (SndHeader), size); *(si->comment + size) = 0; if (*si->comment == '\0') si->comment = NameFromData (data+si->h.dataOffset, length-si->h.dataOffset); } else si->comment = NameFromData (data+si->h.dataOffset, length-si->h.dataOffset); si->h.dataSize = length-si->h.dataOffset; si->fp=NULL; return si; } /* Stuff taken from wave.c from NAS. Just like snd files, NAS can't read wave data from memory, so these functions do that for us. */ #define Err() { free(wi); return NULL; } #define readFourcc(_f) dread(_f, sizeof(RIFF_FOURCC), 1) #define cmpID(_x, _y) \ strncmp((CBinbyte *) (_x), (CBinbyte *) (_y), sizeof(RIFF_FOURCC)) #define PAD2(_x) (((_x) + 1) & ~1) /* These functions here are for faking file I/O from buffer. */ /* The "file" position */ static size_t file_posn; /* The length of the "file" */ static size_t file_len; /* The actual "file" data. */ static const void* file_data; /* Like fopen, but for a buffer in memory */ static void dopen (const void* data, size_t length) { file_data = data; file_len = length; file_posn = 0; } /* Like fread, but for a buffer in memory */ static int dread (void* buf, size_t size, size_t nitems) { size_t nread = size * nitems; if (file_posn + nread <= file_len) { memcpy(buf, (CBinbyte *) file_data + file_posn, size * nitems); file_posn += nread; return nitems; } else { return EOF; } } /* Like fgetc, but for a buffer in memory */ static int dgetc (void) { if (file_posn < file_len) return ((CBinbyte *)file_data)[file_posn++]; else return -1; } /* Like fseek, but for a buffer in memory */ static int dseek (long offset, int from) { if (from == 0) file_posn = offset; else if (from == 1) file_posn += offset; else if (from == 2) file_posn = file_len + offset; return 0; } /* Like ftell, but for a buffer in memory */ static long dtell (void) { return file_posn; } /* Data buffer analogs for FileReadS and FileReadL in NAS. */ static unsigned short DataReadS (int swapit) { unsigned short us; dread(&us, 2, 1); if (swapit) us = FileSwapS(us); return us; } static AuUint32 DataReadL (int swapit) { AuUint32 ul; dread(&ul, 4, 1); if (swapit) ul = FileSwapL(ul); return ul; } static int readChunk (RiffChunk *c) { int status; CBinbyte n; if ((status = dread(c, sizeof(RiffChunk), 1))) if (NAS_BIG_ENDIAN) swapl(&c->ckSize, n); return status; } /* A very straight-forward translation of WaveOpenFileForReading to read the wave data from a buffer in memory. */ static WaveInfo * WaveOpenDataForReading (const CBinbyte *data, int length) { RiffChunk ck; RIFF_FOURCC fourcc; AuInt32 fileSize; WaveInfo *wi; if (!(wi = (WaveInfo *) malloc(sizeof(WaveInfo)))) return NULL; wi->comment = NULL; wi->dataOffset = wi->format = wi->writing = 0; dopen(data, length); if (!readChunk(&ck) || cmpID(&ck.ckID, RIFF_RiffID) || !readFourcc(&fourcc) || cmpID(&fourcc, RIFF_WaveID)) Err(); fileSize = PAD2(ck.ckSize) - sizeof(RIFF_FOURCC); while (fileSize >= (AuInt32) sizeof(RiffChunk)) { if (!readChunk(&ck)) Err(); fileSize -= sizeof(RiffChunk) + PAD2(ck.ckSize); /* LIST chunk */ if (!cmpID(&ck.ckID, RIFF_ListID)) { if (!readFourcc(&fourcc)) Err(); /* INFO chunk */ if (!cmpID(&fourcc, RIFF_ListInfoID)) { ck.ckSize -= sizeof(RIFF_FOURCC); while (ck.ckSize) { RiffChunk c; if (!readChunk(&c)) Err(); /* ICMT chunk */ if (!cmpID(&c.ckID, RIFF_InfoIcmtID)) { if (!(wi->comment = (Extbyte *) malloc(c.ckSize)) || !dread(wi->comment, c.ckSize, 1)) Err(); if (c.ckSize & 1) dgetc(); /* eat the pad byte */ } else /* skip unknown chunk */ dseek(PAD2(c.ckSize), 1); ck.ckSize -= sizeof(RiffChunk) + PAD2(c.ckSize); } } else /* skip unknown chunk */ dseek(PAD2(ck.ckSize) - sizeof(RIFF_FOURCC), 1); } /* wave format chunk */ else if (!cmpID(&ck.ckID, RIFF_WaveFmtID) && !wi->format) { AuInt32 dummy; wi->format = DataReadS(NAS_BIG_ENDIAN); wi->channels = DataReadS(NAS_BIG_ENDIAN); wi->sampleRate = DataReadL(NAS_BIG_ENDIAN); /* we don't care about the next two fields */ dummy = DataReadL(NAS_BIG_ENDIAN); dummy = DataReadS(NAS_BIG_ENDIAN); if (wi->format != RIFF_WAVE_FORMAT_PCM) Err(); wi->bitsPerSample = DataReadS(NAS_BIG_ENDIAN); /* skip any other format specific fields */ dseek(PAD2(ck.ckSize - 16), 1); } /* wave data chunk */ else if (!cmpID(&ck.ckID, RIFF_WaveDataID) && !wi->dataOffset) { long endOfFile; wi->dataOffset = dtell(); wi->dataSize = ck.ckSize; dseek(0, 2); endOfFile = dtell(); /* seek past the data */ if (dseek(wi->dataOffset + PAD2(ck.ckSize), 0) || dtell() > endOfFile) { /* the seek failed, assume the size is bogus */ dseek(0, 2); wi->dataSize = dtell() - wi->dataOffset; } wi->dataOffset -= sizeof(long); } else /* skip unknown chunk */ dseek(PAD2(ck.ckSize), 1); } if (!wi->dataOffset) Err(); wi->numSamples = wi->dataSize / wi->channels / (wi->bitsPerSample >> 3); if (!wi->comment) wi->comment = NameFromData (data + wi->dataOffset, length - wi->dataOffset); wi->fp = NULL; return wi; } static Sound SoundOpenDataForReading (Binbyte *data, int length) { Sound s; #if (AudioLibraryVersionMajor >= 2 ) && (AudioLibraryVersionMinor >= 3) SoundFileInfoProc toProc; #endif if (!(s = (Sound) malloc (sizeof (SoundRec)))) return NULL; if ((s->formatInfo = SndOpenDataForReading ((CBinbyte *) data, length)) != NULL) { #if (AudioLibraryVersionMajor >= 2 ) && (AudioLibraryVersionMinor >= 3) if ((toProc = SoundFileGetProc(SoundFileFormatSnd, SoundFileInfoProcTo)) == NULL) { SndCloseFile ((SndInfo *) (s->formatInfo)); free (s); return NULL; } if (!((*toProc)(s))) #else if (!((int(*)(Sound))(SoundFileInfo[SoundFileFormatSnd].toSound)) (s)) #endif { SndCloseFile ((SndInfo *) (s->formatInfo)); free (s); return NULL; } } else if ((s->formatInfo = WaveOpenDataForReading ((CBinbyte *) data, length)) != NULL) { #if (AudioLibraryVersionMajor >= 2 ) && (AudioLibraryVersionMinor >= 3) if ((toProc = SoundFileGetProc(SoundFileFormatWave, SoundFileInfoProcTo)) == NULL) { WaveCloseFile ((WaveInfo *) (s->formatInfo)); free (s); return NULL; } if (!((*toProc)(s))) #else if (!((int(*)(Sound))(SoundFileInfo[SoundFileFormatWave].toSound)) (s)) #endif { WaveCloseFile ((WaveInfo *) (s->formatInfo)); free (s); return NULL; } } return s; }