qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-03-02 15:22:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix the segaults when trying to use snd_disk.

Browse source 
It's output is still bogus (and it writes to the current directory!), but
at least the plugin can be used without any nasty issues.
This commit is contained in:
Bill Currie 2011-09-10 12:07:18 +09:00
parent bfd1680c15
commit da7ddc35c0
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
libs/audio/targets/snd_disk.c
View file

@ -68,30 +68,29 @@ static snd_output_data_t plugin_info_snd_output_data;
static snd_output_funcs_t plugin_info_snd_output_funcs; static snd_output_funcs_t plugin_info_snd_output_funcs;
/* FIXME
static volatile dma_t * static volatile dma_t *
SNDDMA_Init (void) SNDDMA_Init (void)
{ {
memset ((dma_t *) sn, 0, sizeof (sn)); memset ((dma_t *) &sn, 0, sizeof (sn));
sn.channels = 2; sn.channels = 2;
sn.submission_chunk = 1; // don't mix less than this # sn.submission_chunk = 1; // don't mix less than this #
sn.samplepos = 0; // in mono samples sn.framepos = 0;
sn.samplebits = 16; sn.samplebits = 16;
sn.samples = 16384; // mono samples in buffer sn.frames = 16384;
sn.speed = 44100; sn.speed = 44100;
sn.buffer = malloc (sn.samples * sn.channels * sn.samplebits / 8); sn.buffer = malloc (sn.frames * sn.channels * sn.samplebits / 8);
if (!sn.buffer) { if (!sn.buffer) {
Sys_Printf ("SNDDMA_Init: memory allocation failure\n"); Sys_Printf ("SNDDMA_Init: memory allocation failure\n");
return 0; return 0;
} }
Sys_Printf ("%5d stereo\n", sn.channels - 1); Sys_Printf ("%5d channels\n", sn.channels - 1);
Sys_Printf ("%5d samples\n", sn.samples); Sys_Printf ("%5d samples\n", sn.frames);
Sys_Printf ("%5d samplepos\n", sn.samplepos); Sys_Printf ("%5d samplepos\n", sn.framepos);
Sys_Printf ("%5d samplebits\n", sn.samplebits); Sys_Printf ("%5d samplebits\n", sn.samplebits);
Sys_Printf ("%5d submission_chunk\n", sn.submission_chunk); Sys_Printf ("%5d submission_chunk\n", sn.submission_chunk);
Sys_Printf ("%5d speed\n", sn.speed); Sys_Printf ("%5d speed\n", sn.speed);
Sys_Printf ("0x%x dma buffer\n", (int) sn.buffer); Sys_Printf ("0x%lx dma buffer\n", (long) sn.buffer);
if (!(snd_file = Qopen ("qf.raw", "wb"))) if (!(snd_file = Qopen ("qf.raw", "wb")))
return 0; return 0;
@ -99,7 +98,11 @@ SNDDMA_Init (void)
snd_inited = 1; snd_inited = 1;
return &sn; return &sn;
} }
*/
static void
SNDDMA_Init_Cvars (void)
{
}
static int static int
SNDDMA_GetDMAPos (void) SNDDMA_GetDMAPos (void)
@ -172,8 +175,10 @@ PLUGIN_INFO(snd_output, disk)
plugin_info_funcs.input = NULL; plugin_info_funcs.input = NULL;
plugin_info_funcs.snd_output = &plugin_info_snd_output_funcs; plugin_info_funcs.snd_output = &plugin_info_snd_output_funcs;
// plugin_info_general_funcs.p_Init = SNDDMA_Init; // FIXME plugin_info_general_funcs.p_Init = SNDDMA_Init_Cvars;
plugin_info_general_funcs.p_Shutdown = SNDDMA_Shutdown; plugin_info_general_funcs.p_Shutdown = NULL;
plugin_info_snd_output_funcs.pS_O_Init = SNDDMA_Init;
plugin_info_snd_output_funcs.pS_O_Shutdown = SNDDMA_Shutdown;
plugin_info_snd_output_funcs.pS_O_GetDMAPos = SNDDMA_GetDMAPos; plugin_info_snd_output_funcs.pS_O_GetDMAPos = SNDDMA_GetDMAPos;
plugin_info_snd_output_funcs.pS_O_Submit = SNDDMA_Submit; plugin_info_snd_output_funcs.pS_O_Submit = SNDDMA_Submit;
plugin_info_snd_output_funcs.pS_O_BlockSound = SNDDMA_BlockSound; plugin_info_snd_output_funcs.pS_O_BlockSound = SNDDMA_BlockSound;