X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_bsd.c;h=0e927f1e8d02fa01c37dd02482c272fa374794ce;hp=e202342b798ba331575571cdbd82a355b09769fc;hb=8d7c6efa6bdbfecaa3dbcc39b68c4469d272dc6b;hpb=31fc9b15f9a7bf62ff044eb1dd6eb4722f470bdc

diff --git a/snd_bsd.c b/snd_bsd.c
index e202342b..0e927f1e 100644
--- a/snd_bsd.c
+++ b/snd_bsd.c
@@ -17,6 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
+#include "quakedef.h"
 
 #include <sys/param.h>
 #include <sys/audioio.h>
@@ -31,7 +32,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #endif
 #include <unistd.h>
 
-#include "quakedef.h"
 #include "snd_main.h"
 
 
@@ -68,7 +68,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
 	}
 
 	AUDIO_INITINFO (&info);
-#ifdef AUMODE_PLAY	// NetBSD / OpenBSD 
+#ifdef AUMODE_PLAY	// NetBSD / OpenBSD
 	info.mode = AUMODE_PLAY;
 #endif
 	info.play.sample_rate = requested->speed;
@@ -84,15 +84,17 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
 #ifdef SUNOS
 		info.play.encoding = AUDIO_ENCODING_LINEAR;
 #else
-#	if BYTE_ORDER == BIG_ENDIAN
+	if (mem_bigendian)
 		info.play.encoding = AUDIO_ENCODING_SLINEAR_BE;
-#	else
+	else
 		info.play.encoding = AUDIO_ENCODING_SLINEAR_LE;
-#	endif
 #endif
 
-	if (ioctl (audio_fd, AUDIO_SETINFO, &info) == 0)
-		break;
+	if (ioctl (audio_fd, AUDIO_SETINFO, &info) != 0)
+	{
+		Con_Printf("Can't set up the sound device (%s)\n", snddev);
+		return false;
+	}
 
 	// TODO: check the parameters with AUDIO_GETINFO
 	// TODO: check AUDIO_ENCODINGFLAG_EMULATED with AUDIO_GETENC
@@ -137,7 +139,7 @@ void SndSys_Submit (void)
 {
 	unsigned int startoffset, factor, limit, nbframes;
 	int written;
-	
+
 	if (audio_fd < 0 ||
 		snd_renderbuffer->startframe == snd_renderbuffer->endframe)
 		return;
@@ -165,7 +167,7 @@ void SndSys_Submit (void)
 			Con_Printf("SndSys_Submit: audio can't keep up! (%u < %u)\n", written, limit * factor);
 			return;
 		}
-		
+
 		nbframes -= limit;
 		startoffset = 0;
 	}
@@ -194,7 +196,7 @@ unsigned int SndSys_GetSoundTime (void)
 	if (ioctl (audio_fd, AUDIO_GETINFO, &info) < 0)
 	{
 		Con_Print("Error: can't get audio info\n");
-		SNDDMA_Shutdown ();
+		SndSys_Shutdown ();
 		return 0;
 	}
 
@@ -227,3 +229,15 @@ void SndSys_UnlockRenderBuffer (void)
 {
 	// Nothing to do
 }
+
+/*
+====================
+SndSys_SendKeyEvents
+
+Send keyboard events originating from the sound system (e.g. MIDI)
+====================
+*/
+void SndSys_SendKeyEvents(void)
+{
+	// not supported
+}