moved sound interface to common directory

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@558 a1c6a512-1295-4272-9138-f99709370657

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)
 ifeq ($(UNAME),Linux)
   INCLUDES += -I/usr/X11R6/include
   LIBDIRS = -L/usr/X11R6/lib
+  DEFINES += -DLINUX
 else
   LIBDIRS = 
 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 @@
 #include <fcntl.h>
 
 #include <linux/soundcard.h>
-#include "oss_sound.h"
+#include "../common/sound.h"
 
 /* We want to use the "real" open in some cases */
 #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 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- *
- * Copyright (C) 2002 Dave Chapman
- *
- * oss_sound - a sound driver for Linux (and others?) OSS audio
- *
- * All files in this archive are subject to the GNU General Public License.
- * See the file COPYING in the source tree root for full license agreement.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-
-
-/* The "sound device type" is simply the file descriptor */
-#define sound_t int
-
-int init_sound(sound_t* sound);
-int config_sound(sound_t* sound, int sound_freq, int channels);
-void close_sound(sound_t* sound);
-int output_sound(sound_t* sound,const void* buf, int count);