Mercurial > hg > xemacs-beta
annotate src/ntplay.c @ 5038:9410323e4b0d
major dynarr fixes
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-20 Ben Wing <ben@xemacs.org>
* device-x.c (Fx_get_resource):
* dynarr.c:
* dynarr.c (Dynarr_realloc):
* dynarr.c (Dynarr_newf):
* dynarr.c (Dynarr_lisp_realloc):
* dynarr.c (Dynarr_lisp_newf):
* dynarr.c (Dynarr_resize):
* dynarr.c (Dynarr_insert_many):
* dynarr.c (Dynarr_delete_many):
* dynarr.c (Dynarr_memory_usage):
* dynarr.c (stack_like_free):
* file-coding.c (coding_reader):
* file-coding.c (gzip_convert):
* gutter.c (output_gutter):
* lisp.h:
* lisp.h (Dynarr_declare):
* lisp.h (DYNARR_SET_LISP_IMP):
* lisp.h (CHECK_NATNUM):
* profile.c (create_timing_profile_table):
* redisplay-output.c (sync_rune_structs):
* redisplay-output.c (sync_display_line_structs):
* redisplay-output.c (redisplay_output_window):
* redisplay.c:
* redisplay.c (get_display_block_from_line):
* redisplay.c (add_ichar_rune_1):
* redisplay.c (ensure_modeline_generated):
* redisplay.c (generate_displayable_area):
* redisplay.c (regenerate_window):
* redisplay.c (update_line_start_cache):
* signal.c:
* signal.c (check_quit):
Lots of rewriting of dynarr code.
(1) Lots of documentation added. Also fix places that
referenced a now-bogus internals node concerning redisplay
critical sections.
(2) Rename:
Dynarr_add_lisp_string -> Dynarr_add_ext_lisp_string
Dynarr_set_length -> Dynarr_set_lengthr ("restricted")
Dynarr_increment -> Dynarr_incrementr
Dynarr_resize_if -> Dynarr_resize_to_add
(3) New functions:
Dynarr_elsize = dy->elsize_
Dynarr_set_length(): Set length, resizing as necessary
Dynarr_set_length_and_zero(): Set length, resizing as necessary,
zeroing out new elements
Dynarr_increase_length(), Dynarr_increase_length_and_zero():
Optimization of Dynarr_set_length(), Dynarr_set_length_and_zero()
when size is known to increase
Dynarr_resize_to_fit(): Resize as necessary to fit a given length.
Dynarr_set(): Set element at a given position, increasing length
as necessary and setting any newly created positions to 0
(4) Use Elemcount, Bytecount.
(5) Rewrite many macros as inline functions.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sat, 20 Feb 2010 03:46:22 -0600 |
| parents | 3c3c1d139863 |
| children | 308d34e9f07d |
| 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 | |
| 7 XEmacs is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 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 | |
| 18 along with XEmacs; see the file COPYING. If not, write to the Free | |
| 19 Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
| 20 02111-1307, USA.*/ | |
| 21 | |
| 563 | 22 /* Synched up with: Not in FSF. */ |
| 23 | |
| 24 /* This file Mule-ized by Ben Wing, 5-15-01. */ | |
| 25 | |
| 428 | 26 #include <config.h> |
| 27 #include "lisp.h" | |
| 28 | |
| 563 | 29 #include "sound.h" |
| 771 | 30 #include "syswindows.h" |
| 563 | 31 |
| 32 #include "sysfile.h" | |
| 442 | 33 |
| 2367 | 34 static int play_sound_data_1 (Binbyte *data, int length, |
| 563 | 35 int volume, int convert); |
| 428 | 36 |
| 563 | 37 void |
| 2526 | 38 nt_play_sound_file (Lisp_Object path, int UNUSED (volume)) |
| 428 | 39 { |
| 40 DWORD flags = SND_ASYNC | SND_NODEFAULT | SND_FILENAME; | |
| 2526 | 41 Lisp_Object fname = Ffile_name_nondirectory (path); |
| 563 | 42 Extbyte *fnameext; |
| 428 | 43 |
|
4981
4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
Ben Wing <ben@xemacs.org>
parents:
2526
diff
changeset
|
44 fnameext = LISP_STRING_TO_TSTR (fname); |
| 563 | 45 |
| 771 | 46 if (qxeSearchPath (NULL, fnameext, NULL, 0, NULL, NULL) == 0) |
| 428 | 47 { |
| 48 /* file isn't in the path so read it as data */ | |
| 49 int size; | |
| 2367 | 50 Binbyte *data; |
| 2526 | 51 int ofd = qxe_open (XSTRING_DATA (path), O_RDONLY | OPEN_BINARY, 0); |
| 428 | 52 |
| 2526 | 53 if (ofd < 0) |
| 428 | 54 return; |
| 55 | |
| 56 size = lseek (ofd, 0, SEEK_END); | |
| 2367 | 57 data = xnew_binbytes (size); |
| 428 | 58 lseek (ofd, 0, SEEK_SET); |
| 59 | |
| 60 if (!data) | |
| 61 { | |
| 771 | 62 retry_close (ofd); |
| 428 | 63 return; |
| 64 } | |
| 65 | |
| 771 | 66 if (retry_read (ofd, data, size) != size) |
| 428 | 67 { |
| 771 | 68 retry_close (ofd); |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
2526
diff
changeset
|
69 xfree (data); |
| 428 | 70 return; |
| 71 } | |
| 771 | 72 retry_close (ofd); |
| 428 | 73 |
| 74 play_sound_data_1 (data, size, 100, FALSE); | |
| 75 } | |
| 76 else | |
| 771 | 77 qxePlaySound (fnameext, NULL, flags); |
| 428 | 78 } |
| 79 | |
| 80 /* mswindows can't cope with playing a sound from alloca space so we | |
| 81 have to convert if necessary */ | |
| 563 | 82 static int |
| 2367 | 83 play_sound_data_1 (Binbyte *data, int length, int UNUSED (volume), |
| 563 | 84 int convert_to_malloc) |
| 428 | 85 { |
| 86 DWORD flags = SND_ASYNC | SND_MEMORY | SND_NODEFAULT; | |
| 2367 | 87 static Binbyte *sound_data = 0; |
| 428 | 88 if (sound_data) |
| 89 { | |
| 771 | 90 qxePlaySound (NULL, NULL, flags); |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
2526
diff
changeset
|
91 xfree (sound_data); |
| 593 | 92 sound_data = 0; |
| 428 | 93 } |
| 94 | |
| 95 if (convert_to_malloc) | |
| 96 { | |
| 2367 | 97 sound_data = xnew_binbytes (length); |
| 428 | 98 memcpy (sound_data, data, length); |
| 99 } | |
| 100 else | |
| 101 sound_data = data; | |
| 102 | |
| 771 | 103 qxePlaySound ((Extbyte *) sound_data, NULL, flags); |
| 428 | 104 |
| 442 | 105 /* #### Error handling? */ |
| 106 return 1; | |
| 428 | 107 } |
| 108 | |
| 563 | 109 int |
| 2367 | 110 play_sound_data (Binbyte *data, int length, int volume) |
| 428 | 111 { |
| 442 | 112 return play_sound_data_1 (data, length, volume, TRUE); |
| 428 | 113 } |