clean up field offset handling a bit, now uses vec_t instead of float,

[xonotic/darkplaces.git] / snd_bsd.c

diff --git a/snd_bsd.c b/snd_bsd.c
index 0dd7186a19ef0cae7ddcfc67243b0af8cccf5153..85f10df48a8530d3ae209f6685d36f20a3d13549 100644 (file)
--- a/snd_bsd.c
+++ b/snd_bsd.c
@@ -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;
@@ -91,8 +91,11 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
 #      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 +140,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 +168,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 +197,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 +230,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
+}