empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed build issues for Libretro and Linux

Browse source
This commit is contained in:
Sour 2018-08-03 22:49:10 -04:00
parent bdd4d826dc
commit 27ee26c6cb
6 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Core/EmulationSettings.h
View file

@ -547,7 +547,7 @@ enum class StereoFilter
struct AudioFilterSettings
{
StereoFilter StereoFilter = StereoFilter::None;
StereoFilter Filter = StereoFilter::None;
double Angle = 0;
int32_t Delay = 0;
int32_t Strength = 0;

2
Core/Fk23C.h
View file

@ -129,7 +129,7 @@ protected:
}
}
void SelectCHRPage(uint16_t slot, uint16_t page, ChrMemoryType memoryType = ChrMemoryType::Default)
void SelectCHRPage(uint16_t slot, uint16_t page, ChrMemoryType memoryType = ChrMemoryType::Default) override
{
bool useChrRam = !HasChrRom() || (_selectChrRam && _chrRamSize > 0) || (_wramConfigEnabled && _ramInFirstChrBank && page <= 7);
BaseMapper::SelectCHRPage(slot, page, useChrRam ? ChrMemoryType::ChrRam : ChrMemoryType::ChrRom);

2
Core/SoundMixer.cpp
View file

@ -150,7 +150,7 @@ void SoundMixer::PlayAudioBuffer(uint32_t time)
_reverbFilter.ResetFilter();
}
switch(filterSettings.StereoFilter) {
switch(filterSettings.Filter) {
case StereoFilter::None: break;
case StereoFilter::Delay: _stereoDelay.ApplyFilter(_outputBuffer, sampleCount, _sampleRate, filterSettings.Delay); break;
case StereoFilter::Panning: _stereoPanning.ApplyFilter(_outputBuffer, sampleCount, filterSettings.Angle); break;

2
GUI.NET/Config/AudioInfo.cs
View file

@ -188,7 +188,7 @@ namespace Mesen.GUI.Config
InteropEmu.SetFlag(EmulationFlags.DisableNoiseModeFlag, audioInfo.DisableNoiseModeFlag);
InteropEmu.SetAudioFilterSettings(new InteropEmu.AudioFilterSettings() {
StereoFilter = audioInfo.StereoFilter,
Filter = audioInfo.StereoFilter,
Angle = (double)audioInfo.StereoPanningAngle / 180 * Math.PI,
Delay = audioInfo.StereoFilter == InteropEmu.StereoFilter.Delay ? audioInfo.StereoDelay : audioInfo.StereoCombFilterDelay,
Strength = audioInfo.StereoCombFilterStrength,

2
GUI.NET/InteropEmu.cs
View file

@ -1052,7 +1052,7 @@ namespace Mesen.GUI
public struct AudioFilterSettings
{
public StereoFilter StereoFilter;
public StereoFilter Filter;
public double Angle;
public Int32 Delay;
public Int32 Strength;

8
Libretro/libretro.cpp
View file

@ -317,11 +317,13 @@ extern "C" {
var.key = MesenFakeStereo;
if(retroEnv(RETRO_ENVIRONMENT_GET_VARIABLE, &var)) {
string value = string(var.value);
AudioFilterSettings settings;
if(value == "enabled") {
_console->GetSettings()->SetStereoFilter(StereoFilter::Delay);
_console->GetSettings()->SetStereoDelay(15);
settings.Filter = StereoFilter::Delay;
settings.Delay = 15;
_console->GetSettings()->SetAudioFilterSettings(settings);
} else {
_console->GetSettings()->SetStereoFilter(StereoFilter::None);
_console->GetSettings()->SetAudioFilterSettings(settings);
}
}