1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-05-15 17:39:44 -07:00
Commit graph

41 commits

Author SHA1 Message Date
Juanma Barranquero
ed1f0a4532 (Fplay_sound_internal): Remove spurious newline in docstring. 2006-11-29 15:31:56 +00:00
Jan Djärv
dcc881213c * sound.c (alsa_init): Call snd_pcm_close after successful snd_pcm_open. 2006-07-14 09:47:45 +00:00
Dan Nicolaescu
01d0930532 * search.c (matcher_overflow): Mark as NO_RETURN.
* xterm.c (x_connection_closed): Likewise.

* sysdep.c (croak): Likewise.

* sound.c (sound_perror, alsa_sound_perror): Likewise.

* lisp.h (die, nsberror): Likewise.
2006-05-29 08:06:15 +00:00
Jan Djärv
3fc7a865c4 * sound.c (alsa_open, alsa_configure, alsa_write): Move
assignment to err out of if-statement.
2006-05-29 07:25:01 +00:00
Jan Djärv
07a7837c9f * sound.c (alsa_configure): Move get period/buffer_size after
setting hwparams.
2006-05-26 06:29:32 +00:00
Jan Djärv
2d2643f653 * sound.c (alsa_sound_perror, alsa_open, alsa_period_size)
(alsa_configure, alsa_close, alsa_choose_format, alsa_write)
	(snd_error_quiet, alsa_init): New functions.
	(vox_init): Return 0 if unable to open device.
	(Fplay_sound_internal): Test for alsa first and use vox (oss) as
	a fallback.
	(struct sound_device): Add period_size.
	(wav_play, au_play): Use period_size if set.
