zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add MIDI_GetDevice and use it so that the default driver value doesn't show as "Custom" in the menu

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@8261 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2019-10-24 05:47:29 +00:00 committed by Christoph Oelckers
parent 7650cbe592
commit c6c7c91d7c
6 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/audiolib/include/fx_man.h
View file

@ -56,6 +56,7 @@ enum FX_LOOP_HOW
const char *FX_ErrorString(int ErrorNumber); const char *FX_ErrorString(int ErrorNumber);
int FX_Init(int numvoices, int numchannels, int mixrate, void *initdata); int FX_Init(int numvoices, int numchannels, int mixrate, void *initdata);
int FX_Shutdown(void); int FX_Shutdown(void);
int FX_GetDevice(void);

1
source/audiolib/include/music.h
View file

@ -63,6 +63,7 @@ extern const char *MUSIC_ErrorString(int ErrorNumber);
int MUSIC_Init(int SoundCard); int MUSIC_Init(int SoundCard);
int MUSIC_Shutdown(void); int MUSIC_Shutdown(void);
int MIDI_GetDevice(void);
void MUSIC_SetVolume(int volume); void MUSIC_SetVolume(int volume);
int MUSIC_GetVolume(void); int MUSIC_GetVolume(void);
void MUSIC_SetLoopFlag(int loopflag); void MUSIC_SetLoopFlag(int loopflag);

5
source/audiolib/src/fx_man.cpp
View file

@ -141,6 +141,11 @@ int FX_Shutdown(void)
return status; return status;
} }
int FX_GetDevice()
{
return ASS_PCMSoundDriver;
}
static wavefmt_t FX_DetectFormat(char const * const ptr, uint32_t length) static wavefmt_t FX_DetectFormat(char const * const ptr, uint32_t length)
{ {
if (length < 12) if (length < 12)

5
source/audiolib/src/midi.cpp
View file

@ -46,6 +46,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
extern int MV_MixRate; extern int MV_MixRate;
extern int ASS_MIDISoundDriver; extern int ASS_MIDISoundDriver;
int MIDI_GetDevice()
{
return ASS_MIDISoundDriver;
}
static const int _MIDI_CommandLengths[NUM_MIDI_CHANNELS] = { 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 1, 1, 2, 0 }; static const int _MIDI_CommandLengths[NUM_MIDI_CHANNELS] = { 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 1, 1, 2, 0 };
static track * _MIDI_TrackPtr; static track * _MIDI_TrackPtr;

11
source/duke3d/src/sounds.cpp
View file

@ -118,7 +118,16 @@ void S_MusicStartup(void)
initprintf("Initializing MIDI driver... "); initprintf("Initializing MIDI driver... ");
int status; int status;
if ((status = MUSIC_Init(ud.config.MusicDevice)) != MUSIC_Ok && (status = MUSIC_Init(0)) != MUSIC_Ok && (status = MUSIC_Init(1)) != MUSIC_Ok) if ((status = MUSIC_Init(ud.config.MusicDevice)) == MUSIC_Ok)
{
if (ud.config.MusicDevice == ASS_AutoDetect)
ud.config.MusicDevice = MIDI_GetDevice();
}
else if ((status = MUSIC_Init(ASS_AutoDetect)) == MUSIC_Ok)
{
ud.config.MusicDevice = MIDI_GetDevice();
}
else
{ {
initprintf("S_MusicStartup(): failed initializing: %s\n", MUSIC_ErrorString(status)); initprintf("S_MusicStartup(): failed initializing: %s\n", MUSIC_ErrorString(status));
return; return;

11
source/sw/src/sounds.cpp
View file

@ -1197,7 +1197,16 @@ void MusicStartup(void)
buildprintf("Initializing MIDI driver... "); buildprintf("Initializing MIDI driver... ");
int status; int status;
if ((status = MUSIC_Init(MusicDevice)) != MUSIC_Ok && (status = MUSIC_Init(0)) != MUSIC_Ok && (status = MUSIC_Init(1)) != MUSIC_Ok) if ((status = MUSIC_Init(MusicDevice)) == MUSIC_Ok)
{
if (MusicDevice == ASS_AutoDetect)
MusicDevice = MIDI_GetDevice();
}
else if ((status = MUSIC_Init(ASS_AutoDetect)) == MUSIC_Ok)
{
MusicDevice = MIDI_GetDevice();
}
else
{ {
buildprintf("Music error: %s\n", MUSIC_ErrorString(status)); buildprintf("Music error: %s\n", MUSIC_ErrorString(status));
mus_enabled = FALSE; mus_enabled = FALSE;