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

[audio] Fix missed compile issues

Browse source 
Due to not having wildmidi on my eeepc.
This commit is contained in:
Bill Currie 2021-06-24 00:14:33 +09:00
parent fc907e232f
commit 54bc7a83ba
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/snd_internal.h
View file

@ -491,7 +491,7 @@ int SND_LoadWav (QFile *file, sfx_t *sfx, char *realname);
\param realname path of sound file should it need to be re-opened
\return 0 if ok, -1 on error
*/
int SND_LoadMidi (snd_t *snd, QFile *file, sfx_t *sfx, char *realname);
int SND_LoadMidi (QFile *file, sfx_t *sfx, char *realname);
///@}
/** \defgroup sound_render_cache_stream Cache/Stream Functions.

13
libs/audio/renderer/midi.c
View file

@ -61,21 +61,21 @@ static cvar_t *wildmidi_volume;
static cvar_t *wildmidi_config;
static int
midi_init ( void ) {
midi_init (snd_t *snd) {
wildmidi_volume = Cvar_Get ("wildmidi_volume", "100", CVAR_ARCHIVE, NULL,
"Set the Master Volume");
wildmidi_config = Cvar_Get ("wildmidi_config", "/etc/timidity.cfg",
CVAR_ROM, NULL,
"path/filename of timidity.cfg");
if (WildMidi_Init (wildmidi_config->string, snd_shm->speed, 0) == -1)
if (WildMidi_Init (wildmidi_config->string, snd->speed, 0) == -1)
return 1;
midi_intiialized = 1;
return 0;
}
static wavinfo_t
midi_get_info (void * handle) {
midi_get_info (snd_t *snd, void *handle) {
wavinfo_t info;
struct _WM_Info *wm_info;
@ -86,7 +86,7 @@ midi_get_info (void * handle) {
return info;
}
info.rate = snd_shm->speed;
info.rate = snd->speed;
info.width = 2;
info.channels = 2;
info.loopstart = -1;
@ -171,13 +171,14 @@ midi_stream_open (sfx_t *sfx)
int
SND_LoadMidi (QFile *file, sfx_t *sfx, char *realname)
{
snd_t *snd = sfx->snd;
wavinfo_t info;
midi *handle;
unsigned char *local_buffer;
unsigned long int local_buffer_size = Qfilesize (file);
if (!midi_intiialized) {
if (midi_init ()) {
if (midi_init (snd)) {
return -1;
}
}
@ -193,7 +194,7 @@ SND_LoadMidi (QFile *file, sfx_t *sfx, char *realname)
if (handle == NULL)
return -1;
info = midi_get_info (handle);
info = midi_get_info (snd, handle);
WildMidi_Close (handle);