e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Sound: Header file tweaks 

Generally use config.h instead of E.h.
This commit is contained in:
Kim Woelders 2021-04-20 08:27:03 +02:00
parent 93b8da7e8a
commit 4598a70547
6 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/dialog.h
View File

@ -1,6 +1,6 @@
/*
* 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
* of this software and associated documentation files (the "Software"), to
@ -27,6 +27,7 @@
#include "config.h"
#if ENABLE_DIALOGS
#include "xtypes.h"
/* Dialog items */
#define DITEM_NONE 0

9
src/sound_alsa.c
View File

@ -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
* 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
* 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)
#include "sound.h"
#include <alsa/asoundlib.h>
#include "sound.h"
#include "util.h"
#define DO_FORK 1
#define PCM_DEVICE "default"

10
src/sound_esd.c
View File

@ -1,6 +1,6 @@
/*
* 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
* 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
* 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)
#include "sound.h"
#include <esd.h>
#include <unistd.h>
#include "sound.h"
#include "util.h"
#ifdef USE_MODULES
#define Estrdup strdup

3
src/sound_player.c
View File

@ -20,11 +20,12 @@
* 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.
*/
#include "config.h"
#include "E.h"
#if defined(ENABLE_SOUND) && defined(USE_SOUND_PLAYER)
#include "file.h"
#include "sound.h"
#include "util.h"
#ifdef USE_MODULES
#define Estrdup strdup

7
src/sound_pulse.c
View File

@ -20,13 +20,16 @@
* 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.
*/
#include "E.h"
#include "config.h"
#if defined(ENABLE_SOUND) && defined(USE_SOUND_PULSE)
#include "sound.h"
#include <fcntl.h>
#include <pulse/pulseaudio.h>
#include <sys/stat.h>
#include "sound.h"
#include "util.h"
#ifdef USE_MODULES
#define Estrdup strdup
#endif

8
src/sound_sndio.c
View File

@ -1,6 +1,6 @@
/*
* 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
* 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
* 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)
#include "sound.h"
#include <sndio.h>
#include "sound.h"
#include "util.h"
#ifdef USE_MODULES
#define Estrdup strdup
#endif