zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-04-17 13:19:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Consistency changes and removal of other unnecessary stuff.

Browse source
This commit is contained in:
Chris Xiong 2021-01-20 11:55:29 +08:00
parent 772f62fc91
commit 908494524b
2 changed files with 10 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/drivers/fluid_dsound.c
View file

@ -185,7 +185,7 @@ void fluid_dsound_audio_driver_settings(fluid_settings_t *settings)
fluid_audio_driver_t *
new_fluid_dsound_audio_driver(fluid_settings_t *settings, fluid_synth_t *synth)
{
return new_fluid_dsound_audio_driver2(settings, NULL, synth);
return new_fluid_dsound_audio_driver2(settings, (fluid_audio_func_t)fluid_synth_process, synth);
}
fluid_audio_driver_t *
@ -215,8 +215,6 @@ new_fluid_dsound_audio_driver2(fluid_settings_t *settings, fluid_audio_func_t fu
FLUID_MEMSET(dev, 0, sizeof(fluid_dsound_audio_driver_t));
dev->synth = data;
dev->func = func;
dev->lbuf = NULL;
dev->rbuf = NULL;
fluid_settings_getnum(settings, "synth.sample-rate", &sample_rate);
fluid_settings_getint(settings, "audio.periods", &periods);
@ -508,15 +506,8 @@ void delete_fluid_dsound_audio_driver(fluid_audio_driver_t *d)
IDirectSound_Release(dev->direct_sound);
}
if(dev->lbuf != NULL)
{
FLUID_FREE(dev->lbuf);
}
if(dev->rbuf != NULL)
{
FLUID_FREE(dev->rbuf);
}
FLUID_FREE(dev->lbuf);
FLUID_FREE(dev->rbuf);
FLUID_FREE(dev);
}
@ -704,8 +695,8 @@ static int fluid_dsound_write_processed_channels(fluid_synth_t *data, int len,
float *out[2] = {drv->lbuf, drv->rbuf};
float *lptr;
float *rptr;
memset(drv->lbuf, 0, len * sizeof(float));
memset(drv->rbuf, 0, len * sizeof(float));
FLUID_MEMSET(drv->lbuf, 0, len * sizeof(float));
FLUID_MEMSET(drv->rbuf, 0, len * sizeof(float));
ret = drv->func(drv->synth, len, 0, NULL, 2, out);
lptr = (float*)channels_out[0] + channels_off[0];
rptr = (float*)channels_out[1] + channels_off[1];

22
src/drivers/fluid_waveout.c
View file

@ -267,7 +267,7 @@ void fluid_waveout_audio_driver_settings(fluid_settings_t *settings)
fluid_audio_driver_t *
new_fluid_waveout_audio_driver(fluid_settings_t *settings, fluid_synth_t *synth)
{
return new_fluid_waveout_audio_driver2(settings, NULL, synth);
return new_fluid_waveout_audio_driver2(settings, (fluid_audio_func_t)fluid_synth_process, synth);
}
fluid_audio_driver_t *
@ -396,11 +396,6 @@ new_fluid_waveout_audio_driver2(fluid_settings_t *settings, fluid_audio_func_t f
return NULL;
}
}
else
{
dev->lbuf = NULL;
dev->rbuf = NULL;
}
/* get the selected device name. if none is specified, use default device. */
if(fluid_settings_copystr(settings, "audio.waveout.device", dev_name, MAXPNAMELEN) == FLUID_OK
@ -543,15 +538,8 @@ void delete_fluid_waveout_audio_driver(fluid_audio_driver_t *d)
CloseHandle(dev->hQuit);
}
if(dev->lbuf != NULL)
{
FLUID_FREE(dev->lbuf);
}
if(dev->rbuf != NULL)
{
FLUID_FREE(dev->rbuf);
}
FLUID_FREE(dev->lbuf);
FLUID_FREE(dev->rbuf);
HeapFree(GetProcessHeap(), 0, dev);
}
@ -567,8 +555,8 @@ static int fluid_waveout_write_processed_channels(fluid_synth_t *data, int len,
float *out[2] = {drv->lbuf, drv->rbuf};
float *lptr;
float *rptr;
memset(drv->lbuf, 0, len * sizeof(float));
memset(drv->rbuf, 0, len * sizeof(float));
FLUID_MEMSET(drv->lbuf, 0, len * sizeof(float));
FLUID_MEMSET(drv->rbuf, 0, len * sizeof(float));
ret = drv->func(drv->synth, len, 0, NULL, 2, out);
lptr = (float*)channels_out[0] + channels_off[0];
rptr = (float*)channels_out[1] + channels_off[1];