Commit 20e94fdd authored by Glenn Morris's avatar Glenn Morris
Browse files

Let configure set DEFAULT_SOUND_DEVICE

* configure.ac (DEFAULT_SOUND_DEVICE): New definition.

* src/sound.c (DEFAULT_SOUND_DEVICE) [!WINDOWSNT]:
* src/s/netbsd.h (DEFAULT_SOUND_DEVICE): Let configure set it.
parent 22ffb973
2012-07-11 Glenn Morris <rgm@gnu.org>
* configure.ac (DEFAULT_SOUND_DEVICE): New definition.
2012-07-10 Paul Eggert <eggert@cs.ucla.edu>
Remove "#define unix" that is no longer needed (Bug#11905).
......
......@@ -3145,6 +3145,16 @@ case $opsys in
;;
esac
dnl FIXME Surely we can test for this rather than hard-code it.
case $opsys in
netbsd | openbsd) sound_device="/dev/audio" ;;
*) sound_device="/dev/dsp" ;;
esac
dnl Used in sound.c
AC_DEFINE_UNQUOTED(DEFAULT_SOUND_DEVICE, "$sound_device",
[Name of the default sound device.])
dnl Used in vm-limit.c
AH_TEMPLATE(DATA_START, [Address of the start of the data segment.])
dnl Used in lisp.h, emacs.c, mem-limits.h
......
2012-07-11 Glenn Morris <rgm@gnu.org>
* sound.c (DEFAULT_SOUND_DEVICE) [!WINDOWSNT]:
* s/netbsd.h (DEFAULT_SOUND_DEVICE): Let configure set it.
2012-07-10 Paul Eggert <eggert@cs.ucla.edu>
 
Remove "#define unix" that is no longer needed (Bug#11905).
......
......@@ -21,8 +21,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Get most of the stuff from bsd-common. */
#include "bsd-common.h"
#define DEFAULT_SOUND_DEVICE "/dev/audio"
/* Greg A. Woods <woods@weird.com> says we must include signal.h
before syssignal.h is included, to work around interface conflicts
that are handled with CPP __RENAME() macro in signal.h. */
......
/* sound.c -- sound support.
Copyright (C) 1998-1999, 2001-2012 Free Software Foundation, Inc.
Copyright (C) 1998-1999, 2001-2012 Free Software Foundation, Inc.
This file is part of GNU Emacs.
......@@ -114,11 +115,6 @@ enum sound_attr
/* BEGIN: Non Windows Definitions */
#ifndef WINDOWSNT
#ifndef DEFAULT_SOUND_DEVICE
#define DEFAULT_SOUND_DEVICE "/dev/dsp"
#endif
/* Structure forward declarations. */
struct sound;
......@@ -714,7 +710,7 @@ vox_open (struct sound_device *sd)
{
const char *file;
/* Open the sound device. Default is /dev/dsp. */
/* Open the sound device (eg /dev/dsp). */
if (sd->file)
file = sd->file;
else
......@@ -860,7 +856,7 @@ vox_init (struct sound_device *sd)
const char *file;
int fd;
/* Open the sound device. Default is /dev/dsp. */
/* Open the sound device (eg /dev/dsp). */
if (sd->file)
file = sd->file;
else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment