Mercurial > hg > xemacs-beta
view src/sunplay.c @ 4690:257b468bf2ca
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we need such
functionality if we're going to have a reliable and portable
#'query-coding-region implementation. However, this change doesn't yet
provide #'query-coding-region for the mswindow-multibyte coding systems,
there should be no functional differences between an XEmacs with this change
and one without it.
src/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we
need such functionality if we're going to have a reliable and
portable #'query-coding-region implementation. However, this
change doesn't yet provide #'query-coding-region for the
mswindow-multibyte coding systems, there should be no functional
differences between an XEmacs with this change and one without it.
* mule-coding.c (struct fixed_width_coding_system):
Add a new coding system type, fixed_width, and implement it. It
uses the CCL infrastructure but has a much simpler creation API,
and its own query_method, formerly in lisp/mule/mule-coding.el.
* unicode.c:
Move the Unicode query method implementation here from
unicode.el.
* lisp.h: Declare Fmake_coding_system_internal, Fcopy_range_table
here.
* intl-win32.c (complex_vars_of_intl_win32):
Use Fmake_coding_system_internal, not Fmake_coding_system.
* general-slots.h: Add Qsucceeded, Qunencodable, Qinvalid_sequence
here.
* file-coding.h (enum coding_system_variant):
Add fixed_width_coding_system here.
(struct coding_system_methods):
Add query_method and query_lstream_method to the coding system
methods.
Provide flags for the query methods.
Declare the default query method; initialise it correctly in
INITIALIZE_CODING_SYSTEM_TYPE.
* file-coding.c (default_query_method):
New function, the default query method for coding systems that do
not set it. Moved from coding.el.
(make_coding_system_1):
Accept new elements in PROPS in #'make-coding-system; aliases, a
list of aliases; safe-chars and safe-charsets (these were
previously accepted but not saved); and category.
(Fmake_coding_system_internal):
New function, what used to be #'make-coding-system--on Mule
builds, we've now moved some of the functionality of this to
Lisp.
(Fcoding_system_canonical_name_p):
Move this earlier in the file, since it's now called from within
make_coding_system_1.
(Fquery_coding_region):
Move the implementation of this here, from coding.el.
(complex_vars_of_file_coding):
Call Fmake_coding_system_internal, not Fmake_coding_system;
specify safe-charsets properties when we're a mule build.
* extents.h (mouse_highlight_priority, Fset_extent_priority,
Fset_extent_face, Fmap_extents):
Make these available to other C files.
lisp/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
* coding.el:
Consolidate code that depends on the presence or absence of Mule
at the end of this file.
(default-query-coding-region, query-coding-region):
Move these functions to C.
(default-query-coding-region-safe-charset-skip-chars-map):
Remove this variable, the corresponding C variable is
Vdefault_query_coding_region_chartab_cache in file-coding.c.
(query-coding-string): Update docstring to reflect actual multiple
values, be more careful about not modifying a range table that
we're currently mapping over.
(encode-coding-char): Make the implementation of this simpler.
(featurep 'mule): Autoload #'make-coding-system from
mule/make-coding-system.el if we're a mule build; provide an
appropriate compiler macro.
Do various non-mule compatibility things if we're not a mule
build.
* update-elc.el (additional-dump-dependencies):
Add mule/make-coding-system as a dump time dependency if we're a
mule build.
* unicode.el (ccl-encode-to-ucs-2):
(decode-char):
(encode-char):
Move these earlier in the file, for the sake of some byte compile
warnings.
(unicode-query-coding-region):
Move this to unicode.c
* mule/make-coding-system.el:
New file, not dumped. Contains the functionality to rework the
arguments necessary for fixed-width coding systems, and contains
the implementation of #'make-coding-system, which now calls
#'make-coding-system-internal.
* mule/vietnamese.el (viscii):
* mule/latin.el (iso-8859-2):
(windows-1250):
(iso-8859-3):
(iso-8859-4):
(iso-8859-14):
(iso-8859-15):
(iso-8859-16):
(iso-8859-9):
(macintosh):
(windows-1252):
* mule/hebrew.el (iso-8859-8):
* mule/greek.el (iso-8859-7):
(windows-1253):
* mule/cyrillic.el (iso-8859-5):
(koi8-r):
(koi8-u):
(windows-1251):
(alternativnyj):
(koi8-ru):
(koi8-t):
(koi8-c):
(koi8-o):
* mule/arabic.el (iso-8859-6):
(windows-1256):
Move all these coding systems to being of type fixed-width, not of
type CCL. This allows the distinct query-coding-region for them to
be in C, something which will eventually allow us to implement
query-coding-region for the mswindows-multibyte coding systems.
* mule/general-late.el (posix-charset-to-coding-system-hash):
Document why we're pre-emptively persuading the byte compiler that
the ELC for this file needs to be written using escape-quoted.
Call #'set-unicode-query-skip-chars-args, now the Unicode
query-coding-region implementation is in C.
* mule/thai-xtis.el (tis-620):
Don't bother checking whether we're XEmacs or not here.
* mule/mule-coding.el:
Move the eight bit fixed-width functionality from this file to
make-coding-system.el.
tests/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
* automated/mule-tests.el:
Check a coding system's type, not an 8-bit-fixed property, for
whether that coding system should be treated as a fixed-width
coding system.
* automated/query-coding-tests.el:
Don't test the query coding functionality for mswindows-multibyte
coding systems, it's not yet implemented.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 19 Sep 2009 22:53:13 +0100 |
parents | 3d8143fc88e1 |
children | aa5ed11f473b |
line wrap: on
line source
/* play.c - play a sound file on the speaker ** ** Copyright (C) 1989 by Jef Poskanzer. ** ** Modified 24-May-91 by Jamie Zawinski (for Lucid Emacs). ** Modified 17-Dec-92 by Jamie Zawinski (largely rewritten for SunOS 4.1.3). ** ** Permission to use, copy, modify, and distribute this software and its ** documentation for any purpose and without fee is hereby granted, provided ** that the above copyright notice appear in all copies and that both that ** copyright notice and this permission notice appear in supporting ** documentation. This software is provided "as is" without express or ** implied warranty. */ /* Synched up with: Not in FSF. */ /* This file Mule-ized by Ben Wing, 5-15-01. */ #include <config.h> #include "lisp.h" #include "sound.h" #include "sysdep.h" #include "sysfile.h" #include "syssignal.h" #include <multimedia/libaudio.h> #include <multimedia/audio_device.h> static SIGTYPE (*sighup_handler) (int sig); static SIGTYPE (*sigint_handler) (int sig); static SIGTYPE sighandler (int sig); static int audio_fd; #define audio_open() open ("/dev/audio", (O_WRONLY | O_NONBLOCK), 0) static int initialized_device_p; static int reset_volume_p, reset_device_p; static double old_volume; static Audio_hdr dev_hdr; static int init_device (int volume, Binbyte *data, int fd, unsigned int *header_length) { #ifdef SUNOS4_0_3 if (header_length) *header_length = 0; return 0; #else Audio_hdr file_hdr; reset_volume_p = 0; reset_device_p = 0; if (data && fd) ABORT (); /* one or the other */ if (AUDIO_SUCCESS != audio_get_play_config (audio_fd, &dev_hdr)) { sound_perror ("Not a valid audio device"); return 1; } if (AUDIO_SUCCESS != (data ? audio_decode_filehdr (data, &file_hdr, header_length) : audio_read_filehdr (fd, &file_hdr, 0, 0))) { if (data) sound_perror ("invalid audio data"); else sound_perror ("invalid audio file"); return 1; } audio_flush_play (audio_fd); if (!initialized_device_p || (0 != audio_cmp_hdr (&dev_hdr, &file_hdr))) { Audio_hdr new_hdr; new_hdr = file_hdr; reset_device_p = 1; initialized_device_p = 1; if (AUDIO_SUCCESS != audio_set_play_config (audio_fd, &new_hdr)) { Extbyte buf1 [100], buf2 [100], buf3 [250]; audio_enc_to_str (&file_hdr, buf1); audio_enc_to_str (&new_hdr, buf2); sprintf (buf3, "wanted %s, got %s", buf1, buf2); sound_warn (buf3); return 1; } } if (volume < 0 || volume > 100) { Extbyte buf [255]; sprintf (buf, "volume must be between 0 and 100 (not %d)", volume); sound_warn (buf); return 1; } { /* set the volume; scale it to 0.0 - 1.0 */ double V = (volume / 100.0); audio_get_play_gain (audio_fd, &old_volume); reset_volume_p = 1; audio_set_play_gain (audio_fd, &V); } return 0; #endif } static void reset_device (int wait_p) { if (wait_p) audio_drain (audio_fd, 1); else audio_flush_play (audio_fd); if (reset_device_p) audio_set_play_config (audio_fd, &dev_hdr); if (reset_volume_p) audio_set_play_gain (audio_fd, &old_volume); } void play_sound_file (Extbyte *sound_file, int volume) { int rrtn, wrtn; Binbyte buf [255]; int file_fd; audio_fd = audio_open (); if (audio_fd < 0) { sound_perror ("open /dev/audio"); return; } /* where to find the proto for signal()... */ sighup_handler = (SIGTYPE (*) (int)) EMACS_SIGNAL (SIGHUP, sighandler); sigint_handler = (SIGTYPE (*) (int)) EMACS_SIGNAL (SIGINT, sighandler); file_fd = open (sound_file, O_RDONLY, 0); if (file_fd < 0) { sound_perror (sound_file); goto END_OF_PLAY; } if (init_device (volume, (Binbyte *) 0, file_fd, (unsigned int *) 0)) goto END_OF_PLAY; while (1) { rrtn = read (file_fd, (CBinbyte *) buf, sizeof (buf)); if (rrtn < 0) { sound_perror ("read"); goto END_OF_PLAY; } if (rrtn == 0) break; while (1) { wrtn = write (audio_fd, (CBinbyte *) buf, rrtn); if (wrtn < 0) { sound_perror ("write"); goto END_OF_PLAY; } if (wrtn != 0) break; if (AUDIO_ERR_INTERRUPTED == audio_drain (audio_fd, 1)) goto END_OF_PLAY; } if (wrtn != rrtn) { Extbyte warn_buf [255]; sprintf (warn_buf, "play: rrtn = %d, wrtn = %d", rrtn, wrtn); sound_warn (warn_buf); goto END_OF_PLAY; } } END_OF_PLAY: if (file_fd > 0) close (file_fd); if (audio_fd > 0) { reset_device (1); close (audio_fd); } EMACS_SIGNAL (SIGHUP, sighup_handler); EMACS_SIGNAL (SIGINT, sigint_handler); } int play_sound_data (Binbyte *data, int length, int volume) { int wrtn, start = 0; unsigned int ilen; int result = 0; audio_fd = -1; if (length == 0) return 0; /* this is just to get a better error message */ if (strncmp (".snd\0", (CBinbyte *) data, 4)) { sound_warn ("Not valid audio data (bad magic number)"); goto END_OF_PLAY; } if (length <= sizeof (Audio_hdr)) { sound_warn ("Not valid audio data (too short)"); goto END_OF_PLAY; } audio_fd = audio_open (); if (audio_fd < 0) return 0; /* where to find the proto for signal()... */ sighup_handler = (SIGTYPE (*) (int)) EMACS_SIGNAL (SIGHUP, sighandler); sigint_handler = (SIGTYPE (*) (int)) EMACS_SIGNAL (SIGINT, sighandler); if (init_device (volume, data, 0, &ilen)) goto END_OF_PLAY; data += (ilen<<2); length -= (ilen<<2); if (length <= 1) goto END_OF_PLAY; while (1) { wrtn = write (audio_fd, (CBinbyte *) (data+start), length-start); if (wrtn < 0) { sound_perror ("write"); goto END_OF_PLAY; } if (wrtn != 0) { start += wrtn; break; } if (AUDIO_ERR_INTERRUPTED == audio_drain (audio_fd, 1)) goto END_OF_PLAY; } if (wrtn != length) { Extbyte buf [255]; sprintf (buf, "play: rrtn = %d, wrtn = %d", length, wrtn); sound_warn (buf); goto END_OF_PLAY; } result = 1; END_OF_PLAY: if (audio_fd > 0) { reset_device (1); close (audio_fd); } EMACS_SIGNAL (SIGHUP, sighup_handler); EMACS_SIGNAL (SIGINT, sigint_handler); return result; } /* #### sigcontext doesn't exist in Solaris. This should be updated to be correct for Solaris. */ static SIGTYPE sighandler (int sig) { if (audio_fd > 0) { reset_device (0); close (audio_fd); } if (sig == SIGHUP && sighup_handler) sighup_handler (sig); else if (sig == SIGINT && sigint_handler) sigint_handler (sig); else exit (1); }