Mercurial > hg > xemacs-beta
annotate src/sunplay.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 | 6f2158fa75ed |
| children |
| rev | line source |
|---|---|
| 428 | 1 /* play.c - play a sound file on the speaker |
| 2 ** | |
| 3 ** Copyright (C) 1989 by Jef Poskanzer. | |
| 4 ** | |
| 5 ** Modified 24-May-91 by Jamie Zawinski (for Lucid Emacs). | |
| 6 ** Modified 17-Dec-92 by Jamie Zawinski (largely rewritten for SunOS 4.1.3). | |
| 7 ** | |
| 8 ** Permission to use, copy, modify, and distribute this software and its | |
| 9 ** documentation for any purpose and without fee is hereby granted, provided | |
| 10 ** that the above copyright notice appear in all copies and that both that | |
| 11 ** copyright notice and this permission notice appear in supporting | |
| 12 ** documentation. This software is provided "as is" without express or | |
| 13 ** implied warranty. | |
| 14 */ | |
| 15 | |
| 16 /* Synched up with: Not in FSF. */ | |
| 17 | |
| 563 | 18 /* This file Mule-ized by Ben Wing, 5-15-01. */ |
| 428 | 19 |
| 563 | 20 #include <config.h> |
| 21 #include "lisp.h" | |
| 22 #include "sound.h" | |
| 428 | 23 |
| 563 | 24 #include "sysdep.h" |
| 25 #include "sysfile.h" | |
| 26 #include "syssignal.h" | |
| 428 | 27 |
| 28 #include <multimedia/libaudio.h> | |
| 29 #include <multimedia/audio_device.h> | |
| 30 | |
| 31 static SIGTYPE (*sighup_handler) (int sig); | |
| 32 static SIGTYPE (*sigint_handler) (int sig); | |
| 33 static SIGTYPE sighandler (int sig); | |
| 34 | |
| 35 static int audio_fd; | |
| 36 | |
| 37 #define audio_open() open ("/dev/audio", (O_WRONLY | O_NONBLOCK), 0) | |
| 38 | |
| 442 | 39 static int initialized_device_p; |
| 428 | 40 static int reset_volume_p, reset_device_p; |
| 41 static double old_volume; | |
| 42 static Audio_hdr dev_hdr; | |
| 43 | |
| 44 static int | |
| 2367 | 45 init_device (int volume, Binbyte *data, int fd, |
| 428 | 46 unsigned int *header_length) |
| 47 { | |
| 48 Audio_hdr file_hdr; | |
| 49 | |
| 50 reset_volume_p = 0; | |
| 51 reset_device_p = 0; | |
| 52 | |
|
5050
6f2158fa75ed
Fix quick-build, use asserts() in place of ABORT()
Ben Wing <ben@xemacs.org>
parents:
4759
diff
changeset
|
53 assert (!(data && fd)); /* one or the other */ |
| 428 | 54 |
| 55 if (AUDIO_SUCCESS != audio_get_play_config (audio_fd, &dev_hdr)) | |
| 56 { | |
| 563 | 57 sound_perror ("Not a valid audio device"); |
| 428 | 58 return 1; |
| 59 } | |
| 60 | |
| 61 if (AUDIO_SUCCESS != (data | |
| 62 ? audio_decode_filehdr (data, &file_hdr, header_length) | |
| 63 : audio_read_filehdr (fd, &file_hdr, 0, 0))) | |
| 64 { | |
| 65 if (data) | |
| 563 | 66 sound_perror ("invalid audio data"); |
| 428 | 67 else |
| 563 | 68 sound_perror ("invalid audio file"); |
| 428 | 69 return 1; |
| 70 } | |
| 71 | |
| 72 audio_flush_play (audio_fd); | |
| 73 | |
| 442 | 74 if (!initialized_device_p || (0 != audio_cmp_hdr (&dev_hdr, &file_hdr))) |
| 428 | 75 { |
| 76 Audio_hdr new_hdr; | |
| 77 new_hdr = file_hdr; | |
| 78 reset_device_p = 1; | |
| 442 | 79 initialized_device_p = 1; |
| 428 | 80 if (AUDIO_SUCCESS != audio_set_play_config (audio_fd, &new_hdr)) |
| 81 { | |
| 563 | 82 Extbyte buf1 [100], buf2 [100], buf3 [250]; |
| 428 | 83 audio_enc_to_str (&file_hdr, buf1); |
| 84 audio_enc_to_str (&new_hdr, buf2); | |
| 85 sprintf (buf3, "wanted %s, got %s", buf1, buf2); | |
| 563 | 86 sound_warn (buf3); |
| 428 | 87 return 1; |
| 88 } | |
| 89 } | |
| 90 | |
| 91 if (volume < 0 || volume > 100) | |
| 92 { | |
| 563 | 93 Extbyte buf [255]; |
| 428 | 94 sprintf (buf, "volume must be between 0 and 100 (not %d)", volume); |
| 563 | 95 sound_warn (buf); |
| 428 | 96 return 1; |
| 97 } | |
| 98 { | |
| 99 /* set the volume; scale it to 0.0 - 1.0 */ | |
| 100 double V = (volume / 100.0); | |
| 101 audio_get_play_gain (audio_fd, &old_volume); | |
| 102 reset_volume_p = 1; | |
| 103 audio_set_play_gain (audio_fd, &V); | |
| 104 } | |
| 105 | |
| 106 return 0; | |
| 107 } | |
| 108 | |
| 109 | |
| 110 static void | |
| 111 reset_device (int wait_p) | |
| 112 { | |
| 113 if (wait_p) | |
| 114 audio_drain (audio_fd, 1); | |
| 115 else | |
| 116 audio_flush_play (audio_fd); | |
| 117 if (reset_device_p) | |
| 118 audio_set_play_config (audio_fd, &dev_hdr); | |
| 119 if (reset_volume_p) | |
| 120 audio_set_play_gain (audio_fd, &old_volume); | |
| 121 } | |
| 122 | |
| 123 | |
| 124 void | |
| 563 | 125 play_sound_file (Extbyte *sound_file, int volume) |
| 428 | 126 { |
| 127 int rrtn, wrtn; | |
| 2367 | 128 Binbyte buf [255]; |
| 428 | 129 int file_fd; |
| 130 | |
| 131 audio_fd = audio_open (); | |
| 132 | |
| 133 if (audio_fd < 0) | |
| 134 { | |
| 563 | 135 sound_perror ("open /dev/audio"); |
| 428 | 136 return; |
| 137 } | |
| 138 | |
| 139 /* where to find the proto for signal()... */ | |
| 613 | 140 sighup_handler = (SIGTYPE (*) (int)) EMACS_SIGNAL (SIGHUP, sighandler); |
| 141 sigint_handler = (SIGTYPE (*) (int)) EMACS_SIGNAL (SIGINT, sighandler); | |
| 428 | 142 |
| 143 file_fd = open (sound_file, O_RDONLY, 0); | |
| 144 if (file_fd < 0) | |
| 145 { | |
| 563 | 146 sound_perror (sound_file); |
| 428 | 147 goto END_OF_PLAY; |
| 148 } | |
| 149 | |
| 2367 | 150 if (init_device (volume, (Binbyte *) 0, file_fd, (unsigned int *) 0)) |
| 428 | 151 goto END_OF_PLAY; |
| 152 | |
| 153 while (1) | |
| 154 { | |
| 2367 | 155 rrtn = read (file_fd, (CBinbyte *) buf, sizeof (buf)); |
| 428 | 156 if (rrtn < 0) |
| 157 { | |
| 563 | 158 sound_perror ("read"); |
| 428 | 159 goto END_OF_PLAY; |
| 160 } | |
| 161 if (rrtn == 0) | |
| 162 break; | |
| 163 | |
| 164 while (1) | |
| 165 { | |
| 2367 | 166 wrtn = write (audio_fd, (CBinbyte *) buf, rrtn); |
| 428 | 167 if (wrtn < 0) |
| 168 { | |
| 563 | 169 sound_perror ("write"); |
| 428 | 170 goto END_OF_PLAY; |
| 171 } | |
| 172 if (wrtn != 0) | |
| 173 break; | |
| 174 | |
| 175 if (AUDIO_ERR_INTERRUPTED == audio_drain (audio_fd, 1)) | |
| 176 goto END_OF_PLAY; | |
| 177 } | |
| 178 if (wrtn != rrtn) | |
| 179 { | |
| 563 | 180 Extbyte warn_buf [255]; |
| 428 | 181 sprintf (warn_buf, "play: rrtn = %d, wrtn = %d", rrtn, wrtn); |
| 563 | 182 sound_warn (warn_buf); |
| 428 | 183 goto END_OF_PLAY; |
| 184 } | |
| 185 } | |
| 186 | |
| 187 END_OF_PLAY: | |
| 188 | |
| 189 if (file_fd > 0) | |
| 190 close (file_fd); | |
| 191 | |
| 192 if (audio_fd > 0) | |
| 193 { | |
| 194 reset_device (1); | |
| 195 close (audio_fd); | |
| 196 } | |
| 197 | |
| 613 | 198 EMACS_SIGNAL (SIGHUP, sighup_handler); |
| 199 EMACS_SIGNAL (SIGINT, sigint_handler); | |
| 428 | 200 } |
| 201 | |
| 202 | |
| 442 | 203 int |
| 2367 | 204 play_sound_data (Binbyte *data, int length, int volume) |
| 428 | 205 { |
| 206 int wrtn, start = 0; | |
| 207 unsigned int ilen; | |
| 442 | 208 int result = 0; |
| 428 | 209 |
| 210 audio_fd = -1; | |
| 211 | |
| 442 | 212 if (length == 0) return 0; |
| 428 | 213 |
| 214 /* this is just to get a better error message */ | |
| 2367 | 215 if (strncmp (".snd\0", (CBinbyte *) data, 4)) |
| 428 | 216 { |
| 563 | 217 sound_warn ("Not valid audio data (bad magic number)"); |
| 428 | 218 goto END_OF_PLAY; |
| 219 } | |
| 220 if (length <= sizeof (Audio_hdr)) | |
| 221 { | |
| 563 | 222 sound_warn ("Not valid audio data (too short)"); |
| 428 | 223 goto END_OF_PLAY; |
| 224 } | |
| 225 | |
| 226 audio_fd = audio_open (); | |
| 227 if (audio_fd < 0) | |
| 442 | 228 return 0; |
| 428 | 229 |
| 230 /* where to find the proto for signal()... */ | |
| 613 | 231 sighup_handler = (SIGTYPE (*) (int)) EMACS_SIGNAL (SIGHUP, sighandler); |
| 232 sigint_handler = (SIGTYPE (*) (int)) EMACS_SIGNAL (SIGINT, sighandler); | |
| 428 | 233 |
| 234 if (init_device (volume, data, 0, &ilen)) | |
| 235 goto END_OF_PLAY; | |
| 236 | |
| 237 data += (ilen<<2); | |
| 238 length -= (ilen<<2); | |
| 239 if (length <= 1) | |
| 240 goto END_OF_PLAY; | |
| 241 | |
| 242 while (1) | |
| 243 { | |
| 2367 | 244 wrtn = write (audio_fd, (CBinbyte *) (data+start), length-start); |
| 428 | 245 if (wrtn < 0) |
| 246 { | |
| 563 | 247 sound_perror ("write"); |
| 428 | 248 goto END_OF_PLAY; |
| 249 } | |
| 250 if (wrtn != 0) | |
| 251 { | |
| 252 start += wrtn; | |
| 253 break; | |
| 254 } | |
| 255 if (AUDIO_ERR_INTERRUPTED == audio_drain (audio_fd, 1)) | |
| 256 goto END_OF_PLAY; | |
| 257 } | |
| 258 if (wrtn != length) | |
| 259 { | |
| 563 | 260 Extbyte buf [255]; |
| 428 | 261 sprintf (buf, "play: rrtn = %d, wrtn = %d", length, wrtn); |
| 563 | 262 sound_warn (buf); |
| 428 | 263 goto END_OF_PLAY; |
| 264 } | |
| 265 | |
| 442 | 266 result = 1; |
| 267 | |
| 428 | 268 END_OF_PLAY: |
| 269 | |
| 270 if (audio_fd > 0) | |
| 271 { | |
| 272 reset_device (1); | |
| 273 close (audio_fd); | |
| 274 } | |
| 275 | |
| 613 | 276 EMACS_SIGNAL (SIGHUP, sighup_handler); |
| 277 EMACS_SIGNAL (SIGINT, sigint_handler); | |
| 442 | 278 |
| 279 return result; | |
| 428 | 280 } |
| 281 | |
| 282 /* #### sigcontext doesn't exist in Solaris. This should be updated | |
| 283 to be correct for Solaris. */ | |
| 442 | 284 static SIGTYPE |
| 428 | 285 sighandler (int sig) |
| 286 { | |
| 287 if (audio_fd > 0) | |
| 288 { | |
| 289 reset_device (0); | |
| 290 close (audio_fd); | |
| 291 } | |
| 292 if (sig == SIGHUP && sighup_handler) | |
| 293 sighup_handler (sig); | |
| 294 else if (sig == SIGINT && sigint_handler) | |
| 295 sigint_handler (sig); | |
| 296 else | |
| 297 exit (1); | |
| 298 } |