Mercurial > hg > xemacs-beta
diff src/ntplay.c @ 593:5fd7ba8b56e7
[xemacs-hg @ 2001-05-31 12:45:27 by ben]
xemacs-faq.texi: Major rewrite.
Update all MS Windows info to current.
Redo section 6.1 almost completely.
Incorporate sections 1 and 2 of Hrvoje's FAQ.
etags.el: Fix infloop when going up to the root.
s\cygwin32.h: Don't unilaterally include ntplay, but only when we're compiling
with native sound (look in configure now).
event-msw.c: Fix yet more problems with C-g handling.
Implement debug-mswindows-events.
event-stream.c, events.h, signal.c, sysdep.h:
Rearrange the signal-handling code to eliminate the former
spaghetti logic paths in it. Document clearly what
"low-level" and "high-level" timeouts are. Rename some
functions with unclear names (e.g. "...alarm...") to names
that reflect what they actually do (e.g. "...async_timeout...").
Fix numerous bugs discovered in the process.
console-x.h, event-Xt.c, event-msw.c, frame-x.c:
Hopefully make XEmacs properly maintain the "iconified"
state on frames at all times. This should fix the "can't
delete a frame with C-x 5 0 when there's another iconified
frame out there" bug.
Put a notice in of further changes that should probably
be made to clean up the frame-visibility support.
(especially directed at Jan Vroonhof)
lisp.h, miscplay.c:
Rename SBufbyte to CBufbyte to avoid a misleading name.
Eliminate UChar, which is not used anywhere and contributes
no semantic info. Add a comment about the documentation-only
properties of the char/unsigned char typedefs. Add
SChar_Binary as an explicitly `signed' version of Char_Binary
and put back the `signed' declarations in miscplay.c.
alloc.c:
Use char typedefs.
console-msw.c, device-msw.c, dialog-msw.c, editfns.c, fileio.c, glyphs-eimage.c, menubar-msw.c, ntplay.c, objects-msw.c, realpath.c, redisplay-msw.c, select-msw.c, syswindows.h, win32.c:
Eliminate numerous C++ errors.
frame-msw.c:
Eliminate numerous C++ errors and Mule-ize.
glyphs-msw.c:
Eliminate numerous C++ errors and use char typedefs.
configure.in:
Fix problems detecting both native and Linux sound on Cygwin
when compiled with --with-msw=no.
Rearrange file-coding handling a bit to avoid warning when
compiling with Mule.
configure.in, configure.usage, INSTALL:
Document XEMACS_CC and corresponding compiler option --xemacs-compiler.
Explain how to build xemacs using a C++ compiler.
author | ben |
---|---|
date | Thu, 31 May 2001 12:45:41 +0000 |
parents | 183866b06e0b |
children | 943eaba38521 |
line wrap: on
line diff
--- a/src/ntplay.c Thu May 31 12:03:39 2001 +0000 +++ b/src/ntplay.c Thu May 31 12:45:41 2001 +0000 @@ -22,6 +22,8 @@ /* This file Mule-ized by Ben Wing, 5-15-01. */ +#define DONT_ENCAPSULATE + #include <config.h> #include "lisp.h" @@ -49,14 +51,14 @@ { /* file isn't in the path so read it as data */ int size; - UChar_Binary* data; + UChar_Binary *data; int ofd = open (sound_file, O_RDONLY | OPEN_BINARY, 0); if (ofd <0) return; size = lseek (ofd, 0, SEEK_END); - data = (UChar_Binary *)xmalloc (size); + data = (UChar_Binary *) xmalloc (size); lseek (ofd, 0, SEEK_SET); if (!data) @@ -86,23 +88,23 @@ int convert_to_malloc) { DWORD flags = SND_ASYNC | SND_MEMORY | SND_NODEFAULT; - static UChar_Binary* sound_data=0; + static UChar_Binary *sound_data = 0; if (sound_data) { PlaySound (NULL, NULL, flags); xfree (sound_data); - sound_data=0; + sound_data = 0; } if (convert_to_malloc) { - sound_data = (UChar_Binary *)xmalloc (length); + sound_data = (UChar_Binary *) xmalloc (length); memcpy (sound_data, data, length); } else sound_data = data; - PlaySound(sound_data, NULL, flags); + PlaySound ((Extbyte *) sound_data, NULL, flags); /* #### Error handling? */ return 1;