Mercurial > hg > xemacs-beta
annotate src/ntplay.c @ 5652:cc6f0266bc36
Avoid #'delq in core Lisp, for the sake of style, a very slightly smaller binary
lisp/ChangeLog addition:
2012-05-01 Aidan Kehoe <kehoea@parhasard.net>
Avoid #'delq in core code, for the sake of style and a (very
slightly) smaller binary.
* behavior.el (disable-behavior):
* behavior.el (compute-behavior-group-children):
* buff-menu.el (buffers-tab-items):
* byte-optimize.el (byte-optimize-delay-constants-math):
* byte-optimize.el (byte-optimize-logmumble):
* byte-optimize.el (byte-decompile-bytecode-1):
* byte-optimize.el (byte-optimize-lapcode):
* bytecomp.el:
* bytecomp.el (byte-compile-arglist-warn):
* bytecomp.el (byte-compile-warn-about-unresolved-functions):
* bytecomp.el (byte-compile-lambda):
* bytecomp.el (byte-compile-out-toplevel):
* bytecomp.el (byte-compile-insert):
* bytecomp.el (byte-compile-defalias-warn):
* cl-macs.el (cl-upcase-arg):
* cl-macs.el (cl-transform-lambda):
* cl-macs.el (cl-do-proclaim):
* cl-macs.el (defstruct):
* cl-macs.el (cl-make-type-test):
* cl-macs.el (define-compiler-macro):
* cl-macs.el (delete-duplicates):
* cus-edit.el (widget-face-value-delete):
* cus-edit.el (face-history):
* easymenu.el (easy-menu-remove):
* files.el (files-fetch-hook-value):
* files.el (file-expand-wildcards):
* font-lock.el (font-lock-update-removed-keyword-alist):
* font-lock.el (font-lock-remove-keywords):
* frame.el (frame-initialize):
* frame.el (frame-notice-user-settings):
* frame.el (set-frame-font):
* frame.el (delete-other-frames):
* frame.el (get-frame-for-buffer-noselect):
* gnuserv.el (gnuserv-kill-buffer-function):
* gnuserv.el (gnuserv-check-device):
* gnuserv.el (gnuserv-kill-client):
* gnuserv.el (gnuserv-buffer-done-1):
* gtk-font-menu.el (gtk-reset-device-font-menus):
* gutter-items.el (buffers-tab-items):
* gutter.el (set-gutter-element-visible-p):
* info.el (Info-find-file-node):
* info.el (Info-history-add):
* info.el (Info-build-annotation-completions):
* info.el (Info-index):
* info.el (Info-reannotate-node):
* itimer.el (delete-itimer):
* itimer.el (start-itimer):
* lib-complete.el (lib-complete:cache-completions):
* loadhist.el (unload-feature):
* menubar-items.el (build-buffers-menu-internal):
* menubar.el (delete-menu-item):
* menubar.el (relabel-menu-item):
* msw-font-menu.el (mswindows-reset-device-font-menus):
* mule/make-coding-system.el (fixed-width-generate-helper):
* next-error.el (next-error-find-buffer):
* obsolete.el:
* obsolete.el (find-non-ascii-charset-string):
* obsolete.el (find-non-ascii-charset-region):
* occur.el (multi-occur-by-filename-regexp):
* occur.el (occur-1):
* packages.el (packages-package-hierarchy-directory-names):
* packages.el (package-get-key-1):
* process.el (setenv):
* simple.el (undo):
* simple.el (handle-pre-motion-command-current-command-is-motion):
* sound.el (load-sound-file):
* wid-edit.el (widget-field-value-delete):
* wid-edit.el (widget-checklist-match-inline):
* wid-edit.el (widget-checklist-match-find):
* wid-edit.el (widget-editable-list-delete-at):
* wid-edit.el (widget-editable-list-entry-create):
* window.el (quit-window):
* x-font-menu.el (x-reset-device-font-menus-core):
1. Replace (delq nil (mapcar ....)) with analogous (mapcan ...)
forms; this is in non-dumped files, it was done previously in
dumped files.
2. Replace (delq FOO (copy-sequence BAR)) with (remove* FOO BAR),
where #'eq and #'eql are equivalent
3. Replace (delq FOO BAR) with (delete* FOO BAR), where FOO is not
a non-fixnum number. Saves a little space in the dumped file
(since the compiler macro adds :test #'eq to the delete* call if
it's not clear that FOO is not a non-fixnum number).
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Tue, 01 May 2012 16:17:42 +0100 |
| parents | 308d34e9f07d |
| children |
| rev | line source |
|---|---|
| 428 | 1 /* Sound in windows nt XEmacs. |
| 2 Copyright (C) 1998 Andy Piper. | |
| 771 | 3 Copyright (C) 2001 Ben Wing. |
| 428 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4982
diff
changeset
|
7 XEmacs is free software: you can redistribute it and/or modify it |
| 428 | 8 under the terms of the GNU General Public License as published by the |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4982
diff
changeset
|
9 Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4982
diff
changeset
|
10 option) any later version. |
| 428 | 11 |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4982
diff
changeset
|
18 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 428 | 19 |
| 563 | 20 /* Synched up with: Not in FSF. */ |
| 21 | |
| 22 /* This file Mule-ized by Ben Wing, 5-15-01. */ | |
| 23 | |
| 428 | 24 #include <config.h> |
| 25 #include "lisp.h" | |
| 26 | |
| 563 | 27 #include "sound.h" |
| 771 | 28 #include "syswindows.h" |
| 563 | 29 |
| 30 #include "sysfile.h" | |
| 442 | 31 |
| 2367 | 32 static int play_sound_data_1 (Binbyte *data, int length, |
| 563 | 33 int volume, int convert); |
| 428 | 34 |
| 563 | 35 void |
| 2526 | 36 nt_play_sound_file (Lisp_Object path, int UNUSED (volume)) |
| 428 | 37 { |
| 38 DWORD flags = SND_ASYNC | SND_NODEFAULT | SND_FILENAME; | |
| 2526 | 39 Lisp_Object fname = Ffile_name_nondirectory (path); |
| 563 | 40 Extbyte *fnameext; |
| 428 | 41 |
|
4981
4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
Ben Wing <ben@xemacs.org>
parents:
2526
diff
changeset
|
42 fnameext = LISP_STRING_TO_TSTR (fname); |
| 563 | 43 |
| 771 | 44 if (qxeSearchPath (NULL, fnameext, NULL, 0, NULL, NULL) == 0) |
| 428 | 45 { |
| 46 /* file isn't in the path so read it as data */ | |
| 47 int size; | |
| 2367 | 48 Binbyte *data; |
| 2526 | 49 int ofd = qxe_open (XSTRING_DATA (path), O_RDONLY | OPEN_BINARY, 0); |
| 428 | 50 |
| 2526 | 51 if (ofd < 0) |
| 428 | 52 return; |
| 53 | |
| 54 size = lseek (ofd, 0, SEEK_END); | |
| 2367 | 55 data = xnew_binbytes (size); |
| 428 | 56 lseek (ofd, 0, SEEK_SET); |
| 57 | |
| 58 if (!data) | |
| 59 { | |
| 771 | 60 retry_close (ofd); |
| 428 | 61 return; |
| 62 } | |
| 63 | |
| 771 | 64 if (retry_read (ofd, data, size) != size) |
| 428 | 65 { |
| 771 | 66 retry_close (ofd); |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
2526
diff
changeset
|
67 xfree (data); |
| 428 | 68 return; |
| 69 } | |
| 771 | 70 retry_close (ofd); |
| 428 | 71 |
| 72 play_sound_data_1 (data, size, 100, FALSE); | |
| 73 } | |
| 74 else | |
| 771 | 75 qxePlaySound (fnameext, NULL, flags); |
| 428 | 76 } |
| 77 | |
| 78 /* mswindows can't cope with playing a sound from alloca space so we | |
| 79 have to convert if necessary */ | |
| 563 | 80 static int |
| 2367 | 81 play_sound_data_1 (Binbyte *data, int length, int UNUSED (volume), |
| 563 | 82 int convert_to_malloc) |
| 428 | 83 { |
| 84 DWORD flags = SND_ASYNC | SND_MEMORY | SND_NODEFAULT; | |
| 2367 | 85 static Binbyte *sound_data = 0; |
| 428 | 86 if (sound_data) |
| 87 { | |
| 771 | 88 qxePlaySound (NULL, NULL, flags); |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
2526
diff
changeset
|
89 xfree (sound_data); |
| 593 | 90 sound_data = 0; |
| 428 | 91 } |
| 92 | |
| 93 if (convert_to_malloc) | |
| 94 { | |
| 2367 | 95 sound_data = xnew_binbytes (length); |
| 428 | 96 memcpy (sound_data, data, length); |
| 97 } | |
| 98 else | |
| 99 sound_data = data; | |
| 100 | |
| 771 | 101 qxePlaySound ((Extbyte *) sound_data, NULL, flags); |
| 428 | 102 |
| 442 | 103 /* #### Error handling? */ |
| 104 return 1; | |
| 428 | 105 } |
| 106 | |
| 563 | 107 int |
| 2367 | 108 play_sound_data (Binbyte *data, int length, int volume) |
| 428 | 109 { |
| 442 | 110 return play_sound_data_1 (data, length, volume, TRUE); |
| 428 | 111 } |