diff options
Diffstat (limited to 'uisimulator/x11')
-rw-r--r-- | uisimulator/x11/Makefile | 1 | ||||
-rw-r--r-- | uisimulator/x11/oss_sound.c | 2 | ||||
-rw-r--r-- | uisimulator/x11/oss_sound.h | 28 |
3 files changed, 2 insertions, 29 deletions
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile index b73fd08bf3..f00835960c 100644 --- a/uisimulator/x11/Makefile +++ b/uisimulator/x11/Makefile | |||
@@ -45,6 +45,7 @@ UNAME := $(shell uname) | |||
45 | ifeq ($(UNAME),Linux) | 45 | ifeq ($(UNAME),Linux) |
46 | INCLUDES += -I/usr/X11R6/include | 46 | INCLUDES += -I/usr/X11R6/include |
47 | LIBDIRS = -L/usr/X11R6/lib | 47 | LIBDIRS = -L/usr/X11R6/lib |
48 | DEFINES += -DLINUX | ||
48 | else | 49 | else |
49 | LIBDIRS = | 50 | LIBDIRS = |
50 | endif | 51 | endif |
diff --git a/uisimulator/x11/oss_sound.c b/uisimulator/x11/oss_sound.c index 6827842689..853b70d57f 100644 --- a/uisimulator/x11/oss_sound.c +++ b/uisimulator/x11/oss_sound.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <fcntl.h> | 22 | #include <fcntl.h> |
23 | 23 | ||
24 | #include <linux/soundcard.h> | 24 | #include <linux/soundcard.h> |
25 | #include "oss_sound.h" | 25 | #include "../common/sound.h" |
26 | 26 | ||
27 | /* We want to use the "real" open in some cases */ | 27 | /* We want to use the "real" open in some cases */ |
28 | #undef open | 28 | #undef open |
diff --git a/uisimulator/x11/oss_sound.h b/uisimulator/x11/oss_sound.h deleted file mode 100644 index 919ce1aab5..0000000000 --- a/uisimulator/x11/oss_sound.h +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * | ||
9 | * Copyright (C) 2002 Dave Chapman | ||
10 | * | ||
11 | * oss_sound - a sound driver for Linux (and others?) OSS audio | ||
12 | * | ||
13 | * All files in this archive are subject to the GNU General Public License. | ||
14 | * See the file COPYING in the source tree root for full license agreement. | ||
15 | * | ||
16 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
17 | * KIND, either express or implied. | ||
18 | * | ||
19 | ****************************************************************************/ | ||
20 | |||
21 | |||
22 | /* The "sound device type" is simply the file descriptor */ | ||
23 | #define sound_t int | ||
24 | |||
25 | int init_sound(sound_t* sound); | ||
26 | int config_sound(sound_t* sound, int sound_freq, int channels); | ||
27 | void close_sound(sound_t* sound); | ||
28 | int output_sound(sound_t* sound,const void* buf, int count); | ||