libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 21:31:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ANDROID: Use the midi gain option for EAS

Browse Source
This commit is contained in:
dhewg 2011-03-27 15:30:17 +02:00
parent 6487d05ddf
commit b8a118eb0c
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
audio/softsynth/eas.cpp
View File

@ -109,6 +109,7 @@ private:
typedef int32 (*ShutdownFunc)(EASDataHandle); typedef int32 (*ShutdownFunc)(EASDataHandle);
typedef int32 (*LoadDLSFunc)(EASDataHandle, EASHandle, EASFile *); typedef int32 (*LoadDLSFunc)(EASDataHandle, EASHandle, EASFile *);
typedef int32 (*SetParameterFunc)(EASDataHandle, int32, int32, int32); typedef int32 (*SetParameterFunc)(EASDataHandle, int32, int32, int32);
typedef int32 (*SetVolumeFunc)(EASDataHandle, EASHandle, int32);
typedef int32 (*OpenStreamFunc)(EASDataHandle, EASHandle *, EASHandle); typedef int32 (*OpenStreamFunc)(EASDataHandle, EASHandle *, EASHandle);
typedef int32 (*WriteStreamFunc)(EASDataHandle, EASHandle, byte *, int32); typedef int32 (*WriteStreamFunc)(EASDataHandle, EASHandle, byte *, int32);
typedef int32 (*CloseStreamFunc)(EASDataHandle, EASHandle); typedef int32 (*CloseStreamFunc)(EASDataHandle, EASHandle);
@ -138,6 +139,7 @@ private:
ShutdownFunc _shutdownFunc; ShutdownFunc _shutdownFunc;
LoadDLSFunc _loadDLSFunc; LoadDLSFunc _loadDLSFunc;
SetParameterFunc _setParameterFunc; SetParameterFunc _setParameterFunc;
SetVolumeFunc _setVolumeFunc;
OpenStreamFunc _openStreamFunc; OpenStreamFunc _openStreamFunc;
WriteStreamFunc _writeStreamFunc; WriteStreamFunc _writeStreamFunc;
CloseStreamFunc _closeStreamFunc; CloseStreamFunc _closeStreamFunc;
@ -164,6 +166,7 @@ MidiDriver_EAS::MidiDriver_EAS() :
_shutdownFunc(0), _shutdownFunc(0),
_loadDLSFunc(0), _loadDLSFunc(0),
_setParameterFunc(0), _setParameterFunc(0),
_setVolumeFunc(0),
_openStreamFunc(0), _openStreamFunc(0),
_writeStreamFunc(0), _writeStreamFunc(0),
_closeStreamFunc(0), _closeStreamFunc(0),
@ -228,6 +231,7 @@ int MidiDriver_EAS::open() {
sym(_shutdownFunc, "EAS_Shutdown"); sym(_shutdownFunc, "EAS_Shutdown");
sym(_loadDLSFunc, "EAS_LoadDLSCollection"); sym(_loadDLSFunc, "EAS_LoadDLSCollection");
sym(_setParameterFunc, "EAS_SetParameter"); sym(_setParameterFunc, "EAS_SetParameter");
sym(_setVolumeFunc, "EAS_SetVolume");
sym(_openStreamFunc, "EAS_OpenMIDIStream"); sym(_openStreamFunc, "EAS_OpenMIDIStream");
sym(_writeStreamFunc, "EAS_WriteMIDIStream"); sym(_writeStreamFunc, "EAS_WriteMIDIStream");
sym(_closeStreamFunc, "EAS_CloseMIDIStream"); sym(_closeStreamFunc, "EAS_CloseMIDIStream");
@ -247,15 +251,21 @@ int MidiDriver_EAS::open() {
return -1; return -1;
} }
_setParameterFunc(_EASHandle, EAS_REVERB, EAS_REVERB_PRESET, res = _setParameterFunc(_EASHandle, EAS_REVERB, EAS_REVERB_PRESET,
EAS_REVERB_CHAMBER); EAS_REVERB_CHAMBER);
if (res) if (res)
warning("error setting reverb preset: %d", res); warning("error setting reverb preset: %d", res);
_setParameterFunc(_EASHandle, EAS_REVERB, EAS_REVERB_BYPASS, 0); res = _setParameterFunc(_EASHandle, EAS_REVERB, EAS_REVERB_BYPASS, 0);
if (res) if (res)
warning("error disabling reverb bypass: %d", res); warning("error disabling reverb bypass: %d", res);
// 90 is EAS's default, max is 100
// so the option slider will only work from 0.1 to 1.1
res = _setVolumeFunc(_EASHandle, 0, ConfMan.getInt("midi_gain") - 10);
if (res)
warning("error setting EAS master volume: %d", res);
res = _openStreamFunc(_EASHandle, &_midiStream, 0); res = _openStreamFunc(_EASHandle, &_midiStream, 0);
if (res) { if (res) {
close(); close();