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 <math.h>
#include <SDL.h>
+#include "quakedef.h"
+
#include "snd_main.h"
static unsigned int sdlaudiotime = 0;
+static int audio_device = 0;
// Note: SDL calls SDL_LockAudio() right before this function, so no need to lock the audio data here
PartialLength2 = FrameCount * factor - PartialLength1;
memcpy(&stream[PartialLength1], &snd_renderbuffer->ring[0], PartialLength2);
+
+ // As of SDL 2.0 buffer needs to be fully initialized, so fill leftover part with silence
+ // FIXME this is another place that assumes 8bit is always unsigned and others always signed
+ memset(&stream[PartialLength1 + PartialLength2], snd_renderbuffer->format.width == 1 ? 0x80 : 0, len - (PartialLength1 + PartialLength2));
}
else
+ {
memcpy(stream, &snd_renderbuffer->ring[StartOffset * factor], FrameCount * factor);
+ // As of SDL 2.0 buffer needs to be fully initialized, so fill leftover part with silence
+ // FIXME this is another place that assumes 8bit is always unsigned and others always signed
+ memset(&stream[FrameCount * factor], snd_renderbuffer->format.width == 1 ? 0x80 : 0, len - (FrameCount * factor));
+ }
+
snd_renderbuffer->startframe += FrameCount;
if (FrameCount < RequestedFrames && developer_insane.integer && vid_activewindow)
"\tSamples : %i\n",
wantspec.channels, wantspec.format, wantspec.freq, wantspec.samples);
- if( SDL_OpenAudio( &wantspec, &obtainspec ) )
+ if ((audio_device = SDL_OpenAudioDevice(NULL, 0, &wantspec, &obtainspec, 0)) == 0)
{
Con_Printf( "Failed to open the audio device! (%s)\n", SDL_GetError() );
return false;
wantspec.format != obtainspec.format ||
wantspec.channels != obtainspec.channels)
{
- SDL_CloseAudio();
+ SDL_CloseAudioDevice(audio_device);
// Pass the obtained format as a suggested format
if (suggested != NULL)
snd_renderbuffer = Snd_CreateRingBuffer(requested, 0, NULL);
if (snd_channellayout.integer == SND_CHANNELLAYOUT_AUTO)
- {
- int newlayout;
-
-#ifdef __linux__
- newlayout = SND_CHANNELLAYOUT_ALSA;
-#else
- newlayout = SND_CHANNELLAYOUT_STANDARD;
-#endif
- Cvar_SetValueQuick (&snd_channellayout, newlayout);
- }
+ Cvar_SetValueQuick (&snd_channellayout, SND_CHANNELLAYOUT_STANDARD);
sdlaudiotime = 0;
- SDL_PauseAudio( false );
+ SDL_PauseAudioDevice(audio_device, 0);
return true;
}
*/
void SndSys_Shutdown(void)
{
- SDL_CloseAudio();
-
+ if (audio_device > 0) {
+ SDL_CloseAudioDevice(audio_device);
+ audio_device = 0;
+ }
if (snd_renderbuffer != NULL)
{
Mem_Free(snd_renderbuffer->ring);
*/
qboolean SndSys_LockRenderBuffer (void)
{
- SDL_LockAudio();
+ SDL_LockAudioDevice(audio_device);
return true;
}
*/
void SndSys_UnlockRenderBuffer (void)
{
- SDL_UnlockAudio();
+ SDL_UnlockAudioDevice(audio_device);
}
/*