2006-05-18 17:06:01 +00:00
Richard M. Stallman
8e6ec322ba (Fplay_sound_internal): Dynamically allocate
current_sound_device and current_sound.
(sound_cleanup): Free them.
2006-05-03 23:26:40 +00:00
Thien-Thi Nguyen
aaef169dc6 Update years in copyright notice; nfc. 2006-02-06 15:23:23 +00:00
Thien-Thi Nguyen
0b5538bd85 Update years in copyright notice; nfc. 2005-08-07 12:33:19 +00:00
Lute Kamstra
4fc5845fe8 Update FSF's address. 2005-07-04 16:49:24 +00:00
Miles Bader
ab5796a9f9 Add arch taglines 2003-09-01 15:45:59 +00:00
Juanma Barranquero
06c3eeed12 Fix spacing and adapt to GNU coding conventions. 2002-11-19 13:05:28 +00:00
Ben Key
f60ae425e9 Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME. 2002-11-17 22:35:26 +00:00
Ken Raeburn
dca0fc1c6c (struct sound_device): Function pointer field "write"
buffer argument now points to const.
(vox_write): Buffer argument points to const.
2002-07-19 14:27:20 +00:00
Ken Raeburn
d5db40779d Most uses of XSTRING combined with STRING_BYTES or indirection changed to
SCHARS, SBYTES, STRING_INTERVALS, SREF, SDATA; explicit size_byte references
left unchanged for now.
2002-07-15 00:01:34 +00:00
Juanma Barranquero
aed1337830 Use macro SPECPDL_INDEX. 2002-07-11 14:18:02 +00:00
Stefan Monnier
3d05168ad4 (Fplay_sound_internal): Update call to openp. 2002-04-30 01:01:49 +00:00
Pavel Janík
14e415e7ee (Fplay_sound_internal): Renamed from Fplay_sound.
Doc fix to reflect it.
2002-04-05 05:49:20 +00:00
Pavel Janík
a4ff5d6799 (Fplay_sound): Initialize header_size also for :data case. 2002-01-14 14:37:37 +00:00
Pavel Janík
336b2b2e9a Doc fix. 2002-01-04 21:35:15 +00:00
Andreas Schwab
3297e2a11e (sound_perror): Save errno from being clobbered. 2001-11-05 14:09:32 +00:00
Gerd Moellmann
62725a9205 (sound_perror): Unblock SIGIO, turn on atimers.
Display errno only if non-zero.
(sound_warning): New function.
(vox_configure): Don't treat failing to set sample rate as error.
(various places): Improve error messages.
2001-10-27 08:49:39 +00:00
Pavel Janík
8c1a1077c0 Change doc-string comments to new style' [w/doc:' keyword]. 2001-10-21 12:13:46 +00:00
Pavel Janík
502150e5b8 Include <sys/ioctl.h> also on systems without <soundcard.h>. 2001-10-15 20:45:55 +00:00
Stefan Monnier
c0ec53ad99 Update calls to openp. 2001-10-12 03:37:43 +00:00
Gerd Moellmann
32c82ac0a1 Don't define min/max. 2001-10-08 08:08:08 +00:00
Gerd Moellmann
bb6e8cee92 (toplevel): Include <signal.h> and "syssignal.h".
(vox_configure, vox_close) [SIGIO]: Block/unblock SIGIO
around ioctls.
2001-07-09 17:15:48 +00:00
Gerd Moellmann
53fab6e220 Include Emacs' header files with #include "...". 2001-07-05 14:07:53 +00:00
Gerd Moellmann
b5cb1ada6a (vox_configure, vox_close): Turn off atimers
around ioctls.
2001-06-27 09:23:06 +00:00
Gerd Moellmann
28fcb7dc39 (vox_configure): Change order of ioctls. Don't
set SNDCTL_DSP_SPEED from bps, don't set SNDCTL_DSP_SAMPLESIZE.
Ignore errors when changing volume.
(vox_close): Don't reset the device.
2000-12-07 22:09:00 +00:00
Gerd Moellmann
3887b4498e (vox_configure): Set volume for left and right channel.
(sound_cleanup): Return nil.
2000-12-06 13:32:18 +00:00
Gerd Moellmann
2a494b2d89 (Fplay_sound): Doc fix. 2000-09-13 18:23:03 +00:00
Ken Raeburn
80fcd514bb Sound support for NetBSD through "Linux emulation" support:
* config.in (HAVE_SOUNDCARD_H): Undef.
(HAVE_SOUND): Define if HAVE_SOUNDCARD_H.
* Makefile.in (LIBSOUND): New variable.
(LIBES): Include it.
* sound.c [HAVE_SOUNDCARD_H]: Include <sys/ioctl.h> and <soundcard.h>.
(DEFAULT_SOUND_DEVICE): Define to "/dev/dsp" if not defined elsewhere.
(vox_open): Use DEFAULT_SOUND_DEVICE.
* s/netbsd.h (DEFAULT_SOUND_DEVICE): Define to /dev/audio.
2000-07-05 19:33:00 +00:00
Ken Raeburn
52e386c2dc fix up more Lisp_Object/int conversion issues 2000-06-18 20:14:37 +00:00
Ken Raeburn
66e4690ffa * sound.c (sound_cleanup): Don't call device close routine if pointer is null. 2000-02-07 00:45:16 +00:00
Gerd Moellmann
2542139e1c (Fplay_sound): Improve doc string. 2000-01-13 12:06:44 +00:00
Gerd Moellmann
d1299cdeca (struct sound): Renamed from struct sound_file.
(struct sound): Add members `data' and `header_size'.
(enum sound_attr): Add SOUND_DATA.
(current_sound, current_sound_device): Variables renamed from
sound_file and sound_device.
(parse_sound): Parse :data.
(parse_sound): Handle sound data in strings.
(find_sound_type): Function renamed from find_sound_file_type.
(wav_init, au_init): Fail if sound's header_size is smaller than
needed header size.
(wav_play, au_play): Play sounds from string data.
2000-01-04 14:45:08 +00:00
Paul Eggert
68c45bf065 Add support for large files, 64-bit Solaris, system locale codings.
* Makefile.in (emacs): Set the LC_ALL environment variable to "C"
when dumping, so that the dumped Emacs doesn't have stray locale info.
(dired.o): Depend on systime.h.
(editfns.o): Depend on coding.h.

* alloc.c, buffer.c, callproc.c, ccl.c, charset.c, coding.c, data.c,
dispnew.c, editfns.c, emacs.c, filelock.c, floatfns.c, hftctl.c,
keyboard.c, process.c, sysdep.c, unexelf.c, unexhp9k800.c,
unexsunos4.c, vmsfns.c, vmsgmalloc.c, w32faces.c, w32menu.c, w32term.c,
w32xfns.c, xfaces.c, xfns.c, xmenu.c, xterm.c:
Include <config.h> before any system include files.

