Mercurial > hg > xemacs-beta
annotate src/ntplay.c @ 5882:bbe4146603db
Reduce regexp usage, now CL-oriented non-regexp code available, core Lisp
lisp/ChangeLog addition:
2015-04-01 Aidan Kehoe <kehoea@parhasard.net>
When calling #'string-match with a REGEXP without regular
expression special characters, call #'search, #'mismatch, #'find,
etc. instead, making our code less likely to side-effect other
functions' match data and a little faster.
* apropos.el (apropos-command):
* apropos.el (apropos):
Call (position ?\n ...) rather than (string-match "\n" ...) here.
* buff-menu.el:
* buff-menu.el (buffers-menu-omit-invisible-buffers):
Don't fire up the regexp engine just to check if a string starts
with a space.
* buff-menu.el (select-buffers-tab-buffers-by-mode):
Don't fire up the regexp engine just to compare mode basenames.
* buff-menu.el (format-buffers-tab-line):
* buff-menu.el (build-buffers-tab-internal): Moved to being a
label within the following.
* buff-menu.el (buffers-tab-items): Use the label.
* bytecomp.el (byte-compile-log-1):
Don't fire up the regexp engine just to look for a newline.
* cus-edit.el (get):
Ditto.
* cus-edit.el (custom-variable-value-create):
Ditto, but for a colon.
* descr-text.el (describe-text-sexp):
Ditto.
* descr-text.el (describe-char-unicode-data):
Use #'split-string-by-char given that we're just looking for a
semicolon.
* descr-text.el (describe-char):
Don't fire up the regexp engine just to look for a newline.
* disass.el (disassemble-internal):
Ditto.
* files.el (file-name-sans-extension):
Implement this using #'position.
* files.el (file-name-extension):
Correct this function's docstring, implement it in terms of
#'position.
* files.el (insert-directory):
Don't fire up the regexp engine to split a string by space; don't
reverse the list of switches, this is actually a longstand bug as
far as I can see.
* gnuserv.el (gnuserv-process-filter):
Use #'position here, instead of consing inside #'split-string
needlessly.
* gtk-file-dialog.el (gtk-file-dialog-update-dropdown):
Use #'split-string-by-char here, don't fire up #'split-string for
directory-sep-char.
* gtk-font-menu.el (hack-font-truename):
Implement this more cheaply in terms of #'find,
#'split-string-by-char, #'equal, rather than #'string-match,
#'split-string, #'string-equal.
* hyper-apropos.el (hyper-apropos-grok-functions):
* hyper-apropos.el (hyper-apropos-grok-variables):
Look for a newline using #'position rather than #'string-match in
these functions.
* info.el (Info-insert-dir):
* info.el (Info-insert-file-contents):
* info.el (Info-follow-reference):
* info.el (Info-extract-menu-node-name):
* info.el (Info-menu):
Look for fixed strings using #'position or #'search as appropriate
in this file.
* ldap.el (ldap-decode-string):
* ldap.el (ldap-encode-string):
#'encode-coding-string, #'decode-coding-string are always
available, don't check if they're fboundp.
* ldap.el (ldap-decode-address):
* ldap.el (ldap-encode-address):
Use #'split-string-by-char in these functions.
* lisp-mnt.el (lm-creation-date):
* lisp-mnt.el (lm-last-modified-date):
Don't fire up the regexp engine just to look for spaces in this file.
* menubar-items.el (default-menubar):
Use (not (mismatch ...)) rather than #'string-match here, for
simple regexp.
Use (search "beta" ...) rather than (string-match "beta" ...)
* menubar-items.el (sort-buffers-menu-alphabetically):
* menubar-items.el (sort-buffers-menu-by-mode-then-alphabetically):
* menubar-items.el (group-buffers-menu-by-mode-then-alphabetically):
Don't fire up the regexp engine to check if a string starts with
a space or an asterisk.
Use the more fine-grained results of #'compare-strings; compare
case-insensitively for the buffer menu.
* menubar-items.el (list-all-buffers):
* menubar-items.el (tutorials-menu-filter):
Use #'equal rather than #'string-equal, which, in this context,
has the drawback of not having a bytecode, and no redeeming
features.
* minibuf.el:
* minibuf.el (un-substitute-in-file-name):
Use #'count, rather than counting the occurences of $ using the
regexp engine.
* minibuf.el (read-file-name-internal-1):
Don't fire up the regexp engine to search for ?=.
* mouse.el (mouse-eval-sexp):
Check for newline with #'find.
* msw-font-menu.el (mswindows-reset-device-font-menus):
Split a string by newline with #'split-string-by-char.
* mule/japanese.el:
* mule/japanese.el ("Japanese"):
Use #'search rather than #'string-match; canoncase before
comparing; fix a bug I had introduced where I had been making case
insensitive comparisons where the case mattered.
* mule/korea-util.el (default-korean-keyboard):
Look for ?3 using #'find, not #'string-march.
* mule/korea-util.el (quail-hangul-switch-hanja):
Search for a fixed string using #'search.
* mule/mule-cmds.el (set-locale-for-language-environment):
#'position, #'substitute rather than #'string-match,
#'replace-in-string.
* newcomment.el (comment-make-extra-lines):
Use #'search rather than #'string-match for a simple string.
* package-get.el (package-get-remote-filename):
Use #'position when looking for ?@
* process.el (setenv):
* process.el (read-envvar-name):
Use #'position when looking for ?=.
* replace.el (map-query-replace-regexp):
Use #'split-string-by-char instead of using an inline
implementation of it.
* select.el (select-convert-from-cf-text):
* select.el (select-convert-from-cf-unicodetext):
Use #'position rather than #'string-match in these functions.
* setup-paths.el (paths-emacs-data-root-p):
Use #'search when looking for simple string.
* sound.el (load-sound-file):
Use #'split-string-by-char rather than an inline reimplementation
of same.
* startup.el (splash-screen-window-body):
* startup.el (splash-screen-tty-body):
Search for simple strings using #'search.
* version.el (emacs-version):
Ditto.
* x-font-menu.el (hack-font-truename):
Implement this more cheaply in terms of #'find,
#'split-string-by-char, #'equal, rather than #'string-match,
#'split-string, #'string-equal.
* x-font-menu.el (x-reset-device-font-menus-core):
Use #'split-string-by-char here.
* x-init.el (x-initialize-keyboard):
Search for a simple string using #'search.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Wed, 01 Apr 2015 14:28:20 +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 } |