Mercurial > hg > xemacs-beta
annotate src/esd.c @ 4477:e34711681f30
Don't determine whether to call general device-type code at startup,
rather decide in the device-specific code itself.
lisp/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* startup.el (command-line):
Use initial-device-type, not initial-window-system; just call
#'make-device, leave the special behaviour to be done the first
time a console type is initialised to be decided on by the
respective console code.
* x-init.el (x-app-defaults-directory): Declare that it should be
bound.
(x-define-dead-key): Have the macro take a DEVICE argument.
(x-initialize-compose): Have the function take a DEVICE argument,
and use it when checking if various keysyms are available on the
keyboard.
(x-initialize-keyboard): Have the function take a DEVICE argument,
allowing device-specific keyboard initialisation.
(make-device-early-x-entry-point-called-p): New.
(make-device-late-x-entry-point-called-p): New. Rename
pre-x-win-initted, x-win-initted.
(make-device-early-x-entry-point): Rename init-pre-x-win, take the
call to make-x-device out (it should be called from the
device-creation code, not vice-versa).
(make-device-late-x-entry-point): Rename init-post-x-win, have it
take a DEVICE argument, use that DEVICE argument when working out
what device-specific things need doing. Don't use
create-console-hook in core code.
* x-win-xfree86.el (x-win-init-xfree86): Take a DEVICE argument;
use it.
* x-win-sun.el (x-win-init-sun): Take a DEVICE argument; use it.
* mule/mule-x-init.el: Remove #'init-mule-x-win, an empty
function.
* tty-init.el (make-device-early-tty-entry-point-called-p): New.
Rename pre-tty-win-initted.
(make-device-early-tty-entry-point): New.
Rename init-pre-tty-win.
(make-frame-after-init-entry-point): New.
Rename init-post-tty-win to better reflect when it's called.
* gtk-init.el (gtk-early-lisp-options-file): New.
Move this path to a documented variable.
(gtk-command-switch-alist): Wrap the docstring to fewer than 79
columns.
(make-device-early-gtk-entry-point-called-p): New.
(make-device-late-gtk-entry-point-called-p): New.
Renamed gtk-pre-win-initted, gtk-post-win-initted to these.
(make-device-early-gtk-entry-point): New.
(make-device-late-gtk-entry-point): New.
Renamed init-pre-gtk-win, init-post-gtk-win to these.
Have make-device-late-gtk-entry-point take a device argument, and use
it; have make-device-early-gtk-entry-point load the GTK-specific
startup code, instead of doing that in C.
(init-gtk-win): Deleted, functionality moved to the GTK device
creation code.
(gtk-define-dead-key): Have it take a DEVICE argument; use this
argument.
(gtk-initialize-compose): Ditto.
* coding.el (set-terminal-coding-system):
Correct the docstring; the function isn't broken.
src/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* redisplay.c (Vinitial_device_type): New.
(Vinitial_window_system): Removed.
Rename initial-window-system to initial-device type, making it
a stream if we're noninteractive. Update its docstring.
* device-x.c (Qmake_device_early_x_entry_point,
Qmake_device_late_x_entry_point): New.
Rename Qinit_pre_x_win, Qinit_post_x_win.
(x_init_device): Call #'make-device-early-x-entry-point earlier,
now we rely on it to find the application class and the
app-defaults directory.
(x_finish_init_device): Call #'make-device-late-x-entry-point with
the created device.
(Vx_app_defaults_directory): Always make this available, to
simplify code in x-init.el.
* device-tty.c (Qmake_device_early_tty_entry_point): New.
Rename Qinit_pre_tty_win, rename Qinit_post_tty_win and move to
frame-tty.c as Qmake_frame_after_init_entry_point.
(tty_init_device): Call #'make-device-early-tty-entry-point before
doing anything.
* frame-tty.c (Qmake_frame_after_init_entry_point): New.
* frame-tty.c (tty_after_init_frame): Have it call the
better-named #'make-frame-after-init-entry-point function
instead of #'init-post-tty-win (since it's called after frame, not
device, creation).
* device-msw.c (Qmake_device_early_mswindows_entry_point,
Qmake_device_late_mswindows_entry_point): New.
Rename Qinit_pre_mswindows_win, Qinit_post_mswindows_win.
(mswindows_init_device): Call
#'make-device-early-mswindows-entry-point here, instead of having
its predecessor call us.
(mswindows_finish_init_device): Call
#'make-device-early-mswindows-entry-point, for symmetry with the
other device types (though it's an empty function).
* device-gtk.c (Qmake_device_early_gtk_entry_point,
Qmake_device_late_gtk_entry_point): New.
Rename Qinit_pre_gtk_win, Qinit_post_gtk_win.
(gtk_init_device): Call #'make-device-early-gtk-entry-point; don't
load ~/.xemacs/gtk-options.el ourselves, leave that to lisp.
(gtk_finish_init_device): Call #'make-device-late-gtk-entry-point
with the created device as an argument.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Wed, 09 Jul 2008 20:46:22 +0200 |
| parents | ecf1ebac70d8 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 398 | 1 /* esd.c - play a sound over ESD |
| 2 | |
| 3 This file is part of XEmacs. | |
| 4 | |
| 5 XEmacs is free software; you can redistribute it and/or modify it | |
| 6 under the terms of the GNU General Public License as published by the | |
| 7 Free Software Foundation; either version 2, or (at your option) any | |
| 8 later version. | |
| 9 | |
| 10 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 11 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 12 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 13 for more details. | |
| 14 | |
| 15 You should have received a copy of the GNU General Public License | |
| 16 along with XEmacs; see the file COPYING. If not, write to | |
| 17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 18 Boston, MA 02111-1307, USA. */ | |
| 19 | |
| 20 /* Synched up with: Not in FSF. */ | |
| 21 | |
| 563 | 22 /* This file Mule-ized by Ben Wing, 5-15-01. */ |
| 23 | |
| 398 | 24 #include <config.h> |
| 563 | 25 #include "lisp.h" |
| 398 | 26 |
| 27 #include "miscplay.h" | |
| 563 | 28 #include "sound.h" |
| 29 | |
| 30 #include "sysfile.h" | |
| 398 | 31 |
| 32 #include <esd.h> | |
| 33 | |
| 34 | |
| 35 /* the name given to ESD - I think this should identify ourselves */ | |
| 36 #define ESD_NAME "xemacs" | |
| 37 | |
| 563 | 38 int esd_play_sound_file (Extbyte *file, int vol); |
| 609 | 39 int |
| 2286 | 40 esd_play_sound_file (Extbyte *file, int UNUSED (vol)) |
| 398 | 41 { /* #### FIXME: vol is ignored */ |
| 42 return esd_play_file(ESD_NAME, file, 0); | |
| 43 } | |
| 44 | |
| 2367 | 45 int esd_play_sound_data (Binbyte *data, size_t length, int vol); |
| 609 | 46 int |
| 2367 | 47 esd_play_sound_data (Binbyte *data, size_t length, int UNUSED (vol)) |
| 398 | 48 { /* #### FIXME: vol is ignored */ |
| 49 size_t (*parsesndfile)(void **dayta,size_t *sz,void **outbuf); | |
| 50 size_t (*sndcnv)(void **dayta,size_t *sz,void **); | |
| 51 fmtType ffmt; | |
| 52 int fmt,speed,tracks; | |
| 53 unsigned char *pptr,*optr,*cptr,*sptr; | |
| 1261 | 54 Bytecount wrtn, crtn; |
| 398 | 55 size_t prtn; |
| 56 int flags, sock; | |
| 57 | |
| 58 /* analyze_format needs at least this many bytes to work with */ | |
| 59 if (length < HEADERSZ) | |
| 60 return 0; | |
| 61 | |
| 62 ffmt = analyze_format(data,&fmt,&speed,&tracks,&parsesndfile); | |
| 63 | |
| 64 if (ffmt != fmtRaw && ffmt != fmtSunAudio && ffmt != fmtWave) { | |
| 564 | 65 sound_warn("Unsupported file format (neither RAW, nor Sun/DECAudio, nor WAVE)"); |
| 398 | 66 return 0; |
| 67 } | |
| 68 | |
| 69 /* convert header information into ESD flags */ | |
| 70 flags = ESD_STREAM|ESD_PLAY; | |
| 71 sndcnv = sndcnvnop; | |
| 72 switch (fmt) | |
| 73 { | |
| 74 case AFMT_MU_LAW: | |
| 75 sndcnv = sndcnvULaw_2linear; | |
| 76 flags |= ESD_BITS8; | |
| 77 break; | |
| 78 case AFMT_S8: | |
| 79 sndcnv = sndcnv2unsigned; /* ESD needs unsigned bytes */ | |
| 80 case AFMT_U8: | |
| 81 flags |= ESD_BITS8; | |
| 82 break; | |
| 83 case AFMT_S16_BE: | |
| 84 sndcnv = sndcnv16swap; /* ESD wants little endian */ | |
| 85 case AFMT_S16_LE: | |
| 86 flags |= ESD_BITS16; | |
| 87 break; | |
| 88 default: | |
| 564 | 89 { |
| 90 Extbyte warn_buf[255]; | |
| 91 sprintf (warn_buf, "byte format %d unimplemented", fmt); | |
| 92 sound_warn (warn_buf); | |
| 93 return 0; | |
| 94 } | |
| 398 | 95 } |
| 96 switch (tracks) | |
| 97 { | |
| 98 case 1: flags |= ESD_MONO; break; | |
| 99 case 2: flags |= ESD_STEREO; break; | |
| 100 default: | |
| 564 | 101 { |
| 102 Extbyte warn_buf[255]; | |
| 103 sprintf (warn_buf, "%d channels - only 1 or 2 supported", tracks); | |
| 104 sound_warn (warn_buf); | |
| 105 return 0; | |
| 106 } | |
| 398 | 107 } |
| 108 | |
| 109 sock = esd_play_stream(flags, speed, NULL, "xemacs"); | |
| 110 if (sock < 0) | |
| 111 return 0; | |
| 112 | |
| 113 reset_parsestate(); | |
| 114 | |
| 115 for (pptr = data; (prtn = parsesndfile((void **)&pptr,&length, | |
| 116 (void **)&optr)) > 0; ) | |
| 117 for (cptr = optr; (crtn = sndcnv((void **)&cptr,&prtn, | |
| 1261 | 118 (void **)&sptr)) > 0; ) |
| 119 { | |
| 120 if ((wrtn = write(sock,sptr,crtn)) < 0) | |
| 121 { | |
| 122 sound_perror ("write error"); | |
| 123 goto END_OF_PLAY; | |
| 124 } | |
| 125 if (wrtn != crtn) | |
| 126 { | |
| 127 Extbyte warn_buf[255]; | |
| 128 sprintf (warn_buf, "only wrote %ld of %ld bytes", wrtn, crtn); | |
| 129 sound_warn (warn_buf); | |
| 130 goto END_OF_PLAY; | |
| 131 } | |
| 398 | 132 } |
| 133 | |
| 134 if (ffmt == fmtWave) | |
| 135 parse_wave_complete(); | |
| 136 | |
| 137 END_OF_PLAY: | |
| 138 /* Now cleanup all used resources */ | |
| 139 | |
| 140 close(sock); | |
| 141 return 1; | |
| 142 } |