* alloc.c, buffer.c, ccl.c, data.c, editfns.c, emacs.c, eval.c,
fileio.c, filelock.c, frame.c, insdel.c, keymap.c, lread.c,
m/alpha.h, print.c, search.c, sysdep.c, xdisp.c, xfaces.c, xfns.c,
xmenu.c, xterm.c:
Do not include <stdlib.h>, as <config.h> does this now.

* callproc.c (Fcall_process):
Synchronize messages locale before invoking strerror.
Decode resulting string with locale-coding-system.

* coding.c (Vlocale_coding_system): New var.
(syms_of_coding): Adjust to above change.
(emacs_strerror): New function.

* coding.h (emacs_strerror, Vlocale_coding_system): New decls.

* config.in (HAVE_STDIO_EXT_H, HAVE_TM_GMTOFF, HAVE___FPENDING,
HAVE_FTELLO, HAVE_GETLOADAVG, HAVE_MBLEN, HAVE_MBRLEN,
HAVE_STRSIGNAL): New macros.
(BITS_PER_LONG): Default to 64 if _LP64 is defined.
<stdlib.h>: Include if HAVE_STDLIB_H is defined and NOT_C_CODE isn't.

* dired.c: Include "systime.h".
(Ffile_attributes): Do not cast s.st_size to int; this loses
information if int is 32 bits but st_size and EMACS_INT are larger.
Treat large device numbers like large inode numbers.

* dispnew.c (PENDING_OUTPUT_COUNT): Use __fpending if available.

* editfns.c: Include coding.h.
(emacs_strftime): Remove decl.
(emacs_strftimeu): New decl.
(emacs_memftimeu): Renamed from emacs_memftime; new arg UT.
Use emacs_strftimeu instead of emacs_strftime.
(Fformat_time_string): Convert format string using
Vlocale_coding_system, and convert result back.  Synchronize time
locale before invoking lower level function.  Invoke
emacs_memftimeu, passing ut, instead of emacs_memftime.

* emacs.c: Include <locale.h> if HAVE_SETLOCALE is defined.
(Vmessages_locale, Vprevious_messages_locale, Vtime_locale,
Vprevious_time_locale): New variables.
(main): Invoke setlocale early, so that initial error messages are
localized properly.  But skip locale-setting if LC_ALL is "C".
Fix up locale when it's safe to do so.
(fixup_locale): Moved here from xterm.c.
(synchronize_locale, synchronize_time_locale,
synchronize_messages_locale): New functions.
(syms_of_emacs): Accommodate above changes.

* fileio.c (report_file_error): Convert strerror output according
to Vlocale_coding_system.
(Finsert_file_contents): Check for arithmetic overflow in
computations that depend on file size.  Report IO errors
with emacs_strerror, not strerror.

* fns.c (Fgethash): Declare dflt parameter.

* gmalloc.c: Do not define const to nothing if HAVE_CONFIG_H
is defined; that's config.h's job.

* lisp.h (EMACS_INT, BITS_PER_EMACS_INT, EMACS_UINT): If _LP64,
default these values to long, BITS_PER_LONG, and unsigned long.
(VALBITS, MARKBIT, XINT): Do not assume 32-bit EMACS_INT.
(PNTR_COMPARISON_TYPE): Default to EMACS_UINT, not to unsigned int.
(code_convert_string_norecord, fixup_locale,
synchronize_messages_locale, synchronize_time_locale,
emacs_open, emacs_close, emacs_read, emacs_write): New decls.
All Emacs callers of open, close, read, write changed to use
emacs_open, emacs_close, emacs_read, emacs_write.

* lread.c (file_offset, file_tell): New macros.  All uses of ftell
changed to file_tell.
(saved_doc_string_position, prev_saved_doc_string_position): Now
of type file_offset.
(init_lread): Do not fix locale here; fixup_locale now does this.

* m/amdahl.h, s/usg5-4.h:
(NSIG): Remove.
(NSIG_MINIMUM): New macro.

* m/cydra5.h, m/dpx2.h, m/mips.h, m/pfa50.h, m/sps7.h, m/stride.h,
m/ustation.h, s/gnu-linux.h, s/hpux.h, s/iris3-5.h, s/iris3-6.h,
s/umips.h, s/usg5-4.h:
(SIGIO): Do not undef.
(BROKEN_SIGIO): New macro.

