moved sound interface to common directory

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

4 files changed, 18 insertions, 3 deletions

diff --git a/uisimulator/common/mpegplay.c b/uisimulator/common/mpegplay.c
index 9af231088e..aaaddfa014 100644
--- a/uisimulator/common/mpegplay.c
+++ b/uisimulator/common/mpegplay.c
@@ -34,7 +34,7 @@
 #include <stdio.h>
 #include <mad.h>
 
-#include "oss_sound.h"
+#include "sound.h"
 
 /* The "dither" code to convert the 24-bit samples produced by libmad was
    taken from the coolplayer project - coolplayer.sourceforge.net */
diff --git a/uisimulator/x11/oss_sound.h b/uisimulator/common/sound.h
index 919ce1aab5..4da5ce9f08 100644
--- a/uisimulator/x11/oss_sound.h
+++ b/uisimulator/common/sound.h
@@ -8,7 +8,7 @@
  *
  * Copyright (C) 2002 Dave Chapman
  *
- * oss_sound - a sound driver for Linux (and others?) OSS audio
+ * sound.h - common sound driver file.
  *
  * 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.
@@ -18,11 +18,25 @@
  *
  ****************************************************************************/
 
+#ifndef _SOUND_H
+#define _SOUND_H
+
+#ifdef LINUX
 
 /* The "sound device type" is simply the file descriptor */
 #define sound_t int
 
+#else
+ #ifdef WIN32
+   #warning "No sound yet in win32"
+ #else
+   #warning "No sound in this environment"
+ #endif
+#endif
+
 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);
+
+#endif
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