comparison src/ntplay.c @ 563:183866b06e0b

[xemacs-hg @ 2001-05-24 07:50:48 by ben] Makefile.in.in, abbrev.c, alloc.c, buffer.c, bytecode.c, callint.c, callproc.c, casetab.c, chartab.c, cmdloop.c, cmds.c, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console.c, data.c, database.c, debug.c, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, dired.c, doc.c, doprnt.c, dragdrop.c, editfns.c, eldap.c, eldap.h, elhash.c, emacs-widget-accessors.c, emacs.c, emodules.c, esd.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, filelock.c, floatfns.c, fns.c, font-lock.c, frame-gtk.c, frame-x.c, frame.c, general-slots.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-gtk.c, gui-x.c, gui.c, gutter.c, hpplay.c, indent.c, input-method-xlib.c, insdel.c, intl.c, keymap.c, libsst.c, libsst.h, linuxplay.c, lisp.h, lread.c, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, miscplay.c, miscplay.h, mule-ccl.c, mule-charset.c, mule-wnnfns.c, mule.c, nas.c, ntplay.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, ralloc.c, rangetab.c, redisplay.c, scrollbar.c, search.c, select-gtk.c, select-x.c, select.c, sgiplay.c, sheap.c, sound.c, specifier.c, sunplay.c, symbols.c, symeval.h, symsinit.h, syntax.c, sysdep.c, toolbar-msw.c, toolbar.c, tooltalk.c, ui-byhand.c, ui-gtk.c, undo.c, unexaix.c, unexapollo.c, unexconvex.c, unexec.c, widget.c, win32.c, window.c: -- defsymbol -> DEFSYMBOL. -- add an error type to all errors. -- eliminate the error functions in eval.c that let you just use Qerror as the type. -- redo the error API to be more consistent, sensibly named, and easier to use. -- redo the error hierarchy somewhat. create new errors: structure-formation-error, gui-error, invalid-constant, stack-overflow, out-of-memory, process-error, network-error, sound-error, printing-unreadable-object, base64-conversion- error; coding-system-error renamed to text-conversion error; some others. -- fix Mule problems in error strings in emodules.c, tooltalk.c. -- fix error handling in mswin open-network-stream. -- Mule-ize all sound files and clean up the headers. -- nativesound.h -> sound.h and used for all sound files. -- move some shared stuff into glyphs-shared.c: first attempt at eliminating some of the massive GTK code duplication. xemacs.mak: add glyphs-shared.c. xemacs-faq.texi: document how to debug X errors subr.el: fix doc string to reflect reality
author ben
date Thu, 24 May 2001 07:51:33 +0000
parents abe6d1db359e
children 5fd7ba8b56e7
comparison
equal deleted inserted replaced
562:c775bd016b32 563:183866b06e0b
16 You should have received a copy of the GNU General Public License 16 You should have received a copy of the GNU General Public License
17 along with XEmacs; see the file COPYING. If not, write to the Free 17 along with XEmacs; see the file COPYING. If not, write to the Free
18 Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 18 Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
19 02111-1307, USA.*/ 19 02111-1307, USA.*/
20 20
21 /* Synched up with: Not in FSF. */
22
23 /* This file Mule-ized by Ben Wing, 5-15-01. */
24
21 #include <config.h> 25 #include <config.h>
22 #include "lisp.h" 26 #include "lisp.h"
23 27
28 #include "sound.h"
29 #include "nt.h"
30
24 #include "sysfile.h" 31 #include "sysfile.h"
25 #include "nt.h"
26 #include "nativesound.h"
27 32
28 static int play_sound_data_1 (unsigned char *data, int length, 33 static int play_sound_data_1 (UChar_Binary *data, int length,
29 int volume, int convert); 34 int volume, int convert);
30 35
31 void play_sound_file (char *sound_file, int volume) 36 void
37 play_sound_file (Extbyte *sound_file, int volume)
32 { 38 {
33 DWORD flags = SND_ASYNC | SND_NODEFAULT | SND_FILENAME; 39 DWORD flags = SND_ASYNC | SND_NODEFAULT | SND_FILENAME;
34 OFSTRUCT ofs; 40 OFSTRUCT ofs;
35 Lisp_Object fname = Ffile_name_nondirectory (build_string (sound_file)); 41 Lisp_Object fname =
42 Ffile_name_nondirectory (build_ext_string (sound_file, Qmswindows_tstr));
43 Extbyte *fnameext;
36 44
37 CHECK_STRING (fname); 45 CHECK_STRING (fname);
38 if (OpenFile (XSTRING_DATA (fname), &ofs, OF_EXIST) < 0) 46 LISP_STRING_TO_EXTERNAL (fname, fnameext, Qmswindows_tstr);
47
48 if (OpenFile (fnameext, &ofs, OF_EXIST) < 0)
39 { 49 {
40 /* file isn't in the path so read it as data */ 50 /* file isn't in the path so read it as data */
41 int size; 51 int size;
42 unsigned char* data; 52 UChar_Binary* data;
43 int ofd = open (sound_file, O_RDONLY | OPEN_BINARY, 0); 53 int ofd = open (sound_file, O_RDONLY | OPEN_BINARY, 0);
44 54
45 if (ofd <0) 55 if (ofd <0)
46 return; 56 return;
47 57
48 size = lseek (ofd, 0, SEEK_END); 58 size = lseek (ofd, 0, SEEK_END);
49 data = (unsigned char *)xmalloc (size); 59 data = (UChar_Binary *)xmalloc (size);
50 lseek (ofd, 0, SEEK_SET); 60 lseek (ofd, 0, SEEK_SET);
51 61
52 if (!data) 62 if (!data)
53 { 63 {
54 close (ofd); 64 close (ofd);
64 close (ofd); 74 close (ofd);
65 75
66 play_sound_data_1 (data, size, 100, FALSE); 76 play_sound_data_1 (data, size, 100, FALSE);
67 } 77 }
68 else 78 else
69 PlaySound (XSTRING_DATA (fname), NULL, flags); 79 PlaySound (fnameext, NULL, flags);
70 } 80 }
71 81
72 /* mswindows can't cope with playing a sound from alloca space so we 82 /* mswindows can't cope with playing a sound from alloca space so we
73 have to convert if necessary */ 83 have to convert if necessary */
74 static int play_sound_data_1 (unsigned char *data, int length, int volume, 84 static int
75 int convert_to_malloc) 85 play_sound_data_1 (UChar_Binary *data, int length, int volume,
86 int convert_to_malloc)
76 { 87 {
77 DWORD flags = SND_ASYNC | SND_MEMORY | SND_NODEFAULT; 88 DWORD flags = SND_ASYNC | SND_MEMORY | SND_NODEFAULT;
78 static unsigned char* sound_data=0; 89 static UChar_Binary* sound_data=0;
79 if (sound_data) 90 if (sound_data)
80 { 91 {
81 PlaySound (NULL, NULL, flags); 92 PlaySound (NULL, NULL, flags);
82 xfree (sound_data); 93 xfree (sound_data);
83 sound_data=0; 94 sound_data=0;
84 } 95 }
85 96
86 if (convert_to_malloc) 97 if (convert_to_malloc)
87 { 98 {
88 sound_data = (unsigned char *)xmalloc (length); 99 sound_data = (UChar_Binary *)xmalloc (length);
89 memcpy (sound_data, data, length); 100 memcpy (sound_data, data, length);
90 } 101 }
91 else 102 else
92 sound_data = data; 103 sound_data = data;
93 104
95 106
96 /* #### Error handling? */ 107 /* #### Error handling? */
97 return 1; 108 return 1;
98 } 109 }
99 110
100 int play_sound_data (unsigned char *data, int length, int volume) 111 int
112 play_sound_data (UChar_Binary *data, int length, int volume)
101 { 113 {
102 return play_sound_data_1 (data, length, volume, TRUE); 114 return play_sound_data_1 (data, length, volume, TRUE);
103 } 115 }