* m/ustation.h:
(SIGTSTP): Do not undef.
(BROKEN_SIGTSTP): New macro.

* s/gnu-linux.h:
(SIGPOLL, SIGURG): Do not undef.
(BROKEN_SIGPOLL, BROKEN_SIGURG): New macros.

* s/ptx4.h:
(SIGINFO): Do not undef.
(BROKEN_SIGINFO): New macros.

* m/delta.h, s/ptx.h, s/template.h: Doc fix.

* mktime.c, strftime.c: Update to glibc 2.1.2 version, with
some Emacs-related changes merged.

* print.c (float_to_string): Prepend "-" to representation of a
NaN if the NaN is negative.

* process.c (sys_siglist): Omit if HAVE_STRSIGNAL.
(wait_reading_process_input): Use emacs_strerror, not strerror.

* process.c (status_message, sigchld_handler): Synchronize locale,
then use strsignal istead of sys_siglist.
* w32proc.c (sys_wait): Likewise.

* s/aix3-1.h, s/bsd4-1.h, s/dgux.h, s/gnu-linux.h, s/hiuxmpp.h,
s/hpux.h, s/iris3-5.h, s/iris3-6.h, s/irix3-3.h, s/osf1.h, s/rtu.h,
s/sunos4-1.h, s/unipl5-0.h, s/unipl5-2.h, s/usg5-0.h, s/usg5-2-2.h,
s/usg5-2.h, s/usg5-3.h, s/xenix.h:
(open, close, read, write, INTERRUPTIBLE_OPEN,
INTERRUPTIBLE_CLOSE, INTERRUPTIBLE_IO): Remove.

* s/sol2-5.h (_LARGEFILE_SOURCE, _FILE_OFFSET_BITS): New macros.
* sysdep.c (sys_read, sys_write, read, write, sys_close, close,
sys_open, open): Remove.
(emacs_open, emacs_close, emacs_read, emacs_write): Always define;
the old INTERRUPTIBLE_OPEN, INTERRUPTIBLE_CLOSE, and INTERRUPTIBLE_IO
macros are no longer used.
(emacs_open): Renamed from sys_open.  Merge BSD4_1 version.
(emacs_close): Renamed from sys_close.
(emacs_read): Renamed from sys_read.
(emacs_write): Renamed from sys_write.
(sys_siglist): Do not declare if HAVE_STRSIGNAL.
(dup2): Do not print error on failure; the real dup2 doesn't.
(strsignal): New function, defined if !HAVE_STRSIGNAL.

* syssignal.h (SIGINFO): Undef if defined and if BROKEN_SIGINFO
is defined.
(SIGIO, SIGPOLL, SIGTSTP, SIGURG): Likewise.
(NSIG): If less than NSIG_MINIMUM, define to NSIG_MINIMUM.
(strsignal): Declare if !HAVE_STRSIGNAL.

* unexelf.c (ElfBitsW, ELFSIZE, ElfExpandBitsW): New macros.
(ElfW): Define in terms of ElfExpandBitsW.

* w32proc.c (sys_siglist): Remove decl.

* xdisp.c (decode_mode_spec): 3rd arg is int, not char, to comply
with ANSI C.
(display_string): Declare face_string_pos arg.

* xfns.c (Fx_show_tip): Declare timeout param.

* xterm.c: No need to include locale.h.
(x_alloc_lighter_color, x_setup_relief_color):
Pass arg as double, not float, for compatibility with ANSI C.
(fixup_locale): Move to emacs.c.
(x_term_init): Do not setlocale or fixup locale; the main program
does this now.
1999-10-19 07:25:11 +00:00
Gerd Moellmann
9680b9d055 (Fplay_sound): Remove usused variables.
(be2hs): Put in #if 0 because it's currently not used.
1999-09-14 20:11:59 +00:00
Gerd Moellmann
2a53558db3 (Qplay_sound_functions): Replaces Qplay_sound_hook.
(Fplay_sound, syms_of_sound): Use it.
(parse_sound): Allow float volume values in the range [0, 1].
(Fplay_sound): Ditto.
1999-09-05 21:22:45 +00:00
Gerd Moellmann
7840ced199 New file. 1999-07-21 21:43:52 +00:00