diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-07-10 22:16:25 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-07-10 22:16:25 -0400 |
| commit | 20e94fdd8ec2a82d0789fc4ea354a803a14e2ec3 (patch) | |
| tree | 89b52e6a6de6917b811d85215bcf12add8a436dd /src/sound.c | |
| parent | 22ffb97351d1081558c070a3c134d2be99993df6 (diff) | |
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.
Diffstat (limited to 'src/sound.c')
| -rw-r--r-- | src/sound.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/sound.c b/src/sound.c index adeb3c47f0..3773047827 100644 --- a/src/sound.c +++ b/src/sound.c @@ -1,5 +1,6 @@ /* 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 |