Sound: Header file tweaks
Generally use config.h instead of E.h.
This commit is contained in:
parent
93b8da7e8a
commit
4598a70547
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
|
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
|
||||||
* Copyright (C) 2004-2014 Kim Woelders
|
* Copyright (C) 2004-2021 Kim Woelders
|
||||||
*
|
*
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
* of this software and associated documentation files (the "Software"), to
|
* of this software and associated documentation files (the "Software"), to
|
||||||
|
@ -27,6 +27,7 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#if ENABLE_DIALOGS
|
#if ENABLE_DIALOGS
|
||||||
|
#include "xtypes.h"
|
||||||
|
|
||||||
/* Dialog items */
|
/* Dialog items */
|
||||||
#define DITEM_NONE 0
|
#define DITEM_NONE 0
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 2020 Kim Woelders
|
* Copyright (C) 2020-2021 Kim Woelders
|
||||||
*
|
*
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
* of this software and associated documentation files (the "Software"), to
|
* of this software and associated documentation files (the "Software"), to
|
||||||
|
@ -20,11 +20,14 @@
|
||||||
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
#include "E.h"
|
#include "config.h"
|
||||||
|
|
||||||
#if defined(ENABLE_SOUND) && defined(USE_SOUND_ALSA)
|
#if defined(ENABLE_SOUND) && defined(USE_SOUND_ALSA)
|
||||||
#include "sound.h"
|
|
||||||
#include <alsa/asoundlib.h>
|
#include <alsa/asoundlib.h>
|
||||||
|
|
||||||
|
#include "sound.h"
|
||||||
|
#include "util.h"
|
||||||
|
|
||||||
#define DO_FORK 1
|
#define DO_FORK 1
|
||||||
|
|
||||||
#define PCM_DEVICE "default"
|
#define PCM_DEVICE "default"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
|
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
|
||||||
* Copyright (C) 2004-2020 Kim Woelders
|
* Copyright (C) 2004-2021 Kim Woelders
|
||||||
*
|
*
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
* of this software and associated documentation files (the "Software"), to
|
* of this software and associated documentation files (the "Software"), to
|
||||||
|
@ -21,10 +21,14 @@
|
||||||
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
#include "E.h"
|
#include "config.h"
|
||||||
|
|
||||||
#if defined(ENABLE_SOUND) && defined(USE_SOUND_ESD)
|
#if defined(ENABLE_SOUND) && defined(USE_SOUND_ESD)
|
||||||
#include "sound.h"
|
|
||||||
#include <esd.h>
|
#include <esd.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
#include "sound.h"
|
||||||
|
#include "util.h"
|
||||||
|
|
||||||
#ifdef USE_MODULES
|
#ifdef USE_MODULES
|
||||||
#define Estrdup strdup
|
#define Estrdup strdup
|
||||||
|
|
|
@ -20,11 +20,12 @@
|
||||||
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
#include "E.h"
|
|
||||||
#if defined(ENABLE_SOUND) && defined(USE_SOUND_PLAYER)
|
#if defined(ENABLE_SOUND) && defined(USE_SOUND_PLAYER)
|
||||||
#include "file.h"
|
#include "file.h"
|
||||||
#include "sound.h"
|
#include "sound.h"
|
||||||
|
#include "util.h"
|
||||||
|
|
||||||
#ifdef USE_MODULES
|
#ifdef USE_MODULES
|
||||||
#define Estrdup strdup
|
#define Estrdup strdup
|
||||||
|
|
|
@ -20,13 +20,16 @@
|
||||||
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
#include "E.h"
|
#include "config.h"
|
||||||
|
|
||||||
#if defined(ENABLE_SOUND) && defined(USE_SOUND_PULSE)
|
#if defined(ENABLE_SOUND) && defined(USE_SOUND_PULSE)
|
||||||
#include "sound.h"
|
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <pulse/pulseaudio.h>
|
#include <pulse/pulseaudio.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|
||||||
|
#include "sound.h"
|
||||||
|
#include "util.h"
|
||||||
|
|
||||||
#ifdef USE_MODULES
|
#ifdef USE_MODULES
|
||||||
#define Estrdup strdup
|
#define Estrdup strdup
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2012 Jonathan Armani <armani@openbsd.org>
|
* Copyright (c) 2012 Jonathan Armani <armani@openbsd.org>
|
||||||
* Copyright (C) 2020 Kim Woelders
|
* Copyright (C) 2020-2021 Kim Woelders
|
||||||
*
|
*
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
* of this software and associated documentation files (the "Software"), to
|
* of this software and associated documentation files (the "Software"), to
|
||||||
|
@ -21,12 +21,14 @@
|
||||||
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
#include "E.h"
|
|
||||||
#if defined(ENABLE_SOUND) && defined(USE_SOUND_SNDIO)
|
#if defined(ENABLE_SOUND) && defined(USE_SOUND_SNDIO)
|
||||||
#include "sound.h"
|
|
||||||
#include <sndio.h>
|
#include <sndio.h>
|
||||||
|
|
||||||
|
#include "sound.h"
|
||||||
|
#include "util.h"
|
||||||
|
|
||||||
#ifdef USE_MODULES
|
#ifdef USE_MODULES
|
||||||
#define Estrdup strdup
|
#define Estrdup strdup
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue