Mercurial > hg > xemacs-beta
view src/ntplay.c @ 4686:cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
lisp/ChangeLog addition:
2009-08-31 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-form-code-walker):
Be careful about discarding multiple values when optimising
#'prog1 calls.
(byte-optimize-or):
Preserve any trailing nil, as this is a supported way to
explicitly discard multiple values.
(byte-optimize-cond-1):
Discard multiple values with a singleton followed by no more
clauses.
* bytecomp.el (progn):
(prog1):
(prog2):
Be careful about discarding multiple values in the byte-hunk
handler of these three forms.
* bytecomp.el (byte-compile-prog1, byte-compile-prog2):
Don't call #'values explicitly, use `(or ,(pop form) nil) instead,
since that compiles to bytecode, not a funcall.
* bytecomp.el (byte-compile-values):
With one non-const argument, byte-compile to `(or ,(second form)
nil), not an explicit #'values call.
* bytecomp.el (byte-compile-insert-header):
Be nicer in the error message to emacs versions that don't
understand our bytecode.
src/ChangeLog addition:
2009-08-31 Aidan Kehoe <kehoea@parhasard.net>
* eval.c (For, Fand):
Don't declare val as REGISTER in these functions, for some reason
it breaks the non-DEBUG union build. These functions are only
called from interpreted code, the performance implication doesn't
matter. Thank you Robert Delius Royar!
* eval.c (Fmultiple_value_list_internal):
Error on too many arguments.
tests/ChangeLog addition:
2009-08-31 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el (Assert-rounding):
Remove an overly-verbose failure message here.
Correct a couple of tests which were buggy in themselves. Add
three new tests, checking the behaviour of #'or and #'and when
passed zero arguments, and a Known-Bug-Expect-Failure call
involving letf and values. (The bug predates the C-level
multiple-value implementation.)
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 06 Sep 2009 19:36:02 +0100 |
parents | 902d5bd9b75c |
children | 16112448d484 4aebb0131297 |
line wrap: on
line source
/* Sound in windows nt XEmacs. Copyright (C) 1998 Andy Piper. Copyright (C) 2001 Ben Wing. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.*/ /* Synched up with: Not in FSF. */ /* This file Mule-ized by Ben Wing, 5-15-01. */ #include <config.h> #include "lisp.h" #include "sound.h" #include "syswindows.h" #include "sysfile.h" static int play_sound_data_1 (Binbyte *data, int length, int volume, int convert); void nt_play_sound_file (Lisp_Object path, int UNUSED (volume)) { DWORD flags = SND_ASYNC | SND_NODEFAULT | SND_FILENAME; Lisp_Object fname = Ffile_name_nondirectory (path); Extbyte *fnameext; LISP_STRING_TO_TSTR (fname, fnameext); if (qxeSearchPath (NULL, fnameext, NULL, 0, NULL, NULL) == 0) { /* file isn't in the path so read it as data */ int size; Binbyte *data; int ofd = qxe_open (XSTRING_DATA (path), O_RDONLY | OPEN_BINARY, 0); if (ofd < 0) return; size = lseek (ofd, 0, SEEK_END); data = xnew_binbytes (size); lseek (ofd, 0, SEEK_SET); if (!data) { retry_close (ofd); return; } if (retry_read (ofd, data, size) != size) { retry_close (ofd); xfree (data, Binbyte *); return; } retry_close (ofd); play_sound_data_1 (data, size, 100, FALSE); } else qxePlaySound (fnameext, NULL, flags); } /* mswindows can't cope with playing a sound from alloca space so we have to convert if necessary */ static int play_sound_data_1 (Binbyte *data, int length, int UNUSED (volume), int convert_to_malloc) { DWORD flags = SND_ASYNC | SND_MEMORY | SND_NODEFAULT; static Binbyte *sound_data = 0; if (sound_data) { qxePlaySound (NULL, NULL, flags); xfree (sound_data, Binbyte *); sound_data = 0; } if (convert_to_malloc) { sound_data = xnew_binbytes (length); memcpy (sound_data, data, length); } else sound_data = data; qxePlaySound ((Extbyte *) sound_data, NULL, flags); /* #### Error handling? */ return 1; } int play_sound_data (Binbyte *data, int length, int volume) { return play_sound_data_1 (data, length, volume, TRUE); }