diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 530659f8..251620a3 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -2,7 +2,7 @@ name: "Linux build" on: push jobs: - win-build: + linux-build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -13,8 +13,8 @@ jobs: - name: Build run: | make - # - name: Upload binary - # uses: actions/upload-artifact@v1 - # with: - # name: Mesen-win - # path: bin/Any CPU/Release/Mesen.exe \ No newline at end of file + - name: Upload binary + uses: actions/upload-artifact@v1 + with: + name: Mesen-Linux + path: bin/x64/Release/Mesen.exe \ No newline at end of file diff --git a/Core/BaseMapper.cpp b/Core/BaseMapper.cpp index ff19cf62..1fa83ffd 100644 --- a/Core/BaseMapper.cpp +++ b/Core/BaseMapper.cpp @@ -511,10 +511,8 @@ void BaseMapper::StreamState(bool saving) ArrayInfo prgMemoryAccess = { _prgMemoryAccess, 0x100 }; ArrayInfo chrMemoryAccess = { _chrMemoryAccess, 0x40 }; SnapshotInfo epsmaudio{ _epsmaudio.get() }; - SnapshotInfo invA13Audio{ _invA13Audio.get() }; - SnapshotInfo invOE1Audio{ _invOE1Audio.get() }; - Stream(_mirroringType, chrRam, workRam, saveRam, nametableRam, prgMemoryOffset, chrMemoryOffset, prgMemoryType, chrMemoryType, prgMemoryAccess, chrMemoryAccess, epsmaudio, invA13Audio, invOE1Audio); + Stream(_mirroringType, chrRam, workRam, saveRam, nametableRam, prgMemoryOffset, chrMemoryOffset, prgMemoryType, chrMemoryType, prgMemoryAccess, chrMemoryAccess, epsmaudio); if(!saving) { RestorePrgChrState(); @@ -642,8 +640,6 @@ void BaseMapper::Initialize(RomData &romData) InitMapper(); InitMapper(romData); _epsmaudio.reset(new EPSMAudio(_console)); - _invA13Audio.reset(new InvA13Audio(_console)); - _invOE1Audio.reset(new InvOE1Audio(_console)); //Load battery data if present LoadBattery(); diff --git a/Core/BaseMapper.h b/Core/BaseMapper.h index 3584c0f0..f390eb3b 100644 --- a/Core/BaseMapper.h +++ b/Core/BaseMapper.h @@ -11,8 +11,6 @@ #include "Console.h" #include "CPU.h" #include "EPSMAudio.h" -#include "InvA13Audio.h" -#include "InvOE1Audio.h" class BaseControlDevice; @@ -161,8 +159,6 @@ public: static constexpr uint32_t NametableCount = 0x10; static constexpr uint32_t NametableSize = 0x400; unique_ptr _epsmaudio; - unique_ptr _invA13Audio; - unique_ptr _invOE1Audio; void Initialize(RomData &romData); virtual ~BaseMapper(); @@ -172,13 +168,7 @@ public: virtual void SetNesModel(NesModel model) { } virtual void ProcessCpuClock() { } - void ProcessMiscClock() - { - _epsmaudio->Clock(); - _invA13Audio->Clock(); - _invOE1Audio->Clock(); - } - + virtual void ProcessEPSMClock() { _epsmaudio->Clock(); } virtual void NotifyVRAMAddressChange(uint16_t addr); virtual void GetMemoryRanges(MemoryRanges &ranges) override; diff --git a/Core/Console.cpp b/Core/Console.cpp index ee61be78..9b03835c 100644 --- a/Core/Console.cpp +++ b/Core/Console.cpp @@ -465,23 +465,11 @@ bool Console::Initialize(VirtualFile &romFile, VirtualFile &patchFile, bool forP void Console::ProcessCpuClock() { - ProcessInterferenceAudio(); + _mapper->ProcessEPSMClock(); _mapper->ProcessCpuClock(); - _mapper->ProcessMiscClock(); _apu->ProcessCpuClock(); } -void Console::ProcessInterferenceAudio() -{ - _InvA13 = _ppu->_A13pinLowSum; - _ppu->_A13pinLowSum = 0; - - _InvOE1 = !_controlManager->GetInvOE1(_controlManager->_address); // invert relative to 2A03 - - if (_controlManager->_strobed == true) - _controlManager->_strobed = false; -} - CPU* Console::GetCpu() { return _cpu.get(); diff --git a/Core/Console.h b/Core/Console.h index e37ed33a..96fb7786 100644 --- a/Core/Console.h +++ b/Core/Console.h @@ -117,9 +117,6 @@ public: void Init(); void Release(bool forShutdown); - uint8_t _InvA13; - uint8_t _InvOE1; - shared_ptr GetBatteryManager(); shared_ptr GetSaveStateManager(); shared_ptr GetVideoDecoder(); @@ -134,7 +131,6 @@ public: bool IsMaster(); void ProcessCpuClock(); - void ProcessInterferenceAudio(); CPU* GetCpu(); PPU* GetPpu(); APU* GetApu(); diff --git a/Core/ControlManager.cpp b/Core/ControlManager.cpp index bc5045ef..60ce1f85 100644 --- a/Core/ControlManager.cpp +++ b/Core/ControlManager.cpp @@ -333,12 +333,10 @@ uint8_t ControlManager::ReadRAM(uint16_t addr) { //Used for lag counter - any frame where the input is read does not count as lag _isLagging = false; - _address = addr; uint8_t value = _console->GetMemoryManager()->GetOpenBus(GetOpenBusMask(addr - 0x4016)); for(shared_ptr &device : _controlDevices) { value |= device->ReadRAM(addr); - _strobed = true; } return value; @@ -351,14 +349,6 @@ void ControlManager::WriteRAM(uint16_t addr, uint8_t value) } } -bool ControlManager::GetInvOE1(uint16_t addr) -{ - // pull low for only one clock - if (addr == 0x4016) - _OE1pinLow = !_strobed; - return _OE1pinLow; -} - void ControlManager::Reset(bool softReset) { ResetLagCounter(); diff --git a/Core/ControlManager.h b/Core/ControlManager.h index 1b590734..c26f4ef2 100644 --- a/Core/ControlManager.h +++ b/Core/ControlManager.h @@ -43,10 +43,6 @@ protected: virtual uint8_t GetOpenBusMask(uint8_t port); public: - bool _OE1pinLow; - uint16_t _address; - bool _strobed; - ControlManager(shared_ptr console, shared_ptr systemActionManager, shared_ptr mapperControlDevice); virtual ~ControlManager(); @@ -84,6 +80,4 @@ public: virtual uint8_t ReadRAM(uint16_t addr) override; virtual void WriteRAM(uint16_t addr, uint8_t value) override; - - bool GetInvOE1(uint16_t addr); }; diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj index 615ff6a0..aacba312 100644 --- a/Core/Core.vcxproj +++ b/Core/Core.vcxproj @@ -574,8 +574,6 @@ - - diff --git a/Core/Core.vcxproj.filters b/Core/Core.vcxproj.filters index a2bb3584..48f65df0 100644 --- a/Core/Core.vcxproj.filters +++ b/Core/Core.vcxproj.filters @@ -1523,8 +1523,6 @@ Nes\Mappers\EPSG - - diff --git a/Core/Debugger.cpp b/Core/Debugger.cpp index 3114411e..9af58c56 100644 --- a/Core/Debugger.cpp +++ b/Core/Debugger.cpp @@ -1003,8 +1003,16 @@ bool Debugger::SleepUntilResume(BreakSource source, uint32_t breakpointId, Break _executionStopped = true; _pausedForDebugHelper = breakRequested; + int whilePausedRunCounter = 0; while((((stepCount == 0 || _breakRequested) && _suspendCount == 0) || _preventResume > 0) && !_stopFlag) { std::this_thread::sleep_for(std::chrono::duration(10)); + if (preventResume == 0) { + whilePausedRunCounter++; + if (whilePausedRunCounter > 10) { + ProcessEvent(EventType::WhilePaused); + whilePausedRunCounter = 0; + } + } if(stepCount == 0) { _console->ResetRunTimers(); } diff --git a/Core/DebuggerTypes.h b/Core/DebuggerTypes.h index 0669785b..b9f7b2ea 100644 --- a/Core/DebuggerTypes.h +++ b/Core/DebuggerTypes.h @@ -203,6 +203,7 @@ enum class EventType SpriteZeroHit = 9, ScriptEnded = 10, BusConflict = 11, + WhilePaused = 12, EventTypeSize }; diff --git a/Core/EPSMAudio.h b/Core/EPSMAudio.h index 66744fe6..8ee7e6b0 100644 --- a/Core/EPSMAudio.h +++ b/Core/EPSMAudio.h @@ -168,7 +168,7 @@ protected: ArrayInfo lastOutputs{ _lastOutputs, 2 }; ArrayInfo currentOutputs{ _currentOutputs, 2 }; - ArrayInfo inputBuffer{ &_inputBuffer }; + ArrayInfo inputBuffer{ _inputBuffer.data(), INPUT_BUFFER_SIZE }; ValueInfo chip{ &_chip }; ValueInfo clock { &_clock }; Stream(lastOutputs, currentOutputs, inputBuffer, chip, clock); @@ -239,7 +239,7 @@ protected: virtual uint32_t GetSSGClockFrequency() override { - return EPSMSSGAudio::GetSSGClockFrequency() * (_console->GetSettings()->GetEPSMClockFrequency() / 3579545 ); + return _console->GetSettings()->GetEPSMClockFrequency() / 4; } public: diff --git a/Core/EmulationSettings.h b/Core/EmulationSettings.h index e7075c22..caff0b89 100644 --- a/Core/EmulationSettings.h +++ b/Core/EmulationSettings.h @@ -119,9 +119,6 @@ enum class AudioChannel Sunsoft5B = 10, EPSM_L = 11, EPSM_R = 12, - InvA13 = 13, - InvOE1 = 14, - MaxChannelCount }; enum class EqualizerFilterType @@ -663,40 +660,8 @@ private: bool _audioSettingsChanged = false; uint32_t _audioLatency = 50; uint32_t _EPSMClockFrequency = 3579545; - double _channelVolume[15] = { - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 1.0 - }; - double _channelPanning[15] = { - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 0.0, - 2.0, - 1.0, - 1.0 - }; + double _channelVolume[13] = { 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 }; + double _channelPanning[13] = { 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 0.0, 2.0 }; EqualizerFilterType _equalizerFilterType = EqualizerFilterType::None; vector _bandGains = { 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 }; vector _bands = { { 40,56,80,113,160,225,320,450,600,750,1000,2000,3000,4000,5000,6000,7000,10000,12500,15000 } }; diff --git a/Core/InvA13Audio.h b/Core/InvA13Audio.h deleted file mode 100644 index 4f10b355..00000000 --- a/Core/InvA13Audio.h +++ /dev/null @@ -1,41 +0,0 @@ -#pragma once -#include "stdafx.h" -#include "Snapshotable.h" -#include "APU.h" -#include "BaseExpansionAudio.h" -#include "Console.h" - -#include - -class InvA13Audio : public BaseExpansionAudio -{ -private: - int8_t _currentOutput; - int8_t _lastOutput; - - void UpdateOutputLevel() - { - if (_currentOutput != _lastOutput) { - _console->GetApu()->AddExpansionAudioDelta(AudioChannel::InvA13, _currentOutput - _lastOutput); - _lastOutput = _currentOutput; - } - } - -protected: - void StreamState(bool saving) override - { - } - - void ClockAudio() override - { - _currentOutput = _console->_InvA13; - UpdateOutputLevel(); - } - -public: - InvA13Audio(shared_ptr console) : BaseExpansionAudio(console) - { - _lastOutput = 0; - _currentOutput = 0; - } -}; \ No newline at end of file diff --git a/Core/InvOE1Audio.h b/Core/InvOE1Audio.h deleted file mode 100644 index 81f519f7..00000000 --- a/Core/InvOE1Audio.h +++ /dev/null @@ -1,41 +0,0 @@ -#pragma once -#include "stdafx.h" -#include "Snapshotable.h" -#include "APU.h" -#include "BaseExpansionAudio.h" -#include "Console.h" - -#include - -class InvOE1Audio : public BaseExpansionAudio -{ -private: - int8_t _currentOutput; - int8_t _lastOutput; - - void UpdateOutputLevel() - { - if (_currentOutput != _lastOutput) { - _console->GetApu()->AddExpansionAudioDelta(AudioChannel::InvOE1, _currentOutput - _lastOutput); - _lastOutput = _currentOutput; - } - } - -protected: - void StreamState(bool saving) override - { - } - - void ClockAudio() override - { - _currentOutput = _console->_InvOE1; - UpdateOutputLevel(); - } - -public: - InvOE1Audio(shared_ptr console) : BaseExpansionAudio(console) - { - _lastOutput = 0; - _currentOutput = 0; - } -}; \ No newline at end of file diff --git a/Core/LuaApi.cpp b/Core/LuaApi.cpp index 54816aa4..f41a2cfb 100644 --- a/Core/LuaApi.cpp +++ b/Core/LuaApi.cpp @@ -87,6 +87,8 @@ int LuaApi::GetLibrary(lua_State *lua) { "reset", LuaApi::Reset }, { "stop", LuaApi::Stop }, { "breakExecution", LuaApi::Break }, + { "stepOver", LuaApi::StepOver }, + { "stepOut", LuaApi::StepOut }, { "resume", LuaApi::Resume }, { "execute", LuaApi::Execute }, { "rewind", LuaApi::Rewind }, @@ -168,6 +170,7 @@ int LuaApi::GetLibrary(lua_State *lua) lua_pushintvalue(stateSaved, EventType::StateSaved); lua_pushintvalue(inputPolled, EventType::InputPolled); lua_pushintvalue(scriptEnded, EventType::ScriptEnded); + lua_pushintvalue(whilePaused, EventType::WhilePaused); lua_settable(lua, -3); lua_pushliteral(lua, "executeCountType"); @@ -584,6 +587,24 @@ int LuaApi::Execute(lua_State *lua) return l.ReturnCount(); } +int LuaApi::StepOut(lua_State* lua) +{ + LuaCallHelper l(lua); + checkparams(); + checkinitdone(); + _debugger->StepOut(); + return l.ReturnCount(); +} + +int LuaApi::StepOver(lua_State* lua) +{ + LuaCallHelper l(lua); + checkparams(); + checkinitdone(); + _debugger->StepOver(); + return l.ReturnCount(); +} + int LuaApi::Rewind(lua_State *lua) { LuaCallHelper l(lua); diff --git a/Core/LuaApi.h b/Core/LuaApi.h index f4c7e659..dee03815 100644 --- a/Core/LuaApi.h +++ b/Core/LuaApi.h @@ -49,6 +49,8 @@ public: static int Break(lua_State *lua); static int Resume(lua_State *lua); static int Execute(lua_State *lua); + static int StepOut(lua_State* lua); + static int StepOver(lua_State* lua); static int Rewind(lua_State *lua); static int TakeScreenshot(lua_State *lua); diff --git a/Core/PPU.cpp b/Core/PPU.cpp index 1ee1d1bb..c3c86db0 100644 --- a/Core/PPU.cpp +++ b/Core/PPU.cpp @@ -463,12 +463,6 @@ void PPU::WriteRAM(uint16_t addr, uint8_t value) } } -void PPU::GetInvA13() -{ - // pull level high when PPU/VRAM addr bit 13 is low - _A13pinLowSum += (bool)(_ppuBusAddress & 0x2000); // invert relative to 2A03 -} - uint8_t PPU::ReadPaletteRAM(uint16_t addr) { addr &= 0x1F; @@ -1351,7 +1345,6 @@ void PPU::Exec() if(_needStateUpdate) { UpdateState(); } - GetInvA13(); } void PPU::UpdateState() diff --git a/Core/PPU.h b/Core/PPU.h index f68f9454..75504186 100644 --- a/Core/PPU.h +++ b/Core/PPU.h @@ -179,8 +179,6 @@ class PPU : public IMemoryHandler, public Snapshotable static constexpr int32_t PixelCount = 256*240; static constexpr int32_t OutputBufferSize = 256*240*2; static constexpr int32_t OamDecayCycleCount = 3000; - - uint8_t _A13pinLowSum; PPU(shared_ptr console); virtual ~PPU(); @@ -214,8 +212,6 @@ class PPU : public IMemoryHandler, public Snapshotable void Exec(); __forceinline void Run(uint64_t runTo); - void GetInvA13(); - uint32_t GetFrameCount() { return _frameCount; diff --git a/Core/SoundMixer.cpp b/Core/SoundMixer.cpp index 854e2cda..7ff27191 100644 --- a/Core/SoundMixer.cpp +++ b/Core/SoundMixer.cpp @@ -276,9 +276,7 @@ int16_t SoundMixer::GetOutputVolume(bool forRightChannel) GetChannelOutput(AudioChannel::VRC7, forRightChannel) + #endif GetChannelOutput(AudioChannel::EPSM_L, forRightChannel) * 4 + - GetChannelOutput(AudioChannel::EPSM_R, forRightChannel) * 4 + - (GetChannelOutput(AudioChannel::InvA13, forRightChannel) * 20) / 3.0 + // 3 PPU samples per CPU clock - GetChannelOutput(AudioChannel::InvOE1, forRightChannel) * 100 + GetChannelOutput(AudioChannel::EPSM_R, forRightChannel) * 4 ); } diff --git a/Core/SoundMixer.h b/Core/SoundMixer.h index 7f3a1f23..61a06541 100644 --- a/Core/SoundMixer.h +++ b/Core/SoundMixer.h @@ -30,7 +30,7 @@ public: private: static constexpr uint32_t MaxSampleRate = 96000; static constexpr uint32_t MaxSamplesPerFrame = MaxSampleRate / 60 * 4 * 2; //x4 to allow CPU overclocking up to 10x, x2 for panning stereo - static constexpr uint32_t MaxChannelCount = (uint32_t)AudioChannel::MaxChannelCount; + static constexpr uint32_t MaxChannelCount = 13; IAudioDevice* _audioDevice; EmulationSettings* _settings; diff --git a/GUI.NET/Config/AudioInfo.cs b/GUI.NET/Config/AudioInfo.cs index 01091300..51eef6fb 100644 --- a/GUI.NET/Config/AudioInfo.cs +++ b/GUI.NET/Config/AudioInfo.cs @@ -26,8 +26,6 @@ namespace Mesen.GUI.Config [MinMax(0, 100)] public UInt32 Sunsoft5bVolume = 100; [MinMax(0, 100)] public UInt32 EPSMVolume_L = 50; [MinMax(0, 100)] public UInt32 EPSMVolume_R = 50; - [MinMax(0, 100)] public UInt32 InvA13Volume = 0; - [MinMax(0, 100)] public UInt32 InvOE1Volume = 0; [MinMax(10000, 32000000)] public UInt32 EPSMClockFrequency = 3579545; @@ -44,8 +42,6 @@ namespace Mesen.GUI.Config [MinMax(-100, 100)] public Int32 Sunsoft5bPanning = 0; [MinMax(-100, 100)] public Int32 EPSMPanning_L = -100; [MinMax(-100, 100)] public Int32 EPSMPanning_R = 100; - [MinMax(-100, 100)] public Int32 InvA13Panning = 0; - [MinMax(-100, 100)] public Int32 InvOE1Panning = 0; [ValidValues(11025, 22050, 44100, 48000, 96000)] public UInt32 SampleRate = 48000; public bool ReduceSoundInBackground = true; @@ -129,8 +125,6 @@ namespace Mesen.GUI.Config InteropEmu.SetChannelVolume(AudioChannel.EPSM_R, ConvertVolume(audioInfo.EPSMVolume_R)); InteropEmu.SetChannelVolume(AudioChannel.EPSM_L, audioInfo.EnableEPSM ? AudioInfo.ConvertVolume(audioInfo.EPSMVolume_L) : 0); InteropEmu.SetChannelVolume(AudioChannel.EPSM_R, audioInfo.EnableEPSM ? AudioInfo.ConvertVolume(audioInfo.EPSMVolume_R) : 0); - InteropEmu.SetChannelVolume(AudioChannel.InvA13, ConvertVolume(audioInfo.InvA13Volume)); - InteropEmu.SetChannelVolume(AudioChannel.InvOE1, ConvertVolume(audioInfo.InvOE1Volume)); InteropEmu.SetChannelPanning(AudioChannel.Square1, ConvertPanning(audioInfo.Square1Panning)); InteropEmu.SetChannelPanning(AudioChannel.Square2, ConvertPanning(audioInfo.Square2Panning)); @@ -145,8 +139,6 @@ namespace Mesen.GUI.Config InteropEmu.SetChannelPanning(AudioChannel.Sunsoft5B, ConvertPanning(audioInfo.Sunsoft5bPanning)); InteropEmu.SetChannelPanning(AudioChannel.EPSM_L, ConvertPanning(audioInfo.EPSMPanning_L)); InteropEmu.SetChannelPanning(AudioChannel.EPSM_R, ConvertPanning(audioInfo.EPSMPanning_R)); - InteropEmu.SetChannelPanning(AudioChannel.InvA13, ConvertPanning(audioInfo.InvA13Panning)); - InteropEmu.SetChannelPanning(AudioChannel.InvOE1, ConvertPanning(audioInfo.InvOE1Panning)); InteropEmu.SetEPSMClockFrequency(audioInfo.EPSMClockFrequency); diff --git a/GUI.NET/Debugger/frmScript.cs b/GUI.NET/Debugger/frmScript.cs index 3b7614a2..ace1019d 100644 --- a/GUI.NET/Debugger/frmScript.cs +++ b/GUI.NET/Debugger/frmScript.cs @@ -535,6 +535,8 @@ namespace Mesen.GUI.Debugger new List {"func","emu.breakExecution","emu.breakExecution()","","","Breaks the execution of the game and displays the debugger window."}, new List {"func","emu.stop","emu.stop()","","","Stops execution of the game."}, new List {"func","emu.execute","emu.execute(count, type)","count - *Integer* The number of cycles or instructions to run before breaking\ntype - *Enum* See executeCountType","","Runs the emulator for the specified number of cycles/instructions and then breaks the execution."}, + new List {"func","emu.stepOver", "emu.stepOver()", "","","Step over the next instruction."}, + new List {"func","emu.stepOut", "emu.stepOut()", "","","Step out of the subroutine."}, new List {"func","emu.reset","emu.reset()","","","Resets the current game."}, new List {"func","emu.resume","emu.resume()","","","Resumes execution after breaking."}, new List {"func","emu.rewind","emu.rewind(seconds)","seconds - *Integer* The number of seconds to rewind","","Instantly rewinds the emulation by the number of seconds specified.\n Note: this can only be called from within a 'StartFrame' event callback."}, @@ -578,6 +580,7 @@ namespace Mesen.GUI.Debugger new List {"enum","emu.eventType.inputPolled","Triggered when the emulation core polls the state of the input devices for the next frame","","",""}, new List {"enum","emu.eventType.spriteZeroHit","Triggered when the PPU sets the sprite zero hit flag","","",""}, new List {"enum","emu.eventType.scriptEnded","Triggered when the current Lua script ends (script window closed, execution stopped, etc.)","","",""}, + new List {"enum","emu.eventType.whilePaused","Triggered repeatedly while execution is paused","","",""}, new List {"enum","emu.executeCountType","emu.executeCountType.[value]","","","Values:\ncpuCycles = 0,\nppuCycles = 1,\ncpuInstructions = 2\n\nUsed by execute calls." }, new List {"enum","emu.executeCountType.cpuCycles","Count the number of CPU cycles","","",""}, new List {"enum","emu.executeCountType.ppuCycles","Count the number of PPU cycles","","",""}, diff --git a/GUI.NET/Forms/Config/frmAudioConfig.Designer.cs b/GUI.NET/Forms/Config/frmAudioConfig.Designer.cs index b696a6cb..d3182d7c 100644 --- a/GUI.NET/Forms/Config/frmAudioConfig.Designer.cs +++ b/GUI.NET/Forms/Config/frmAudioConfig.Designer.cs @@ -37,16 +37,14 @@ namespace Mesen.GUI.Forms.Config this.trkSquare2Vol = new Mesen.GUI.Controls.ctrlTrackbar(); this.trkSquare1Vol = new Mesen.GUI.Controls.ctrlTrackbar(); this.trkMaster = new Mesen.GUI.Controls.ctrlTrackbar(); - this.trkSunsoft5b = new Mesen.GUI.Controls.ctrlTrackbar(); this.trkFdsVol = new Mesen.GUI.Controls.ctrlTrackbar(); this.trkMmc5Vol = new Mesen.GUI.Controls.ctrlTrackbar(); this.trkVrc6Vol = new Mesen.GUI.Controls.ctrlTrackbar(); this.trkVrc7Vol = new Mesen.GUI.Controls.ctrlTrackbar(); this.trkNamco163Vol = new Mesen.GUI.Controls.ctrlTrackbar(); + this.trkSunsoft5b = new Mesen.GUI.Controls.ctrlTrackbar(); this.trkEPSMVol_L = new Mesen.GUI.Controls.ctrlTrackbar(); this.trkEPSMVol_R = new Mesen.GUI.Controls.ctrlTrackbar(); - this.trkInvA13Vol = new Mesen.GUI.Controls.ctrlTrackbar(); - this.trkInvOE1Vol = new Mesen.GUI.Controls.ctrlTrackbar(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.chkEnableAudio = new System.Windows.Forms.CheckBox(); this.chkEnableEPSM = new System.Windows.Forms.CheckBox(); @@ -73,20 +71,18 @@ namespace Mesen.GUI.Forms.Config this.tpgPanning = new System.Windows.Forms.TabPage(); this.tableLayoutPanel6 = new System.Windows.Forms.TableLayoutPanel(); this.trkSquare1Pan = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); + this.trkFdsPan = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); this.trkSquare2Pan = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); + this.trkMmc5Pan = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); this.trkTrianglePan = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); this.trkNoisePan = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); this.trkDmcPan = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.trkSunsoftPan = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.trkFdsPan = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.trkMmc5Pan = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); this.trkVrc6Pan = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); this.trkVrc7Pan = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); this.trkNamcoPan = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); + this.trkSunsoftPan = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); this.trkEPSMPan_L = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); this.trkEPSMPan_R = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.trkInvA13Pan = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.trkInvOE1Pan = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); this.tpgEqualizer = new System.Windows.Forms.TabPage(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.chkEnableEqualizer = new System.Windows.Forms.CheckBox(); @@ -190,70 +186,70 @@ namespace Mesen.GUI.Forms.Config // baseConfigPanel // this.baseConfigPanel.Controls.Add(this.btnReset); - this.baseConfigPanel.Location = new System.Drawing.Point(0, 427); - this.baseConfigPanel.Size = new System.Drawing.Size(477, 29); + this.baseConfigPanel.Location = new System.Drawing.Point(0, 550); + this.baseConfigPanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.baseConfigPanel.Size = new System.Drawing.Size(703, 38); this.baseConfigPanel.Controls.SetChildIndex(this.btnReset, 0); // // grpVolume // this.grpVolume.Controls.Add(this.tableLayoutPanel1); this.grpVolume.Dock = System.Windows.Forms.DockStyle.Fill; - this.grpVolume.Location = new System.Drawing.Point(3, 3); + this.grpVolume.Location = new System.Drawing.Point(4, 4); + this.grpVolume.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.grpVolume.Name = "grpVolume"; - this.grpVolume.Size = new System.Drawing.Size(463, 389); + this.grpVolume.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.grpVolume.Size = new System.Drawing.Size(687, 512); this.grpVolume.TabIndex = 2; this.grpVolume.TabStop = false; this.grpVolume.Text = "Volume"; // // tableLayoutPanel1 // - this.tableLayoutPanel1.ColumnCount = 8; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); + this.tableLayoutPanel1.ColumnCount = 7; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel1.Controls.Add(this.trkDmcVol, 5, 0); this.tableLayoutPanel1.Controls.Add(this.trkNoiseVol, 4, 0); this.tableLayoutPanel1.Controls.Add(this.trkTriangleVol, 3, 0); this.tableLayoutPanel1.Controls.Add(this.trkSquare2Vol, 2, 0); this.tableLayoutPanel1.Controls.Add(this.trkSquare1Vol, 1, 0); this.tableLayoutPanel1.Controls.Add(this.trkMaster, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.trkFdsVol, 0, 1); + this.tableLayoutPanel1.Controls.Add(this.trkMmc5Vol, 1, 1); + this.tableLayoutPanel1.Controls.Add(this.trkVrc6Vol, 2, 1); + this.tableLayoutPanel1.Controls.Add(this.trkVrc7Vol, 3, 1); + this.tableLayoutPanel1.Controls.Add(this.trkNamco163Vol, 4, 1); this.tableLayoutPanel1.Controls.Add(this.trkSunsoft5b, 6, 0); - this.tableLayoutPanel1.Controls.Add(this.trkFdsVol, 7, 0); - this.tableLayoutPanel1.Controls.Add(this.trkMmc5Vol, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.trkVrc6Vol, 1, 1); - this.tableLayoutPanel1.Controls.Add(this.trkVrc7Vol, 2, 1); - this.tableLayoutPanel1.Controls.Add(this.trkNamco163Vol, 3, 1); - this.tableLayoutPanel1.Controls.Add(this.trkEPSMVol_L, 4, 1); - this.tableLayoutPanel1.Controls.Add(this.trkEPSMVol_R, 5, 1); - this.tableLayoutPanel1.Controls.Add(this.trkInvA13Vol, 6, 1); - this.tableLayoutPanel1.Controls.Add(this.trkInvOE1Vol, 7, 1); + this.tableLayoutPanel1.Controls.Add(this.trkEPSMVol_L, 5, 1); + this.tableLayoutPanel1.Controls.Add(this.trkEPSMVol_R, 6, 1); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 16); + this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 20); + this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(457, 370); + this.tableLayoutPanel1.RowCount = 3; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 26F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(679, 488); this.tableLayoutPanel1.TabIndex = 2; // // trkDmcVol // this.trkDmcVol.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkDmcVol.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.trkDmcVol.Location = new System.Drawing.Point(285, 0); + this.trkDmcVol.Location = new System.Drawing.Point(420, 0); this.trkDmcVol.Margin = new System.Windows.Forms.Padding(0); this.trkDmcVol.Maximum = 100; - this.trkDmcVol.MaximumSize = new System.Drawing.Size(63, 0); + this.trkDmcVol.MaximumSize = new System.Drawing.Size(84, 209); this.trkDmcVol.Minimum = 0; - this.trkDmcVol.MinimumSize = new System.Drawing.Size(40, 185); + this.trkDmcVol.MinimumSize = new System.Drawing.Size(84, 209); this.trkDmcVol.Name = "trkDmcVol"; - this.trkDmcVol.Size = new System.Drawing.Size(57, 185); + this.trkDmcVol.Size = new System.Drawing.Size(84, 209); this.trkDmcVol.TabIndex = 16; this.trkDmcVol.Text = "DMC"; this.trkDmcVol.Value = 50; @@ -261,15 +257,14 @@ namespace Mesen.GUI.Forms.Config // trkNoiseVol // this.trkNoiseVol.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkNoiseVol.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.trkNoiseVol.Location = new System.Drawing.Point(228, 0); + this.trkNoiseVol.Location = new System.Drawing.Point(336, 0); this.trkNoiseVol.Margin = new System.Windows.Forms.Padding(0); this.trkNoiseVol.Maximum = 100; - this.trkNoiseVol.MaximumSize = new System.Drawing.Size(63, 0); + this.trkNoiseVol.MaximumSize = new System.Drawing.Size(84, 209); this.trkNoiseVol.Minimum = 0; - this.trkNoiseVol.MinimumSize = new System.Drawing.Size(40, 185); + this.trkNoiseVol.MinimumSize = new System.Drawing.Size(84, 209); this.trkNoiseVol.Name = "trkNoiseVol"; - this.trkNoiseVol.Size = new System.Drawing.Size(57, 185); + this.trkNoiseVol.Size = new System.Drawing.Size(84, 209); this.trkNoiseVol.TabIndex = 15; this.trkNoiseVol.Text = "Noise"; this.trkNoiseVol.Value = 50; @@ -277,15 +272,14 @@ namespace Mesen.GUI.Forms.Config // trkTriangleVol // this.trkTriangleVol.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkTriangleVol.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.trkTriangleVol.Location = new System.Drawing.Point(171, 0); + this.trkTriangleVol.Location = new System.Drawing.Point(252, 0); this.trkTriangleVol.Margin = new System.Windows.Forms.Padding(0); this.trkTriangleVol.Maximum = 100; - this.trkTriangleVol.MaximumSize = new System.Drawing.Size(63, 0); + this.trkTriangleVol.MaximumSize = new System.Drawing.Size(84, 209); this.trkTriangleVol.Minimum = 0; - this.trkTriangleVol.MinimumSize = new System.Drawing.Size(40, 185); + this.trkTriangleVol.MinimumSize = new System.Drawing.Size(84, 209); this.trkTriangleVol.Name = "trkTriangleVol"; - this.trkTriangleVol.Size = new System.Drawing.Size(57, 185); + this.trkTriangleVol.Size = new System.Drawing.Size(84, 209); this.trkTriangleVol.TabIndex = 14; this.trkTriangleVol.Text = "Triangle"; this.trkTriangleVol.Value = 50; @@ -293,15 +287,14 @@ namespace Mesen.GUI.Forms.Config // trkSquare2Vol // this.trkSquare2Vol.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkSquare2Vol.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.trkSquare2Vol.Location = new System.Drawing.Point(114, 0); + this.trkSquare2Vol.Location = new System.Drawing.Point(168, 0); this.trkSquare2Vol.Margin = new System.Windows.Forms.Padding(0); this.trkSquare2Vol.Maximum = 100; - this.trkSquare2Vol.MaximumSize = new System.Drawing.Size(63, 0); + this.trkSquare2Vol.MaximumSize = new System.Drawing.Size(84, 209); this.trkSquare2Vol.Minimum = 0; - this.trkSquare2Vol.MinimumSize = new System.Drawing.Size(40, 185); + this.trkSquare2Vol.MinimumSize = new System.Drawing.Size(84, 209); this.trkSquare2Vol.Name = "trkSquare2Vol"; - this.trkSquare2Vol.Size = new System.Drawing.Size(57, 185); + this.trkSquare2Vol.Size = new System.Drawing.Size(84, 209); this.trkSquare2Vol.TabIndex = 13; this.trkSquare2Vol.Text = "Square 2"; this.trkSquare2Vol.Value = 50; @@ -309,15 +302,14 @@ namespace Mesen.GUI.Forms.Config // trkSquare1Vol // this.trkSquare1Vol.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkSquare1Vol.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.trkSquare1Vol.Location = new System.Drawing.Point(57, 0); + this.trkSquare1Vol.Location = new System.Drawing.Point(84, 0); this.trkSquare1Vol.Margin = new System.Windows.Forms.Padding(0); this.trkSquare1Vol.Maximum = 100; - this.trkSquare1Vol.MaximumSize = new System.Drawing.Size(63, 0); + this.trkSquare1Vol.MaximumSize = new System.Drawing.Size(84, 209); this.trkSquare1Vol.Minimum = 0; - this.trkSquare1Vol.MinimumSize = new System.Drawing.Size(40, 185); + this.trkSquare1Vol.MinimumSize = new System.Drawing.Size(84, 209); this.trkSquare1Vol.Name = "trkSquare1Vol"; - this.trkSquare1Vol.Size = new System.Drawing.Size(57, 185); + this.trkSquare1Vol.Size = new System.Drawing.Size(84, 209); this.trkSquare1Vol.TabIndex = 12; this.trkSquare1Vol.Text = "Square 1"; this.trkSquare1Vol.Value = 50; @@ -325,47 +317,29 @@ namespace Mesen.GUI.Forms.Config // trkMaster // this.trkMaster.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkMaster.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.trkMaster.Location = new System.Drawing.Point(0, 0); this.trkMaster.Margin = new System.Windows.Forms.Padding(0); this.trkMaster.Maximum = 100; - this.trkMaster.MaximumSize = new System.Drawing.Size(63, 0); + this.trkMaster.MaximumSize = new System.Drawing.Size(84, 209); this.trkMaster.Minimum = 0; - this.trkMaster.MinimumSize = new System.Drawing.Size(40, 185); + this.trkMaster.MinimumSize = new System.Drawing.Size(84, 209); this.trkMaster.Name = "trkMaster"; - this.trkMaster.Size = new System.Drawing.Size(57, 185); + this.trkMaster.Size = new System.Drawing.Size(84, 209); this.trkMaster.TabIndex = 11; this.trkMaster.Text = "Master"; this.trkMaster.Value = 50; // - // trkSunsoft5b - // - this.trkSunsoft5b.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkSunsoft5b.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.trkSunsoft5b.Location = new System.Drawing.Point(342, 0); - this.trkSunsoft5b.Margin = new System.Windows.Forms.Padding(0); - this.trkSunsoft5b.Maximum = 100; - this.trkSunsoft5b.MaximumSize = new System.Drawing.Size(63, 0); - this.trkSunsoft5b.Minimum = 0; - this.trkSunsoft5b.MinimumSize = new System.Drawing.Size(40, 185); - this.trkSunsoft5b.Name = "trkSunsoft5b"; - this.trkSunsoft5b.Size = new System.Drawing.Size(57, 185); - this.trkSunsoft5b.TabIndex = 22; - this.trkSunsoft5b.Text = "Sunsoft"; - this.trkSunsoft5b.Value = 50; - // // trkFdsVol // this.trkFdsVol.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkFdsVol.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.trkFdsVol.Location = new System.Drawing.Point(399, 0); + this.trkFdsVol.Location = new System.Drawing.Point(0, 209); this.trkFdsVol.Margin = new System.Windows.Forms.Padding(0); this.trkFdsVol.Maximum = 100; - this.trkFdsVol.MaximumSize = new System.Drawing.Size(63, 0); + this.trkFdsVol.MaximumSize = new System.Drawing.Size(84, 209); this.trkFdsVol.Minimum = 0; - this.trkFdsVol.MinimumSize = new System.Drawing.Size(40, 185); + this.trkFdsVol.MinimumSize = new System.Drawing.Size(84, 209); this.trkFdsVol.Name = "trkFdsVol"; - this.trkFdsVol.Size = new System.Drawing.Size(57, 185); + this.trkFdsVol.Size = new System.Drawing.Size(84, 209); this.trkFdsVol.TabIndex = 17; this.trkFdsVol.Text = "FDS"; this.trkFdsVol.Value = 50; @@ -373,15 +347,14 @@ namespace Mesen.GUI.Forms.Config // trkMmc5Vol // this.trkMmc5Vol.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkMmc5Vol.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.trkMmc5Vol.Location = new System.Drawing.Point(0, 185); + this.trkMmc5Vol.Location = new System.Drawing.Point(84, 209); this.trkMmc5Vol.Margin = new System.Windows.Forms.Padding(0); this.trkMmc5Vol.Maximum = 100; - this.trkMmc5Vol.MaximumSize = new System.Drawing.Size(63, 0); + this.trkMmc5Vol.MaximumSize = new System.Drawing.Size(84, 209); this.trkMmc5Vol.Minimum = 0; - this.trkMmc5Vol.MinimumSize = new System.Drawing.Size(40, 185); + this.trkMmc5Vol.MinimumSize = new System.Drawing.Size(84, 209); this.trkMmc5Vol.Name = "trkMmc5Vol"; - this.trkMmc5Vol.Size = new System.Drawing.Size(57, 185); + this.trkMmc5Vol.Size = new System.Drawing.Size(84, 209); this.trkMmc5Vol.TabIndex = 18; this.trkMmc5Vol.Text = "MMC5"; this.trkMmc5Vol.Value = 50; @@ -389,15 +362,14 @@ namespace Mesen.GUI.Forms.Config // trkVrc6Vol // this.trkVrc6Vol.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkVrc6Vol.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.trkVrc6Vol.Location = new System.Drawing.Point(57, 185); + this.trkVrc6Vol.Location = new System.Drawing.Point(168, 209); this.trkVrc6Vol.Margin = new System.Windows.Forms.Padding(0); this.trkVrc6Vol.Maximum = 100; - this.trkVrc6Vol.MaximumSize = new System.Drawing.Size(63, 0); + this.trkVrc6Vol.MaximumSize = new System.Drawing.Size(84, 209); this.trkVrc6Vol.Minimum = 0; - this.trkVrc6Vol.MinimumSize = new System.Drawing.Size(40, 185); + this.trkVrc6Vol.MinimumSize = new System.Drawing.Size(84, 209); this.trkVrc6Vol.Name = "trkVrc6Vol"; - this.trkVrc6Vol.Size = new System.Drawing.Size(57, 185); + this.trkVrc6Vol.Size = new System.Drawing.Size(84, 209); this.trkVrc6Vol.TabIndex = 19; this.trkVrc6Vol.Text = "VRC6"; this.trkVrc6Vol.Value = 50; @@ -405,15 +377,14 @@ namespace Mesen.GUI.Forms.Config // trkVrc7Vol // this.trkVrc7Vol.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkVrc7Vol.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.trkVrc7Vol.Location = new System.Drawing.Point(114, 185); + this.trkVrc7Vol.Location = new System.Drawing.Point(252, 209); this.trkVrc7Vol.Margin = new System.Windows.Forms.Padding(0); this.trkVrc7Vol.Maximum = 100; - this.trkVrc7Vol.MaximumSize = new System.Drawing.Size(63, 0); + this.trkVrc7Vol.MaximumSize = new System.Drawing.Size(84, 209); this.trkVrc7Vol.Minimum = 0; - this.trkVrc7Vol.MinimumSize = new System.Drawing.Size(40, 185); + this.trkVrc7Vol.MinimumSize = new System.Drawing.Size(84, 209); this.trkVrc7Vol.Name = "trkVrc7Vol"; - this.trkVrc7Vol.Size = new System.Drawing.Size(57, 185); + this.trkVrc7Vol.Size = new System.Drawing.Size(84, 209); this.trkVrc7Vol.TabIndex = 20; this.trkVrc7Vol.Text = "VRC7"; this.trkVrc7Vol.Value = 50; @@ -421,31 +392,44 @@ namespace Mesen.GUI.Forms.Config // trkNamco163Vol // this.trkNamco163Vol.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkNamco163Vol.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.trkNamco163Vol.Location = new System.Drawing.Point(171, 185); + this.trkNamco163Vol.Location = new System.Drawing.Point(336, 209); this.trkNamco163Vol.Margin = new System.Windows.Forms.Padding(0); this.trkNamco163Vol.Maximum = 100; - this.trkNamco163Vol.MaximumSize = new System.Drawing.Size(63, 0); + this.trkNamco163Vol.MaximumSize = new System.Drawing.Size(84, 209); this.trkNamco163Vol.Minimum = 0; - this.trkNamco163Vol.MinimumSize = new System.Drawing.Size(40, 185); + this.trkNamco163Vol.MinimumSize = new System.Drawing.Size(84, 209); this.trkNamco163Vol.Name = "trkNamco163Vol"; - this.trkNamco163Vol.Size = new System.Drawing.Size(57, 185); + this.trkNamco163Vol.Size = new System.Drawing.Size(84, 209); this.trkNamco163Vol.TabIndex = 21; this.trkNamco163Vol.Text = "Namco"; this.trkNamco163Vol.Value = 50; // + // trkSunsoft5b + // + this.trkSunsoft5b.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.trkSunsoft5b.Location = new System.Drawing.Point(549, 0); + this.trkSunsoft5b.Margin = new System.Windows.Forms.Padding(0); + this.trkSunsoft5b.Maximum = 100; + this.trkSunsoft5b.MaximumSize = new System.Drawing.Size(84, 209); + this.trkSunsoft5b.Minimum = 0; + this.trkSunsoft5b.MinimumSize = new System.Drawing.Size(84, 209); + this.trkSunsoft5b.Name = "trkSunsoft5b"; + this.trkSunsoft5b.Size = new System.Drawing.Size(84, 209); + this.trkSunsoft5b.TabIndex = 22; + this.trkSunsoft5b.Text = "Sunsoft"; + this.trkSunsoft5b.Value = 50; + // // trkEPSMVol_L // this.trkEPSMVol_L.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkEPSMVol_L.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.trkEPSMVol_L.Location = new System.Drawing.Point(228, 185); + this.trkEPSMVol_L.Location = new System.Drawing.Point(420, 209); this.trkEPSMVol_L.Margin = new System.Windows.Forms.Padding(0); this.trkEPSMVol_L.Maximum = 100; - this.trkEPSMVol_L.MaximumSize = new System.Drawing.Size(63, 0); + this.trkEPSMVol_L.MaximumSize = new System.Drawing.Size(84, 209); this.trkEPSMVol_L.Minimum = 0; - this.trkEPSMVol_L.MinimumSize = new System.Drawing.Size(40, 185); + this.trkEPSMVol_L.MinimumSize = new System.Drawing.Size(84, 209); this.trkEPSMVol_L.Name = "trkEPSMVol_L"; - this.trkEPSMVol_L.Size = new System.Drawing.Size(57, 185); + this.trkEPSMVol_L.Size = new System.Drawing.Size(84, 209); this.trkEPSMVol_L.TabIndex = 22; this.trkEPSMVol_L.Text = "EPSM Left"; this.trkEPSMVol_L.Value = 100; @@ -453,47 +437,18 @@ namespace Mesen.GUI.Forms.Config // trkEPSMVol_R // this.trkEPSMVol_R.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkEPSMVol_R.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.trkEPSMVol_R.Location = new System.Drawing.Point(285, 185); + this.trkEPSMVol_R.Location = new System.Drawing.Point(549, 209); this.trkEPSMVol_R.Margin = new System.Windows.Forms.Padding(0); this.trkEPSMVol_R.Maximum = 100; - this.trkEPSMVol_R.MaximumSize = new System.Drawing.Size(63, 0); + this.trkEPSMVol_R.MaximumSize = new System.Drawing.Size(84, 209); this.trkEPSMVol_R.Minimum = 0; - this.trkEPSMVol_R.MinimumSize = new System.Drawing.Size(40, 185); + this.trkEPSMVol_R.MinimumSize = new System.Drawing.Size(84, 209); this.trkEPSMVol_R.Name = "trkEPSMVol_R"; - this.trkEPSMVol_R.Size = new System.Drawing.Size(57, 185); + this.trkEPSMVol_R.Size = new System.Drawing.Size(84, 209); this.trkEPSMVol_R.TabIndex = 22; this.trkEPSMVol_R.Text = "EPSM Right"; this.trkEPSMVol_R.Value = 100; // - // trkInvA13Vol - // - this.trkInvA13Vol.Location = new System.Drawing.Point(342, 185); - this.trkInvA13Vol.Margin = new System.Windows.Forms.Padding(0); - this.trkInvA13Vol.Maximum = 100; - this.trkInvA13Vol.MaximumSize = new System.Drawing.Size(63, 0); - this.trkInvA13Vol.Minimum = 0; - this.trkInvA13Vol.MinimumSize = new System.Drawing.Size(40, 185); - this.trkInvA13Vol.Name = "trkInvA13Vol"; - this.trkInvA13Vol.Size = new System.Drawing.Size(57, 185); - this.trkInvA13Vol.TabIndex = 23; - this.trkInvA13Vol.Text = "/A13"; - this.trkInvA13Vol.Value = 50; - // - // trkInvOE1Vol - // - this.trkInvOE1Vol.Location = new System.Drawing.Point(399, 185); - this.trkInvOE1Vol.Margin = new System.Windows.Forms.Padding(0); - this.trkInvOE1Vol.Maximum = 100; - this.trkInvOE1Vol.MaximumSize = new System.Drawing.Size(63, 0); - this.trkInvOE1Vol.Minimum = 0; - this.trkInvOE1Vol.MinimumSize = new System.Drawing.Size(40, 185); - this.trkInvOE1Vol.Name = "trkInvOE1Vol"; - this.trkInvOE1Vol.Size = new System.Drawing.Size(58, 185); - this.trkInvOE1Vol.TabIndex = 24; - this.trkInvOE1Vol.Text = "/OE1"; - this.trkInvOE1Vol.Value = 50; - // // tableLayoutPanel2 // this.tableLayoutPanel2.ColumnCount = 2; @@ -510,7 +465,7 @@ namespace Mesen.GUI.Forms.Config this.tableLayoutPanel2.Controls.Add(this.tableLayoutPanel8, 0, 5); this.tableLayoutPanel2.Controls.Add(this.lblVolumeReductionSettings, 0, 5); this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 3); + this.tableLayoutPanel2.Location = new System.Drawing.Point(4, 4); this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(0); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.RowCount = 9; @@ -523,17 +478,17 @@ namespace Mesen.GUI.Forms.Config this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(463, 395); + this.tableLayoutPanel2.Size = new System.Drawing.Size(773, 513); this.tableLayoutPanel2.TabIndex = 3; // // chkEnableAudio // this.chkEnableAudio.AutoSize = true; this.tableLayoutPanel2.SetColumnSpan(this.chkEnableAudio, 2); - this.chkEnableAudio.Location = new System.Drawing.Point(6, 32); - this.chkEnableAudio.Margin = new System.Windows.Forms.Padding(6, 6, 6, 3); + this.chkEnableAudio.Location = new System.Drawing.Point(8, 41); + this.chkEnableAudio.Margin = new System.Windows.Forms.Padding(8, 8, 8, 4); this.chkEnableAudio.Name = "chkEnableAudio"; - this.chkEnableAudio.Size = new System.Drawing.Size(89, 17); + this.chkEnableAudio.Size = new System.Drawing.Size(114, 21); this.chkEnableAudio.TabIndex = 3; this.chkEnableAudio.Text = "Enable Audio"; this.chkEnableAudio.UseVisualStyleBackColor = true; @@ -542,10 +497,10 @@ namespace Mesen.GUI.Forms.Config // this.chkEnableEPSM.AutoSize = true; this.tableLayoutPanel2.SetColumnSpan(this.chkEnableEPSM, 2); - this.chkEnableEPSM.Location = new System.Drawing.Point(6, 6); - this.chkEnableEPSM.Margin = new System.Windows.Forms.Padding(6, 6, 6, 3); + this.chkEnableEPSM.Location = new System.Drawing.Point(8, 8); + this.chkEnableEPSM.Margin = new System.Windows.Forms.Padding(8, 8, 8, 4); this.chkEnableEPSM.Name = "chkEnableEPSM"; - this.chkEnableEPSM.Size = new System.Drawing.Size(92, 17); + this.chkEnableEPSM.Size = new System.Drawing.Size(116, 21); this.chkEnableEPSM.TabIndex = 3; this.chkEnableEPSM.Text = "Enable EPSM"; this.chkEnableEPSM.UseVisualStyleBackColor = true; @@ -554,9 +509,10 @@ namespace Mesen.GUI.Forms.Config // this.lblSampleRate.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblSampleRate.AutoSize = true; - this.lblSampleRate.Location = new System.Drawing.Point(3, 86); + this.lblSampleRate.Location = new System.Drawing.Point(4, 107); + this.lblSampleRate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblSampleRate.Name = "lblSampleRate"; - this.lblSampleRate.Size = new System.Drawing.Size(71, 13); + this.lblSampleRate.Size = new System.Drawing.Size(93, 17); this.lblSampleRate.TabIndex = 0; this.lblSampleRate.Text = "Sample Rate:"; // @@ -564,9 +520,10 @@ namespace Mesen.GUI.Forms.Config // this.lblAudioLatency.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblAudioLatency.AutoSize = true; - this.lblAudioLatency.Location = new System.Drawing.Point(3, 113); + this.lblAudioLatency.Location = new System.Drawing.Point(4, 141); + this.lblAudioLatency.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblAudioLatency.Name = "lblAudioLatency"; - this.lblAudioLatency.Size = new System.Drawing.Size(48, 13); + this.lblAudioLatency.Size = new System.Drawing.Size(62, 17); this.lblAudioLatency.TabIndex = 0; this.lblAudioLatency.Text = "Latency:"; // @@ -580,18 +537,20 @@ namespace Mesen.GUI.Forms.Config "44,100 Hz", "48,000 Hz", "96,000 Hz"}); - this.cboSampleRate.Location = new System.Drawing.Point(80, 82); + this.cboSampleRate.Location = new System.Drawing.Point(105, 103); + this.cboSampleRate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cboSampleRate.Name = "cboSampleRate"; - this.cboSampleRate.Size = new System.Drawing.Size(75, 21); + this.cboSampleRate.Size = new System.Drawing.Size(99, 25); this.cboSampleRate.TabIndex = 5; // // lblAudioDevice // this.lblAudioDevice.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblAudioDevice.AutoSize = true; - this.lblAudioDevice.Location = new System.Drawing.Point(3, 59); + this.lblAudioDevice.Location = new System.Drawing.Point(4, 74); + this.lblAudioDevice.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblAudioDevice.Name = "lblAudioDevice"; - this.lblAudioDevice.Size = new System.Drawing.Size(44, 13); + this.lblAudioDevice.Size = new System.Drawing.Size(55, 17); this.lblAudioDevice.TabIndex = 6; this.lblAudioDevice.Text = "Device:"; // @@ -599,9 +558,10 @@ namespace Mesen.GUI.Forms.Config // this.cboAudioDevice.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cboAudioDevice.FormattingEnabled = true; - this.cboAudioDevice.Location = new System.Drawing.Point(80, 55); + this.cboAudioDevice.Location = new System.Drawing.Point(105, 70); + this.cboAudioDevice.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cboAudioDevice.Name = "cboAudioDevice"; - this.cboAudioDevice.Size = new System.Drawing.Size(209, 21); + this.cboAudioDevice.Size = new System.Drawing.Size(277, 25); this.cboAudioDevice.TabIndex = 7; // // tableLayoutPanel7 @@ -618,22 +578,22 @@ namespace Mesen.GUI.Forms.Config this.tableLayoutPanel7.Controls.Add(this.lblLatencyMs, 1, 0); this.tableLayoutPanel7.Controls.Add(this.nudLatency, 0, 0); this.tableLayoutPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel7.Location = new System.Drawing.Point(77, 106); + this.tableLayoutPanel7.Location = new System.Drawing.Point(101, 132); this.tableLayoutPanel7.Margin = new System.Windows.Forms.Padding(0); this.tableLayoutPanel7.Name = "tableLayoutPanel7"; this.tableLayoutPanel7.RowCount = 1; this.tableLayoutPanel7.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel7.Size = new System.Drawing.Size(386, 27); + this.tableLayoutPanel7.Size = new System.Drawing.Size(672, 35); this.tableLayoutPanel7.TabIndex = 15; // // lblLatencyWarning // this.lblLatencyWarning.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblLatencyWarning.AutoSize = true; - this.lblLatencyWarning.Location = new System.Drawing.Point(98, 7); - this.lblLatencyWarning.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.lblLatencyWarning.Location = new System.Drawing.Point(130, 9); + this.lblLatencyWarning.Margin = new System.Windows.Forms.Padding(0, 0, 4, 0); this.lblLatencyWarning.Name = "lblLatencyWarning"; - this.lblLatencyWarning.Size = new System.Drawing.Size(192, 13); + this.lblLatencyWarning.Size = new System.Drawing.Size(255, 17); this.lblLatencyWarning.TabIndex = 4; this.lblLatencyWarning.Text = "Low values may cause sound problems"; // @@ -642,10 +602,10 @@ namespace Mesen.GUI.Forms.Config this.picLatencyWarning.Anchor = System.Windows.Forms.AnchorStyles.Left; this.picLatencyWarning.BackgroundImage = global::Mesen.GUI.Properties.Resources.Warning; this.picLatencyWarning.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.picLatencyWarning.Location = new System.Drawing.Point(82, 5); - this.picLatencyWarning.Margin = new System.Windows.Forms.Padding(5, 3, 0, 3); + this.picLatencyWarning.Location = new System.Drawing.Point(109, 7); + this.picLatencyWarning.Margin = new System.Windows.Forms.Padding(7, 4, 0, 4); this.picLatencyWarning.Name = "picLatencyWarning"; - this.picLatencyWarning.Size = new System.Drawing.Size(16, 16); + this.picLatencyWarning.Size = new System.Drawing.Size(21, 21); this.picLatencyWarning.TabIndex = 3; this.picLatencyWarning.TabStop = false; // @@ -653,9 +613,10 @@ namespace Mesen.GUI.Forms.Config // this.lblLatencyMs.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblLatencyMs.AutoSize = true; - this.lblLatencyMs.Location = new System.Drawing.Point(54, 7); + this.lblLatencyMs.Location = new System.Drawing.Point(72, 9); + this.lblLatencyMs.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblLatencyMs.Name = "lblLatencyMs"; - this.lblLatencyMs.Size = new System.Drawing.Size(20, 13); + this.lblLatencyMs.Size = new System.Drawing.Size(26, 17); this.lblLatencyMs.TabIndex = 2; this.lblLatencyMs.Text = "ms"; // @@ -669,21 +630,22 @@ namespace Mesen.GUI.Forms.Config 0, 0}); this.nudLatency.IsHex = false; - this.nudLatency.Location = new System.Drawing.Point(3, 3); + this.nudLatency.Location = new System.Drawing.Point(4, 4); + this.nudLatency.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.nudLatency.Maximum = new decimal(new int[] { 300, 0, 0, 0}); - this.nudLatency.MaximumSize = new System.Drawing.Size(10000, 20); + this.nudLatency.MaximumSize = new System.Drawing.Size(13333, 26); this.nudLatency.Minimum = new decimal(new int[] { 15, 0, 0, 0}); - this.nudLatency.MinimumSize = new System.Drawing.Size(0, 21); + this.nudLatency.MinimumSize = new System.Drawing.Size(0, 27); this.nudLatency.Name = "nudLatency"; - this.nudLatency.Size = new System.Drawing.Size(45, 21); + this.nudLatency.Size = new System.Drawing.Size(60, 27); this.nudLatency.TabIndex = 1; this.nudLatency.Value = new decimal(new int[] { 100, @@ -702,23 +664,24 @@ namespace Mesen.GUI.Forms.Config this.tableLayoutPanel8.Controls.Add(this.chkReduceSoundInFastForward, 0, 2); this.tableLayoutPanel8.Controls.Add(this.trkVolumeReduction, 1, 1); this.tableLayoutPanel8.Controls.Add(this.chkMuteSoundInBackground, 0, 0); - this.tableLayoutPanel8.Location = new System.Drawing.Point(10, 152); - this.tableLayoutPanel8.Margin = new System.Windows.Forms.Padding(10, 3, 0, 0); + this.tableLayoutPanel8.Location = new System.Drawing.Point(13, 192); + this.tableLayoutPanel8.Margin = new System.Windows.Forms.Padding(13, 4, 0, 0); this.tableLayoutPanel8.Name = "tableLayoutPanel8"; this.tableLayoutPanel8.RowCount = 4; this.tableLayoutPanel8.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel8.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel8.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel8.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel8.Size = new System.Drawing.Size(453, 100); + this.tableLayoutPanel8.Size = new System.Drawing.Size(604, 106); this.tableLayoutPanel8.TabIndex = 25; // // chkReduceSoundInBackground // this.chkReduceSoundInBackground.AutoSize = true; - this.chkReduceSoundInBackground.Location = new System.Drawing.Point(3, 26); + this.chkReduceSoundInBackground.Location = new System.Drawing.Point(4, 33); + this.chkReduceSoundInBackground.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.chkReduceSoundInBackground.Name = "chkReduceSoundInBackground"; - this.chkReduceSoundInBackground.Size = new System.Drawing.Size(164, 17); + this.chkReduceSoundInBackground.Size = new System.Drawing.Size(210, 21); this.chkReduceSoundInBackground.TabIndex = 13; this.chkReduceSoundInBackground.Text = "Reduce when in background"; this.chkReduceSoundInBackground.UseVisualStyleBackColor = true; @@ -727,9 +690,10 @@ namespace Mesen.GUI.Forms.Config // chkReduceSoundInFastForward // this.chkReduceSoundInFastForward.AutoSize = true; - this.chkReduceSoundInFastForward.Location = new System.Drawing.Point(3, 49); + this.chkReduceSoundInFastForward.Location = new System.Drawing.Point(4, 62); + this.chkReduceSoundInFastForward.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.chkReduceSoundInFastForward.Name = "chkReduceSoundInFastForward"; - this.chkReduceSoundInFastForward.Size = new System.Drawing.Size(225, 17); + this.chkReduceSoundInFastForward.Size = new System.Drawing.Size(294, 21); this.chkReduceSoundInFastForward.TabIndex = 16; this.chkReduceSoundInFastForward.Text = "Reduce when fast forwarding or rewinding"; this.chkReduceSoundInFastForward.UseVisualStyleBackColor = true; @@ -739,15 +703,15 @@ namespace Mesen.GUI.Forms.Config // this.trkVolumeReduction.Dock = System.Windows.Forms.DockStyle.Fill; this.trkVolumeReduction.Enabled = false; - this.trkVolumeReduction.Location = new System.Drawing.Point(231, 23); + this.trkVolumeReduction.Location = new System.Drawing.Point(302, 29); this.trkVolumeReduction.Margin = new System.Windows.Forms.Padding(0); this.trkVolumeReduction.Maximum = 100; - this.trkVolumeReduction.MaximumSize = new System.Drawing.Size(400, 55); + this.trkVolumeReduction.MaximumSize = new System.Drawing.Size(533, 72); this.trkVolumeReduction.Minimum = 0; - this.trkVolumeReduction.MinimumSize = new System.Drawing.Size(150, 55); + this.trkVolumeReduction.MinimumSize = new System.Drawing.Size(200, 72); this.trkVolumeReduction.Name = "trkVolumeReduction"; this.tableLayoutPanel8.SetRowSpan(this.trkVolumeReduction, 2); - this.trkVolumeReduction.Size = new System.Drawing.Size(222, 55); + this.trkVolumeReduction.Size = new System.Drawing.Size(302, 72); this.trkVolumeReduction.TabIndex = 17; this.trkVolumeReduction.Text = "Volume Reduction"; this.trkVolumeReduction.Value = 50; @@ -755,9 +719,10 @@ namespace Mesen.GUI.Forms.Config // chkMuteSoundInBackground // this.chkMuteSoundInBackground.AutoSize = true; - this.chkMuteSoundInBackground.Location = new System.Drawing.Point(3, 3); + this.chkMuteSoundInBackground.Location = new System.Drawing.Point(4, 4); + this.chkMuteSoundInBackground.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.chkMuteSoundInBackground.Name = "chkMuteSoundInBackground"; - this.chkMuteSoundInBackground.Size = new System.Drawing.Size(182, 17); + this.chkMuteSoundInBackground.Size = new System.Drawing.Size(235, 21); this.chkMuteSoundInBackground.TabIndex = 18; this.chkMuteSoundInBackground.Text = "Mute sound when in background"; this.chkMuteSoundInBackground.UseVisualStyleBackColor = true; @@ -769,19 +734,20 @@ namespace Mesen.GUI.Forms.Config this.lblVolumeReductionSettings.AutoSize = true; this.tableLayoutPanel2.SetColumnSpan(this.lblVolumeReductionSettings, 2); this.lblVolumeReductionSettings.ForeColor = System.Drawing.SystemColors.GrayText; - this.lblVolumeReductionSettings.Location = new System.Drawing.Point(0, 136); - this.lblVolumeReductionSettings.Margin = new System.Windows.Forms.Padding(0, 3, 3, 0); + this.lblVolumeReductionSettings.Location = new System.Drawing.Point(0, 171); + this.lblVolumeReductionSettings.Margin = new System.Windows.Forms.Padding(0, 4, 4, 0); this.lblVolumeReductionSettings.Name = "lblVolumeReductionSettings"; - this.lblVolumeReductionSettings.Size = new System.Drawing.Size(94, 13); + this.lblVolumeReductionSettings.Size = new System.Drawing.Size(123, 17); this.lblVolumeReductionSettings.TabIndex = 24; this.lblVolumeReductionSettings.Text = "Volume Reduction"; // // btnReset // this.btnReset.AutoSize = true; - this.btnReset.Location = new System.Drawing.Point(6, 3); + this.btnReset.Location = new System.Drawing.Point(8, 4); + this.btnReset.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnReset.Name = "btnReset"; - this.btnReset.Size = new System.Drawing.Size(99, 23); + this.btnReset.Size = new System.Drawing.Size(169, 35); this.btnReset.TabIndex = 3; this.btnReset.Text = "Reset to Defaults"; this.btnReset.UseVisualStyleBackColor = true; @@ -797,18 +763,20 @@ namespace Mesen.GUI.Forms.Config this.tabMain.Controls.Add(this.tpgAdvanced); this.tabMain.Dock = System.Windows.Forms.DockStyle.Fill; this.tabMain.Location = new System.Drawing.Point(0, 0); + this.tabMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabMain.Name = "tabMain"; this.tabMain.SelectedIndex = 0; - this.tabMain.Size = new System.Drawing.Size(477, 427); + this.tabMain.Size = new System.Drawing.Size(703, 550); this.tabMain.TabIndex = 4; // // tpgGeneral // this.tpgGeneral.Controls.Add(this.tableLayoutPanel2); - this.tpgGeneral.Location = new System.Drawing.Point(4, 22); + this.tpgGeneral.Location = new System.Drawing.Point(4, 25); + this.tpgGeneral.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tpgGeneral.Name = "tpgGeneral"; - this.tpgGeneral.Padding = new System.Windows.Forms.Padding(3); - this.tpgGeneral.Size = new System.Drawing.Size(469, 401); + this.tpgGeneral.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tpgGeneral.Size = new System.Drawing.Size(781, 521); this.tpgGeneral.TabIndex = 0; this.tpgGeneral.Text = "General"; this.tpgGeneral.UseVisualStyleBackColor = true; @@ -816,10 +784,11 @@ namespace Mesen.GUI.Forms.Config // tpgVolume // this.tpgVolume.Controls.Add(this.grpVolume); - this.tpgVolume.Location = new System.Drawing.Point(4, 22); + this.tpgVolume.Location = new System.Drawing.Point(4, 26); + this.tpgVolume.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tpgVolume.Name = "tpgVolume"; - this.tpgVolume.Padding = new System.Windows.Forms.Padding(3); - this.tpgVolume.Size = new System.Drawing.Size(469, 395); + this.tpgVolume.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tpgVolume.Size = new System.Drawing.Size(695, 520); this.tpgVolume.TabIndex = 1; this.tpgVolume.Text = "Volume"; this.tpgVolume.UseVisualStyleBackColor = true; @@ -827,10 +796,11 @@ namespace Mesen.GUI.Forms.Config // tpgPanning // this.tpgPanning.Controls.Add(this.tableLayoutPanel6); - this.tpgPanning.Location = new System.Drawing.Point(4, 22); + this.tpgPanning.Location = new System.Drawing.Point(4, 26); + this.tpgPanning.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tpgPanning.Name = "tpgPanning"; - this.tpgPanning.Padding = new System.Windows.Forms.Padding(3); - this.tpgPanning.Size = new System.Drawing.Size(469, 395); + this.tpgPanning.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tpgPanning.Size = new System.Drawing.Size(628, 521); this.tpgPanning.TabIndex = 4; this.tpgPanning.Text = "Panning"; this.tpgPanning.UseVisualStyleBackColor = true; @@ -841,73 +811,105 @@ namespace Mesen.GUI.Forms.Config this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel6.Controls.Add(this.trkSquare1Pan, 0, 0); + this.tableLayoutPanel6.Controls.Add(this.trkFdsPan, 1, 0); this.tableLayoutPanel6.Controls.Add(this.trkSquare2Pan, 0, 1); + this.tableLayoutPanel6.Controls.Add(this.trkMmc5Pan, 1, 1); this.tableLayoutPanel6.Controls.Add(this.trkTrianglePan, 0, 2); this.tableLayoutPanel6.Controls.Add(this.trkNoisePan, 0, 3); this.tableLayoutPanel6.Controls.Add(this.trkDmcPan, 0, 4); - this.tableLayoutPanel6.Controls.Add(this.trkSunsoftPan, 0, 5); - this.tableLayoutPanel6.Controls.Add(this.trkFdsPan, 0, 6); - this.tableLayoutPanel6.Controls.Add(this.trkMmc5Pan, 0, 7); - this.tableLayoutPanel6.Controls.Add(this.trkVrc6Pan, 1, 0); - this.tableLayoutPanel6.Controls.Add(this.trkVrc7Pan, 1, 1); - this.tableLayoutPanel6.Controls.Add(this.trkNamcoPan, 1, 2); - this.tableLayoutPanel6.Controls.Add(this.trkEPSMPan_L, 1, 3); - this.tableLayoutPanel6.Controls.Add(this.trkEPSMPan_R, 1, 4); - this.tableLayoutPanel6.Controls.Add(this.trkInvA13Pan, 1, 5); - this.tableLayoutPanel6.Controls.Add(this.trkInvOE1Pan, 1, 6); + this.tableLayoutPanel6.Controls.Add(this.trkVrc6Pan, 1, 2); + this.tableLayoutPanel6.Controls.Add(this.trkVrc7Pan, 1, 3); + this.tableLayoutPanel6.Controls.Add(this.trkNamcoPan, 1, 4); + this.tableLayoutPanel6.Controls.Add(this.trkSunsoftPan, 0, 6); + this.tableLayoutPanel6.Controls.Add(this.trkEPSMPan_L, 0, 5); + this.tableLayoutPanel6.Controls.Add(this.trkEPSMPan_R, 1, 5); this.tableLayoutPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel6.Location = new System.Drawing.Point(3, 3); + this.tableLayoutPanel6.Location = new System.Drawing.Point(4, 4); + this.tableLayoutPanel6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel6.Name = "tableLayoutPanel6"; this.tableLayoutPanel6.RowCount = 8; - this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); - this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); - this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); - this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); - this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); - this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); - this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); - this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); - this.tableLayoutPanel6.Size = new System.Drawing.Size(463, 389); + this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 26F)); + this.tableLayoutPanel6.Size = new System.Drawing.Size(620, 513); this.tableLayoutPanel6.TabIndex = 3; // // trkSquare1Pan // this.trkSquare1Pan.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkSquare1Pan.Location = new System.Drawing.Point(0, 0); + this.trkSquare1Pan.Location = new System.Drawing.Point(17, 0); this.trkSquare1Pan.Margin = new System.Windows.Forms.Padding(0); this.trkSquare1Pan.Maximum = 100; + this.trkSquare1Pan.MaximumSize = new System.Drawing.Size(84, 209); this.trkSquare1Pan.Minimum = -100; - this.trkSquare1Pan.MinimumSize = new System.Drawing.Size(206, 0); + this.trkSquare1Pan.MinimumSize = new System.Drawing.Size(275, 72); this.trkSquare1Pan.Name = "trkSquare1Pan"; - this.trkSquare1Pan.Size = new System.Drawing.Size(231, 48); + this.trkSquare1Pan.Size = new System.Drawing.Size(275, 72); this.trkSquare1Pan.TabIndex = 12; this.trkSquare1Pan.Text = "Square 1"; this.trkSquare1Pan.Value = 0; // + // trkFdsPan + // + this.trkFdsPan.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.trkFdsPan.Location = new System.Drawing.Point(327, 0); + this.trkFdsPan.Margin = new System.Windows.Forms.Padding(0); + this.trkFdsPan.Maximum = 100; + this.trkFdsPan.MaximumSize = new System.Drawing.Size(84, 209); + this.trkFdsPan.Minimum = -100; + this.trkFdsPan.MinimumSize = new System.Drawing.Size(275, 72); + this.trkFdsPan.Name = "trkFdsPan"; + this.trkFdsPan.Size = new System.Drawing.Size(275, 72); + this.trkFdsPan.TabIndex = 17; + this.trkFdsPan.Text = "FDS"; + this.trkFdsPan.Value = 0; + // // trkSquare2Pan // this.trkSquare2Pan.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkSquare2Pan.Location = new System.Drawing.Point(0, 48); + this.trkSquare2Pan.Location = new System.Drawing.Point(17, 72); this.trkSquare2Pan.Margin = new System.Windows.Forms.Padding(0); this.trkSquare2Pan.Maximum = 100; + this.trkSquare2Pan.MaximumSize = new System.Drawing.Size(84, 209); this.trkSquare2Pan.Minimum = -100; - this.trkSquare2Pan.MinimumSize = new System.Drawing.Size(206, 0); + this.trkSquare2Pan.MinimumSize = new System.Drawing.Size(275, 72); this.trkSquare2Pan.Name = "trkSquare2Pan"; - this.trkSquare2Pan.Size = new System.Drawing.Size(231, 48); + this.trkSquare2Pan.Size = new System.Drawing.Size(275, 72); this.trkSquare2Pan.TabIndex = 13; this.trkSquare2Pan.Text = "Square 2"; this.trkSquare2Pan.Value = 0; // + // trkMmc5Pan + // + this.trkMmc5Pan.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.trkMmc5Pan.Location = new System.Drawing.Point(327, 72); + this.trkMmc5Pan.Margin = new System.Windows.Forms.Padding(0); + this.trkMmc5Pan.Maximum = 100; + this.trkMmc5Pan.MaximumSize = new System.Drawing.Size(84, 209); + this.trkMmc5Pan.Minimum = -100; + this.trkMmc5Pan.MinimumSize = new System.Drawing.Size(275, 72); + this.trkMmc5Pan.Name = "trkMmc5Pan"; + this.trkMmc5Pan.Size = new System.Drawing.Size(275, 72); + this.trkMmc5Pan.TabIndex = 18; + this.trkMmc5Pan.Text = "MMC5"; + this.trkMmc5Pan.Value = 0; + // // trkTrianglePan // this.trkTrianglePan.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkTrianglePan.Location = new System.Drawing.Point(0, 96); + this.trkTrianglePan.Location = new System.Drawing.Point(17, 144); this.trkTrianglePan.Margin = new System.Windows.Forms.Padding(0); this.trkTrianglePan.Maximum = 100; + this.trkTrianglePan.MaximumSize = new System.Drawing.Size(84, 209); this.trkTrianglePan.Minimum = -100; - this.trkTrianglePan.MinimumSize = new System.Drawing.Size(206, 0); + this.trkTrianglePan.MinimumSize = new System.Drawing.Size(275, 72); this.trkTrianglePan.Name = "trkTrianglePan"; - this.trkTrianglePan.Size = new System.Drawing.Size(231, 48); + this.trkTrianglePan.Size = new System.Drawing.Size(275, 72); this.trkTrianglePan.TabIndex = 14; this.trkTrianglePan.Text = "Triangle"; this.trkTrianglePan.Value = 0; @@ -915,13 +917,14 @@ namespace Mesen.GUI.Forms.Config // trkNoisePan // this.trkNoisePan.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkNoisePan.Location = new System.Drawing.Point(0, 144); + this.trkNoisePan.Location = new System.Drawing.Point(17, 216); this.trkNoisePan.Margin = new System.Windows.Forms.Padding(0); this.trkNoisePan.Maximum = 100; + this.trkNoisePan.MaximumSize = new System.Drawing.Size(84, 209); this.trkNoisePan.Minimum = -100; - this.trkNoisePan.MinimumSize = new System.Drawing.Size(206, 0); + this.trkNoisePan.MinimumSize = new System.Drawing.Size(275, 72); this.trkNoisePan.Name = "trkNoisePan"; - this.trkNoisePan.Size = new System.Drawing.Size(231, 48); + this.trkNoisePan.Size = new System.Drawing.Size(275, 72); this.trkNoisePan.TabIndex = 15; this.trkNoisePan.Text = "Noise"; this.trkNoisePan.Value = 0; @@ -929,69 +932,29 @@ namespace Mesen.GUI.Forms.Config // trkDmcPan // this.trkDmcPan.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkDmcPan.Location = new System.Drawing.Point(0, 192); + this.trkDmcPan.Location = new System.Drawing.Point(17, 288); this.trkDmcPan.Margin = new System.Windows.Forms.Padding(0); this.trkDmcPan.Maximum = 100; + this.trkDmcPan.MaximumSize = new System.Drawing.Size(84, 209); this.trkDmcPan.Minimum = -100; - this.trkDmcPan.MinimumSize = new System.Drawing.Size(206, 0); + this.trkDmcPan.MinimumSize = new System.Drawing.Size(275, 72); this.trkDmcPan.Name = "trkDmcPan"; - this.trkDmcPan.Size = new System.Drawing.Size(231, 48); + this.trkDmcPan.Size = new System.Drawing.Size(275, 72); this.trkDmcPan.TabIndex = 16; this.trkDmcPan.Text = "DMC"; this.trkDmcPan.Value = 0; // - // trkSunsoftPan - // - this.trkSunsoftPan.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkSunsoftPan.Location = new System.Drawing.Point(0, 240); - this.trkSunsoftPan.Margin = new System.Windows.Forms.Padding(0); - this.trkSunsoftPan.Maximum = 100; - this.trkSunsoftPan.Minimum = -100; - this.trkSunsoftPan.MinimumSize = new System.Drawing.Size(206, 0); - this.trkSunsoftPan.Name = "trkSunsoftPan"; - this.trkSunsoftPan.Size = new System.Drawing.Size(231, 48); - this.trkSunsoftPan.TabIndex = 22; - this.trkSunsoftPan.Text = "Sunsoft"; - this.trkSunsoftPan.Value = 0; - // - // trkFdsPan - // - this.trkFdsPan.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkFdsPan.Location = new System.Drawing.Point(0, 288); - this.trkFdsPan.Margin = new System.Windows.Forms.Padding(0); - this.trkFdsPan.Maximum = 100; - this.trkFdsPan.Minimum = -100; - this.trkFdsPan.MinimumSize = new System.Drawing.Size(206, 0); - this.trkFdsPan.Name = "trkFdsPan"; - this.trkFdsPan.Size = new System.Drawing.Size(231, 48); - this.trkFdsPan.TabIndex = 17; - this.trkFdsPan.Text = "FDS"; - this.trkFdsPan.Value = 0; - // - // trkMmc5Pan - // - this.trkMmc5Pan.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkMmc5Pan.Location = new System.Drawing.Point(0, 336); - this.trkMmc5Pan.Margin = new System.Windows.Forms.Padding(0); - this.trkMmc5Pan.Maximum = 100; - this.trkMmc5Pan.Minimum = -100; - this.trkMmc5Pan.MinimumSize = new System.Drawing.Size(206, 0); - this.trkMmc5Pan.Name = "trkMmc5Pan"; - this.trkMmc5Pan.Size = new System.Drawing.Size(231, 53); - this.trkMmc5Pan.TabIndex = 18; - this.trkMmc5Pan.Text = "MMC5"; - this.trkMmc5Pan.Value = 0; - // // trkVrc6Pan // this.trkVrc6Pan.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkVrc6Pan.Location = new System.Drawing.Point(231, 0); + this.trkVrc6Pan.Location = new System.Drawing.Point(327, 144); this.trkVrc6Pan.Margin = new System.Windows.Forms.Padding(0); this.trkVrc6Pan.Maximum = 100; + this.trkVrc6Pan.MaximumSize = new System.Drawing.Size(84, 209); this.trkVrc6Pan.Minimum = -100; - this.trkVrc6Pan.MinimumSize = new System.Drawing.Size(206, 0); + this.trkVrc6Pan.MinimumSize = new System.Drawing.Size(275, 72); this.trkVrc6Pan.Name = "trkVrc6Pan"; - this.trkVrc6Pan.Size = new System.Drawing.Size(232, 48); + this.trkVrc6Pan.Size = new System.Drawing.Size(275, 72); this.trkVrc6Pan.TabIndex = 19; this.trkVrc6Pan.Text = "VRC6"; this.trkVrc6Pan.Value = 0; @@ -999,13 +962,14 @@ namespace Mesen.GUI.Forms.Config // trkVrc7Pan // this.trkVrc7Pan.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkVrc7Pan.Location = new System.Drawing.Point(231, 48); + this.trkVrc7Pan.Location = new System.Drawing.Point(327, 216); this.trkVrc7Pan.Margin = new System.Windows.Forms.Padding(0); this.trkVrc7Pan.Maximum = 100; + this.trkVrc7Pan.MaximumSize = new System.Drawing.Size(84, 209); this.trkVrc7Pan.Minimum = -100; - this.trkVrc7Pan.MinimumSize = new System.Drawing.Size(206, 0); + this.trkVrc7Pan.MinimumSize = new System.Drawing.Size(275, 72); this.trkVrc7Pan.Name = "trkVrc7Pan"; - this.trkVrc7Pan.Size = new System.Drawing.Size(232, 48); + this.trkVrc7Pan.Size = new System.Drawing.Size(275, 72); this.trkVrc7Pan.TabIndex = 20; this.trkVrc7Pan.Text = "VRC7"; this.trkVrc7Pan.Value = 0; @@ -1013,27 +977,44 @@ namespace Mesen.GUI.Forms.Config // trkNamcoPan // this.trkNamcoPan.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkNamcoPan.Location = new System.Drawing.Point(231, 96); + this.trkNamcoPan.Location = new System.Drawing.Point(327, 288); this.trkNamcoPan.Margin = new System.Windows.Forms.Padding(0); this.trkNamcoPan.Maximum = 100; + this.trkNamcoPan.MaximumSize = new System.Drawing.Size(84, 209); this.trkNamcoPan.Minimum = -100; - this.trkNamcoPan.MinimumSize = new System.Drawing.Size(206, 0); + this.trkNamcoPan.MinimumSize = new System.Drawing.Size(275, 72); this.trkNamcoPan.Name = "trkNamcoPan"; - this.trkNamcoPan.Size = new System.Drawing.Size(232, 48); + this.trkNamcoPan.Size = new System.Drawing.Size(275, 72); this.trkNamcoPan.TabIndex = 21; this.trkNamcoPan.Text = "Namco"; this.trkNamcoPan.Value = 0; // + // trkSunsoftPan + // + this.trkSunsoftPan.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.trkSunsoftPan.Location = new System.Drawing.Point(17, 432); + this.trkSunsoftPan.Margin = new System.Windows.Forms.Padding(0); + this.trkSunsoftPan.Maximum = 100; + this.trkSunsoftPan.MaximumSize = new System.Drawing.Size(84, 209); + this.trkSunsoftPan.Minimum = -100; + this.trkSunsoftPan.MinimumSize = new System.Drawing.Size(275, 72); + this.trkSunsoftPan.Name = "trkSunsoftPan"; + this.trkSunsoftPan.Size = new System.Drawing.Size(275, 72); + this.trkSunsoftPan.TabIndex = 22; + this.trkSunsoftPan.Text = "Sunsoft"; + this.trkSunsoftPan.Value = 0; + // // trkEPSMPan_L // this.trkEPSMPan_L.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkEPSMPan_L.Location = new System.Drawing.Point(231, 144); + this.trkEPSMPan_L.Location = new System.Drawing.Point(17, 360); this.trkEPSMPan_L.Margin = new System.Windows.Forms.Padding(0); this.trkEPSMPan_L.Maximum = 100; + this.trkEPSMPan_L.MaximumSize = new System.Drawing.Size(84, 209); this.trkEPSMPan_L.Minimum = -100; - this.trkEPSMPan_L.MinimumSize = new System.Drawing.Size(206, 0); + this.trkEPSMPan_L.MinimumSize = new System.Drawing.Size(275, 72); this.trkEPSMPan_L.Name = "trkEPSMPan_L"; - this.trkEPSMPan_L.Size = new System.Drawing.Size(232, 48); + this.trkEPSMPan_L.Size = new System.Drawing.Size(275, 72); this.trkEPSMPan_L.TabIndex = 22; this.trkEPSMPan_L.Text = "EPSM Left"; this.trkEPSMPan_L.Value = -100; @@ -1041,52 +1022,26 @@ namespace Mesen.GUI.Forms.Config // trkEPSMPan_R // this.trkEPSMPan_R.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkEPSMPan_R.Location = new System.Drawing.Point(231, 192); + this.trkEPSMPan_R.Location = new System.Drawing.Point(327, 360); this.trkEPSMPan_R.Margin = new System.Windows.Forms.Padding(0); this.trkEPSMPan_R.Maximum = 100; + this.trkEPSMPan_R.MaximumSize = new System.Drawing.Size(84, 209); this.trkEPSMPan_R.Minimum = -100; - this.trkEPSMPan_R.MinimumSize = new System.Drawing.Size(206, 0); + this.trkEPSMPan_R.MinimumSize = new System.Drawing.Size(275, 72); this.trkEPSMPan_R.Name = "trkEPSMPan_R"; - this.trkEPSMPan_R.Size = new System.Drawing.Size(232, 48); + this.trkEPSMPan_R.Size = new System.Drawing.Size(275, 72); this.trkEPSMPan_R.TabIndex = 22; this.trkEPSMPan_R.Text = "EPSM Right"; this.trkEPSMPan_R.Value = 100; // - // trkInvA13Pan - // - this.trkInvA13Pan.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkInvA13Pan.Location = new System.Drawing.Point(231, 240); - this.trkInvA13Pan.Margin = new System.Windows.Forms.Padding(0); - this.trkInvA13Pan.Maximum = 100; - this.trkInvA13Pan.Minimum = -100; - this.trkInvA13Pan.MinimumSize = new System.Drawing.Size(206, 0); - this.trkInvA13Pan.Name = "trkInvA13Pan"; - this.trkInvA13Pan.Size = new System.Drawing.Size(232, 48); - this.trkInvA13Pan.TabIndex = 23; - this.trkInvA13Pan.Text = "/A13"; - this.trkInvA13Pan.Value = 50; - // - // trkInvOE1Pan - // - this.trkInvOE1Pan.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.trkInvOE1Pan.Location = new System.Drawing.Point(231, 288); - this.trkInvOE1Pan.Margin = new System.Windows.Forms.Padding(0); - this.trkInvOE1Pan.Maximum = 100; - this.trkInvOE1Pan.Minimum = -100; - this.trkInvOE1Pan.MinimumSize = new System.Drawing.Size(206, 0); - this.trkInvOE1Pan.Name = "trkInvOE1Pan"; - this.trkInvOE1Pan.Size = new System.Drawing.Size(232, 48); - this.trkInvOE1Pan.TabIndex = 24; - this.trkInvOE1Pan.Text = "/OE1"; - this.trkInvOE1Pan.Value = 50; - // // tpgEqualizer // this.tpgEqualizer.Controls.Add(this.groupBox1); - this.tpgEqualizer.Location = new System.Drawing.Point(4, 22); + this.tpgEqualizer.Location = new System.Drawing.Point(4, 26); + this.tpgEqualizer.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tpgEqualizer.Name = "tpgEqualizer"; - this.tpgEqualizer.Padding = new System.Windows.Forms.Padding(3); - this.tpgEqualizer.Size = new System.Drawing.Size(469, 395); + this.tpgEqualizer.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tpgEqualizer.Size = new System.Drawing.Size(628, 521); this.tpgEqualizer.TabIndex = 5; this.tpgEqualizer.Text = "Equalizer"; this.tpgEqualizer.UseVisualStyleBackColor = true; @@ -1096,9 +1051,11 @@ namespace Mesen.GUI.Forms.Config this.groupBox1.Controls.Add(this.chkEnableEqualizer); this.groupBox1.Controls.Add(this.tlpEqualizer); this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox1.Location = new System.Drawing.Point(3, 3); + this.groupBox1.Location = new System.Drawing.Point(4, 4); + this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(463, 389); + this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox1.Size = new System.Drawing.Size(620, 513); this.groupBox1.TabIndex = 4; this.groupBox1.TabStop = false; // @@ -1106,10 +1063,11 @@ namespace Mesen.GUI.Forms.Config // this.chkEnableEqualizer.AutoSize = true; this.chkEnableEqualizer.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.chkEnableEqualizer.Location = new System.Drawing.Point(7, 0); + this.chkEnableEqualizer.Location = new System.Drawing.Point(9, 0); + this.chkEnableEqualizer.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.chkEnableEqualizer.Name = "chkEnableEqualizer"; - this.chkEnableEqualizer.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.chkEnableEqualizer.Size = new System.Drawing.Size(110, 17); + this.chkEnableEqualizer.Padding = new System.Windows.Forms.Padding(7, 0, 0, 0); + this.chkEnableEqualizer.Size = new System.Drawing.Size(144, 21); this.chkEnableEqualizer.TabIndex = 5; this.chkEnableEqualizer.Text = "Enable Equalizer"; this.chkEnableEqualizer.UseVisualStyleBackColor = false; @@ -1151,27 +1109,28 @@ namespace Mesen.GUI.Forms.Config this.tlpEqualizer.Controls.Add(this.flowLayoutPanel6, 0, 0); this.tlpEqualizer.Controls.Add(this.flowLayoutPanel7, 6, 0); this.tlpEqualizer.Dock = System.Windows.Forms.DockStyle.Fill; - this.tlpEqualizer.Location = new System.Drawing.Point(3, 16); + this.tlpEqualizer.Location = new System.Drawing.Point(4, 20); + this.tlpEqualizer.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tlpEqualizer.Name = "tlpEqualizer"; this.tlpEqualizer.RowCount = 4; this.tlpEqualizer.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tlpEqualizer.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tlpEqualizer.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpEqualizer.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tlpEqualizer.Size = new System.Drawing.Size(457, 370); + this.tlpEqualizer.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 26F)); + this.tlpEqualizer.Size = new System.Drawing.Size(612, 489); this.tlpEqualizer.TabIndex = 3; // // trkBand6Gain // this.trkBand6Gain.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkBand6Gain.Location = new System.Drawing.Point(225, 23); + this.trkBand6Gain.Location = new System.Drawing.Point(305, 28); this.trkBand6Gain.Margin = new System.Windows.Forms.Padding(0); this.trkBand6Gain.Maximum = 200; - this.trkBand6Gain.MaximumSize = new System.Drawing.Size(63, 160); + this.trkBand6Gain.MaximumSize = new System.Drawing.Size(84, 209); this.trkBand6Gain.Minimum = -200; - this.trkBand6Gain.MinimumSize = new System.Drawing.Size(34, 160); + this.trkBand6Gain.MinimumSize = new System.Drawing.Size(45, 209); this.trkBand6Gain.Name = "trkBand6Gain"; - this.trkBand6Gain.Size = new System.Drawing.Size(45, 160); + this.trkBand6Gain.Size = new System.Drawing.Size(61, 209); this.trkBand6Gain.TabIndex = 16; this.trkBand6Gain.Text = "225 Hz"; this.trkBand6Gain.Value = 50; @@ -1180,14 +1139,14 @@ namespace Mesen.GUI.Forms.Config // trkBand5Gain // this.trkBand5Gain.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkBand5Gain.Location = new System.Drawing.Point(180, 23); + this.trkBand5Gain.Location = new System.Drawing.Point(244, 28); this.trkBand5Gain.Margin = new System.Windows.Forms.Padding(0); this.trkBand5Gain.Maximum = 200; - this.trkBand5Gain.MaximumSize = new System.Drawing.Size(63, 160); + this.trkBand5Gain.MaximumSize = new System.Drawing.Size(84, 209); this.trkBand5Gain.Minimum = -200; - this.trkBand5Gain.MinimumSize = new System.Drawing.Size(34, 160); + this.trkBand5Gain.MinimumSize = new System.Drawing.Size(45, 209); this.trkBand5Gain.Name = "trkBand5Gain"; - this.trkBand5Gain.Size = new System.Drawing.Size(45, 160); + this.trkBand5Gain.Size = new System.Drawing.Size(61, 209); this.trkBand5Gain.TabIndex = 15; this.trkBand5Gain.Text = "160 Hz"; this.trkBand5Gain.Value = 50; @@ -1196,14 +1155,14 @@ namespace Mesen.GUI.Forms.Config // trkBand4Gain // this.trkBand4Gain.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkBand4Gain.Location = new System.Drawing.Point(135, 23); + this.trkBand4Gain.Location = new System.Drawing.Point(183, 28); this.trkBand4Gain.Margin = new System.Windows.Forms.Padding(0); this.trkBand4Gain.Maximum = 200; - this.trkBand4Gain.MaximumSize = new System.Drawing.Size(63, 160); + this.trkBand4Gain.MaximumSize = new System.Drawing.Size(84, 209); this.trkBand4Gain.Minimum = -200; - this.trkBand4Gain.MinimumSize = new System.Drawing.Size(34, 160); + this.trkBand4Gain.MinimumSize = new System.Drawing.Size(45, 209); this.trkBand4Gain.Name = "trkBand4Gain"; - this.trkBand4Gain.Size = new System.Drawing.Size(45, 160); + this.trkBand4Gain.Size = new System.Drawing.Size(61, 209); this.trkBand4Gain.TabIndex = 14; this.trkBand4Gain.Text = "113 Hz"; this.trkBand4Gain.Value = 50; @@ -1212,14 +1171,14 @@ namespace Mesen.GUI.Forms.Config // trkBand3Gain // this.trkBand3Gain.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkBand3Gain.Location = new System.Drawing.Point(90, 23); + this.trkBand3Gain.Location = new System.Drawing.Point(122, 28); this.trkBand3Gain.Margin = new System.Windows.Forms.Padding(0); this.trkBand3Gain.Maximum = 200; - this.trkBand3Gain.MaximumSize = new System.Drawing.Size(63, 160); + this.trkBand3Gain.MaximumSize = new System.Drawing.Size(84, 209); this.trkBand3Gain.Minimum = -200; - this.trkBand3Gain.MinimumSize = new System.Drawing.Size(34, 160); + this.trkBand3Gain.MinimumSize = new System.Drawing.Size(45, 209); this.trkBand3Gain.Name = "trkBand3Gain"; - this.trkBand3Gain.Size = new System.Drawing.Size(45, 160); + this.trkBand3Gain.Size = new System.Drawing.Size(61, 209); this.trkBand3Gain.TabIndex = 13; this.trkBand3Gain.Text = "80 Hz"; this.trkBand3Gain.Value = 50; @@ -1228,14 +1187,14 @@ namespace Mesen.GUI.Forms.Config // trkBand2Gain // this.trkBand2Gain.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkBand2Gain.Location = new System.Drawing.Point(45, 23); + this.trkBand2Gain.Location = new System.Drawing.Point(61, 28); this.trkBand2Gain.Margin = new System.Windows.Forms.Padding(0); this.trkBand2Gain.Maximum = 200; - this.trkBand2Gain.MaximumSize = new System.Drawing.Size(63, 160); + this.trkBand2Gain.MaximumSize = new System.Drawing.Size(84, 209); this.trkBand2Gain.Minimum = -200; - this.trkBand2Gain.MinimumSize = new System.Drawing.Size(34, 160); + this.trkBand2Gain.MinimumSize = new System.Drawing.Size(45, 209); this.trkBand2Gain.Name = "trkBand2Gain"; - this.trkBand2Gain.Size = new System.Drawing.Size(45, 160); + this.trkBand2Gain.Size = new System.Drawing.Size(61, 209); this.trkBand2Gain.TabIndex = 12; this.trkBand2Gain.Text = "56 Hz"; this.trkBand2Gain.Value = 50; @@ -1244,14 +1203,14 @@ namespace Mesen.GUI.Forms.Config // trkBand1Gain // this.trkBand1Gain.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkBand1Gain.Location = new System.Drawing.Point(0, 23); + this.trkBand1Gain.Location = new System.Drawing.Point(0, 28); this.trkBand1Gain.Margin = new System.Windows.Forms.Padding(0); this.trkBand1Gain.Maximum = 200; - this.trkBand1Gain.MaximumSize = new System.Drawing.Size(63, 160); + this.trkBand1Gain.MaximumSize = new System.Drawing.Size(84, 209); this.trkBand1Gain.Minimum = -200; - this.trkBand1Gain.MinimumSize = new System.Drawing.Size(34, 160); + this.trkBand1Gain.MinimumSize = new System.Drawing.Size(45, 209); this.trkBand1Gain.Name = "trkBand1Gain"; - this.trkBand1Gain.Size = new System.Drawing.Size(45, 160); + this.trkBand1Gain.Size = new System.Drawing.Size(61, 209); this.trkBand1Gain.TabIndex = 11; this.trkBand1Gain.Text = "40 Hz"; this.trkBand1Gain.Value = 50; @@ -1260,14 +1219,14 @@ namespace Mesen.GUI.Forms.Config // trkBand11Gain // this.trkBand11Gain.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkBand11Gain.Location = new System.Drawing.Point(0, 183); + this.trkBand11Gain.Location = new System.Drawing.Point(0, 237); this.trkBand11Gain.Margin = new System.Windows.Forms.Padding(0); this.trkBand11Gain.Maximum = 200; - this.trkBand11Gain.MaximumSize = new System.Drawing.Size(63, 160); + this.trkBand11Gain.MaximumSize = new System.Drawing.Size(84, 209); this.trkBand11Gain.Minimum = -200; - this.trkBand11Gain.MinimumSize = new System.Drawing.Size(34, 160); + this.trkBand11Gain.MinimumSize = new System.Drawing.Size(45, 209); this.trkBand11Gain.Name = "trkBand11Gain"; - this.trkBand11Gain.Size = new System.Drawing.Size(45, 160); + this.trkBand11Gain.Size = new System.Drawing.Size(61, 209); this.trkBand11Gain.TabIndex = 17; this.trkBand11Gain.Text = "1.0 kHz"; this.trkBand11Gain.Value = 50; @@ -1276,14 +1235,14 @@ namespace Mesen.GUI.Forms.Config // trkBand12Gain // this.trkBand12Gain.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkBand12Gain.Location = new System.Drawing.Point(45, 183); + this.trkBand12Gain.Location = new System.Drawing.Point(61, 237); this.trkBand12Gain.Margin = new System.Windows.Forms.Padding(0); this.trkBand12Gain.Maximum = 200; - this.trkBand12Gain.MaximumSize = new System.Drawing.Size(63, 160); + this.trkBand12Gain.MaximumSize = new System.Drawing.Size(84, 209); this.trkBand12Gain.Minimum = -200; - this.trkBand12Gain.MinimumSize = new System.Drawing.Size(34, 160); + this.trkBand12Gain.MinimumSize = new System.Drawing.Size(45, 209); this.trkBand12Gain.Name = "trkBand12Gain"; - this.trkBand12Gain.Size = new System.Drawing.Size(45, 160); + this.trkBand12Gain.Size = new System.Drawing.Size(61, 209); this.trkBand12Gain.TabIndex = 18; this.trkBand12Gain.Text = "2.0 kHz"; this.trkBand12Gain.Value = 50; @@ -1292,14 +1251,14 @@ namespace Mesen.GUI.Forms.Config // trkBand13Gain // this.trkBand13Gain.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkBand13Gain.Location = new System.Drawing.Point(90, 183); + this.trkBand13Gain.Location = new System.Drawing.Point(122, 237); this.trkBand13Gain.Margin = new System.Windows.Forms.Padding(0); this.trkBand13Gain.Maximum = 200; - this.trkBand13Gain.MaximumSize = new System.Drawing.Size(63, 160); + this.trkBand13Gain.MaximumSize = new System.Drawing.Size(84, 209); this.trkBand13Gain.Minimum = -200; - this.trkBand13Gain.MinimumSize = new System.Drawing.Size(34, 160); + this.trkBand13Gain.MinimumSize = new System.Drawing.Size(45, 209); this.trkBand13Gain.Name = "trkBand13Gain"; - this.trkBand13Gain.Size = new System.Drawing.Size(45, 160); + this.trkBand13Gain.Size = new System.Drawing.Size(61, 209); this.trkBand13Gain.TabIndex = 19; this.trkBand13Gain.Text = "3.0 kHz"; this.trkBand13Gain.Value = 50; @@ -1308,14 +1267,14 @@ namespace Mesen.GUI.Forms.Config // trkBand14Gain // this.trkBand14Gain.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkBand14Gain.Location = new System.Drawing.Point(135, 183); + this.trkBand14Gain.Location = new System.Drawing.Point(183, 237); this.trkBand14Gain.Margin = new System.Windows.Forms.Padding(0); this.trkBand14Gain.Maximum = 200; - this.trkBand14Gain.MaximumSize = new System.Drawing.Size(63, 160); + this.trkBand14Gain.MaximumSize = new System.Drawing.Size(84, 209); this.trkBand14Gain.Minimum = -200; - this.trkBand14Gain.MinimumSize = new System.Drawing.Size(34, 160); + this.trkBand14Gain.MinimumSize = new System.Drawing.Size(45, 209); this.trkBand14Gain.Name = "trkBand14Gain"; - this.trkBand14Gain.Size = new System.Drawing.Size(45, 160); + this.trkBand14Gain.Size = new System.Drawing.Size(61, 209); this.trkBand14Gain.TabIndex = 20; this.trkBand14Gain.Text = "4.0 kHz"; this.trkBand14Gain.Value = 50; @@ -1324,14 +1283,14 @@ namespace Mesen.GUI.Forms.Config // trkBand15Gain // this.trkBand15Gain.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkBand15Gain.Location = new System.Drawing.Point(180, 183); + this.trkBand15Gain.Location = new System.Drawing.Point(244, 237); this.trkBand15Gain.Margin = new System.Windows.Forms.Padding(0); this.trkBand15Gain.Maximum = 200; - this.trkBand15Gain.MaximumSize = new System.Drawing.Size(63, 160); + this.trkBand15Gain.MaximumSize = new System.Drawing.Size(84, 209); this.trkBand15Gain.Minimum = -200; - this.trkBand15Gain.MinimumSize = new System.Drawing.Size(34, 160); + this.trkBand15Gain.MinimumSize = new System.Drawing.Size(45, 209); this.trkBand15Gain.Name = "trkBand15Gain"; - this.trkBand15Gain.Size = new System.Drawing.Size(45, 160); + this.trkBand15Gain.Size = new System.Drawing.Size(61, 209); this.trkBand15Gain.TabIndex = 21; this.trkBand15Gain.Text = "5.0 kHz"; this.trkBand15Gain.Value = 50; @@ -1340,14 +1299,14 @@ namespace Mesen.GUI.Forms.Config // trkBand16Gain // this.trkBand16Gain.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkBand16Gain.Location = new System.Drawing.Point(225, 183); + this.trkBand16Gain.Location = new System.Drawing.Point(305, 237); this.trkBand16Gain.Margin = new System.Windows.Forms.Padding(0); this.trkBand16Gain.Maximum = 200; - this.trkBand16Gain.MaximumSize = new System.Drawing.Size(63, 160); + this.trkBand16Gain.MaximumSize = new System.Drawing.Size(84, 209); this.trkBand16Gain.Minimum = -200; - this.trkBand16Gain.MinimumSize = new System.Drawing.Size(34, 160); + this.trkBand16Gain.MinimumSize = new System.Drawing.Size(45, 209); this.trkBand16Gain.Name = "trkBand16Gain"; - this.trkBand16Gain.Size = new System.Drawing.Size(45, 160); + this.trkBand16Gain.Size = new System.Drawing.Size(61, 209); this.trkBand16Gain.TabIndex = 22; this.trkBand16Gain.Text = "6.0 kHz"; this.trkBand16Gain.Value = 50; @@ -1356,14 +1315,14 @@ namespace Mesen.GUI.Forms.Config // trkBand7Gain // this.trkBand7Gain.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkBand7Gain.Location = new System.Drawing.Point(270, 23); + this.trkBand7Gain.Location = new System.Drawing.Point(366, 28); this.trkBand7Gain.Margin = new System.Windows.Forms.Padding(0); this.trkBand7Gain.Maximum = 200; - this.trkBand7Gain.MaximumSize = new System.Drawing.Size(63, 160); + this.trkBand7Gain.MaximumSize = new System.Drawing.Size(84, 209); this.trkBand7Gain.Minimum = -200; - this.trkBand7Gain.MinimumSize = new System.Drawing.Size(34, 160); + this.trkBand7Gain.MinimumSize = new System.Drawing.Size(45, 209); this.trkBand7Gain.Name = "trkBand7Gain"; - this.trkBand7Gain.Size = new System.Drawing.Size(45, 160); + this.trkBand7Gain.Size = new System.Drawing.Size(61, 209); this.trkBand7Gain.TabIndex = 23; this.trkBand7Gain.Text = "320 Hz"; this.trkBand7Gain.Value = 50; @@ -1372,14 +1331,14 @@ namespace Mesen.GUI.Forms.Config // trkBand8Gain // this.trkBand8Gain.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkBand8Gain.Location = new System.Drawing.Point(315, 23); + this.trkBand8Gain.Location = new System.Drawing.Point(427, 28); this.trkBand8Gain.Margin = new System.Windows.Forms.Padding(0); this.trkBand8Gain.Maximum = 200; - this.trkBand8Gain.MaximumSize = new System.Drawing.Size(63, 160); + this.trkBand8Gain.MaximumSize = new System.Drawing.Size(84, 209); this.trkBand8Gain.Minimum = -200; - this.trkBand8Gain.MinimumSize = new System.Drawing.Size(34, 160); + this.trkBand8Gain.MinimumSize = new System.Drawing.Size(45, 209); this.trkBand8Gain.Name = "trkBand8Gain"; - this.trkBand8Gain.Size = new System.Drawing.Size(45, 160); + this.trkBand8Gain.Size = new System.Drawing.Size(61, 209); this.trkBand8Gain.TabIndex = 24; this.trkBand8Gain.Text = "450 Hz"; this.trkBand8Gain.Value = 50; @@ -1388,14 +1347,14 @@ namespace Mesen.GUI.Forms.Config // trkBand9Gain // this.trkBand9Gain.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkBand9Gain.Location = new System.Drawing.Point(360, 23); + this.trkBand9Gain.Location = new System.Drawing.Point(488, 28); this.trkBand9Gain.Margin = new System.Windows.Forms.Padding(0); this.trkBand9Gain.Maximum = 200; - this.trkBand9Gain.MaximumSize = new System.Drawing.Size(63, 160); + this.trkBand9Gain.MaximumSize = new System.Drawing.Size(84, 209); this.trkBand9Gain.Minimum = -200; - this.trkBand9Gain.MinimumSize = new System.Drawing.Size(34, 160); + this.trkBand9Gain.MinimumSize = new System.Drawing.Size(45, 209); this.trkBand9Gain.Name = "trkBand9Gain"; - this.trkBand9Gain.Size = new System.Drawing.Size(45, 160); + this.trkBand9Gain.Size = new System.Drawing.Size(61, 209); this.trkBand9Gain.TabIndex = 25; this.trkBand9Gain.Text = "600 Hz"; this.trkBand9Gain.Value = 50; @@ -1404,14 +1363,14 @@ namespace Mesen.GUI.Forms.Config // trkBand10Gain // this.trkBand10Gain.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkBand10Gain.Location = new System.Drawing.Point(405, 23); + this.trkBand10Gain.Location = new System.Drawing.Point(549, 28); this.trkBand10Gain.Margin = new System.Windows.Forms.Padding(0); this.trkBand10Gain.Maximum = 200; - this.trkBand10Gain.MaximumSize = new System.Drawing.Size(63, 160); + this.trkBand10Gain.MaximumSize = new System.Drawing.Size(84, 209); this.trkBand10Gain.Minimum = -200; - this.trkBand10Gain.MinimumSize = new System.Drawing.Size(34, 160); + this.trkBand10Gain.MinimumSize = new System.Drawing.Size(45, 209); this.trkBand10Gain.Name = "trkBand10Gain"; - this.trkBand10Gain.Size = new System.Drawing.Size(52, 160); + this.trkBand10Gain.Size = new System.Drawing.Size(63, 209); this.trkBand10Gain.TabIndex = 26; this.trkBand10Gain.Text = "750 Hz"; this.trkBand10Gain.Value = 50; @@ -1420,14 +1379,14 @@ namespace Mesen.GUI.Forms.Config // trkBand17Gain // this.trkBand17Gain.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkBand17Gain.Location = new System.Drawing.Point(270, 183); + this.trkBand17Gain.Location = new System.Drawing.Point(366, 237); this.trkBand17Gain.Margin = new System.Windows.Forms.Padding(0); this.trkBand17Gain.Maximum = 200; - this.trkBand17Gain.MaximumSize = new System.Drawing.Size(63, 160); + this.trkBand17Gain.MaximumSize = new System.Drawing.Size(84, 209); this.trkBand17Gain.Minimum = -200; - this.trkBand17Gain.MinimumSize = new System.Drawing.Size(34, 160); + this.trkBand17Gain.MinimumSize = new System.Drawing.Size(45, 209); this.trkBand17Gain.Name = "trkBand17Gain"; - this.trkBand17Gain.Size = new System.Drawing.Size(45, 160); + this.trkBand17Gain.Size = new System.Drawing.Size(61, 209); this.trkBand17Gain.TabIndex = 27; this.trkBand17Gain.Text = "7.0 kHz"; this.trkBand17Gain.Value = 50; @@ -1436,14 +1395,14 @@ namespace Mesen.GUI.Forms.Config // trkBand18Gain // this.trkBand18Gain.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkBand18Gain.Location = new System.Drawing.Point(315, 183); + this.trkBand18Gain.Location = new System.Drawing.Point(427, 237); this.trkBand18Gain.Margin = new System.Windows.Forms.Padding(0); this.trkBand18Gain.Maximum = 200; - this.trkBand18Gain.MaximumSize = new System.Drawing.Size(63, 160); + this.trkBand18Gain.MaximumSize = new System.Drawing.Size(84, 209); this.trkBand18Gain.Minimum = -200; - this.trkBand18Gain.MinimumSize = new System.Drawing.Size(34, 160); + this.trkBand18Gain.MinimumSize = new System.Drawing.Size(45, 209); this.trkBand18Gain.Name = "trkBand18Gain"; - this.trkBand18Gain.Size = new System.Drawing.Size(45, 160); + this.trkBand18Gain.Size = new System.Drawing.Size(61, 209); this.trkBand18Gain.TabIndex = 28; this.trkBand18Gain.Text = "10.0 kHz"; this.trkBand18Gain.Value = 50; @@ -1452,14 +1411,14 @@ namespace Mesen.GUI.Forms.Config // trkBand19Gain // this.trkBand19Gain.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkBand19Gain.Location = new System.Drawing.Point(360, 183); + this.trkBand19Gain.Location = new System.Drawing.Point(488, 237); this.trkBand19Gain.Margin = new System.Windows.Forms.Padding(0); this.trkBand19Gain.Maximum = 200; - this.trkBand19Gain.MaximumSize = new System.Drawing.Size(63, 160); + this.trkBand19Gain.MaximumSize = new System.Drawing.Size(84, 209); this.trkBand19Gain.Minimum = -200; - this.trkBand19Gain.MinimumSize = new System.Drawing.Size(34, 160); + this.trkBand19Gain.MinimumSize = new System.Drawing.Size(45, 209); this.trkBand19Gain.Name = "trkBand19Gain"; - this.trkBand19Gain.Size = new System.Drawing.Size(45, 160); + this.trkBand19Gain.Size = new System.Drawing.Size(61, 209); this.trkBand19Gain.TabIndex = 29; this.trkBand19Gain.Text = "12.5 kHz"; this.trkBand19Gain.Value = 50; @@ -1468,14 +1427,14 @@ namespace Mesen.GUI.Forms.Config // trkBand20Gain // this.trkBand20Gain.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkBand20Gain.Location = new System.Drawing.Point(405, 183); + this.trkBand20Gain.Location = new System.Drawing.Point(549, 237); this.trkBand20Gain.Margin = new System.Windows.Forms.Padding(0); this.trkBand20Gain.Maximum = 200; - this.trkBand20Gain.MaximumSize = new System.Drawing.Size(63, 160); + this.trkBand20Gain.MaximumSize = new System.Drawing.Size(84, 209); this.trkBand20Gain.Minimum = -200; - this.trkBand20Gain.MinimumSize = new System.Drawing.Size(34, 160); + this.trkBand20Gain.MinimumSize = new System.Drawing.Size(45, 209); this.trkBand20Gain.Name = "trkBand20Gain"; - this.trkBand20Gain.Size = new System.Drawing.Size(52, 160); + this.trkBand20Gain.Size = new System.Drawing.Size(63, 209); this.trkBand20Gain.TabIndex = 30; this.trkBand20Gain.Text = "15 kHz"; this.trkBand20Gain.Value = 50; @@ -1487,10 +1446,10 @@ namespace Mesen.GUI.Forms.Config this.tlpEqualizer.SetColumnSpan(this.flowLayoutPanel6, 5); this.flowLayoutPanel6.Controls.Add(this.lblEqualizerPreset); this.flowLayoutPanel6.Controls.Add(this.cboEqualizerPreset); - this.flowLayoutPanel6.Location = new System.Drawing.Point(0, 2); - this.flowLayoutPanel6.Margin = new System.Windows.Forms.Padding(0, 2, 0, 0); + this.flowLayoutPanel6.Location = new System.Drawing.Point(0, 3); + this.flowLayoutPanel6.Margin = new System.Windows.Forms.Padding(0, 3, 0, 0); this.flowLayoutPanel6.Name = "flowLayoutPanel6"; - this.flowLayoutPanel6.Size = new System.Drawing.Size(167, 21); + this.flowLayoutPanel6.Size = new System.Drawing.Size(221, 25); this.flowLayoutPanel6.TabIndex = 33; this.flowLayoutPanel6.Visible = false; // @@ -1498,9 +1457,10 @@ namespace Mesen.GUI.Forms.Config // this.lblEqualizerPreset.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblEqualizerPreset.AutoSize = true; - this.lblEqualizerPreset.Location = new System.Drawing.Point(3, 4); + this.lblEqualizerPreset.Location = new System.Drawing.Point(4, 4); + this.lblEqualizerPreset.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblEqualizerPreset.Name = "lblEqualizerPreset"; - this.lblEqualizerPreset.Size = new System.Drawing.Size(40, 13); + this.lblEqualizerPreset.Size = new System.Drawing.Size(53, 17); this.lblEqualizerPreset.TabIndex = 32; this.lblEqualizerPreset.Text = "Preset:"; // @@ -1509,10 +1469,10 @@ namespace Mesen.GUI.Forms.Config this.cboEqualizerPreset.Anchor = System.Windows.Forms.AnchorStyles.Left; this.cboEqualizerPreset.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cboEqualizerPreset.FormattingEnabled = true; - this.cboEqualizerPreset.Location = new System.Drawing.Point(46, 0); + this.cboEqualizerPreset.Location = new System.Drawing.Point(61, 0); this.cboEqualizerPreset.Margin = new System.Windows.Forms.Padding(0); this.cboEqualizerPreset.Name = "cboEqualizerPreset"; - this.cboEqualizerPreset.Size = new System.Drawing.Size(121, 21); + this.cboEqualizerPreset.Size = new System.Drawing.Size(160, 25); this.cboEqualizerPreset.TabIndex = 33; this.cboEqualizerPreset.SelectedIndexChanged += new System.EventHandler(this.cboEqualizerPreset_SelectedIndexChanged); // @@ -1523,10 +1483,10 @@ namespace Mesen.GUI.Forms.Config this.tlpEqualizer.SetColumnSpan(this.flowLayoutPanel7, 4); this.flowLayoutPanel7.Controls.Add(this.lblEqualizerFilterType); this.flowLayoutPanel7.Controls.Add(this.cboEqualizerFilterType); - this.flowLayoutPanel7.Location = new System.Drawing.Point(298, 2); - this.flowLayoutPanel7.Margin = new System.Windows.Forms.Padding(0, 2, 0, 0); + this.flowLayoutPanel7.Location = new System.Drawing.Point(401, 3); + this.flowLayoutPanel7.Margin = new System.Windows.Forms.Padding(0, 3, 0, 0); this.flowLayoutPanel7.Name = "flowLayoutPanel7"; - this.flowLayoutPanel7.Size = new System.Drawing.Size(159, 21); + this.flowLayoutPanel7.Size = new System.Drawing.Size(211, 25); this.flowLayoutPanel7.TabIndex = 34; this.flowLayoutPanel7.Visible = false; // @@ -1534,9 +1494,10 @@ namespace Mesen.GUI.Forms.Config // this.lblEqualizerFilterType.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblEqualizerFilterType.AutoSize = true; - this.lblEqualizerFilterType.Location = new System.Drawing.Point(3, 4); + this.lblEqualizerFilterType.Location = new System.Drawing.Point(4, 4); + this.lblEqualizerFilterType.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblEqualizerFilterType.Name = "lblEqualizerFilterType"; - this.lblEqualizerFilterType.Size = new System.Drawing.Size(32, 13); + this.lblEqualizerFilterType.Size = new System.Drawing.Size(43, 17); this.lblEqualizerFilterType.TabIndex = 31; this.lblEqualizerFilterType.Text = "Filter:"; // @@ -1545,19 +1506,20 @@ namespace Mesen.GUI.Forms.Config this.cboEqualizerFilterType.Anchor = System.Windows.Forms.AnchorStyles.Left; this.cboEqualizerFilterType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cboEqualizerFilterType.FormattingEnabled = true; - this.cboEqualizerFilterType.Location = new System.Drawing.Point(38, 0); + this.cboEqualizerFilterType.Location = new System.Drawing.Point(51, 0); this.cboEqualizerFilterType.Margin = new System.Windows.Forms.Padding(0); this.cboEqualizerFilterType.Name = "cboEqualizerFilterType"; - this.cboEqualizerFilterType.Size = new System.Drawing.Size(121, 21); + this.cboEqualizerFilterType.Size = new System.Drawing.Size(160, 25); this.cboEqualizerFilterType.TabIndex = 32; // // tpgEffects // this.tpgEffects.Controls.Add(this.tableLayoutPanel4); - this.tpgEffects.Location = new System.Drawing.Point(4, 22); + this.tpgEffects.Location = new System.Drawing.Point(4, 26); + this.tpgEffects.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tpgEffects.Name = "tpgEffects"; - this.tpgEffects.Padding = new System.Windows.Forms.Padding(3); - this.tpgEffects.Size = new System.Drawing.Size(469, 401); + this.tpgEffects.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tpgEffects.Size = new System.Drawing.Size(628, 521); this.tpgEffects.TabIndex = 3; this.tpgEffects.Text = "Effects"; this.tpgEffects.UseVisualStyleBackColor = true; @@ -1570,23 +1532,26 @@ namespace Mesen.GUI.Forms.Config this.tableLayoutPanel4.Controls.Add(this.grpReverb, 0, 1); this.tableLayoutPanel4.Controls.Add(this.flowLayoutPanel5, 0, 2); this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel4.Location = new System.Drawing.Point(3, 3); + this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 4); + this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel4.Name = "tableLayoutPanel4"; this.tableLayoutPanel4.RowCount = 4; this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(463, 395); + this.tableLayoutPanel4.Size = new System.Drawing.Size(620, 513); this.tableLayoutPanel4.TabIndex = 0; // // grpStereo // this.grpStereo.Controls.Add(this.tlpStereoFilter); this.grpStereo.Dock = System.Windows.Forms.DockStyle.Fill; - this.grpStereo.Location = new System.Drawing.Point(3, 3); + this.grpStereo.Location = new System.Drawing.Point(4, 4); + this.grpStereo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.grpStereo.Name = "grpStereo"; - this.grpStereo.Size = new System.Drawing.Size(457, 125); + this.grpStereo.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.grpStereo.Size = new System.Drawing.Size(612, 150); this.grpStereo.TabIndex = 0; this.grpStereo.TabStop = false; this.grpStereo.Text = "Stereo"; @@ -1607,7 +1572,8 @@ namespace Mesen.GUI.Forms.Config this.tlpStereoFilter.Controls.Add(this.nudStereoPanning, 1, 2); this.tlpStereoFilter.Controls.Add(this.tableLayoutPanel9, 1, 3); this.tlpStereoFilter.Dock = System.Windows.Forms.DockStyle.Fill; - this.tlpStereoFilter.Location = new System.Drawing.Point(3, 16); + this.tlpStereoFilter.Location = new System.Drawing.Point(4, 20); + this.tlpStereoFilter.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tlpStereoFilter.Name = "tlpStereoFilter"; this.tlpStereoFilter.RowCount = 5; this.tlpStereoFilter.RowStyles.Add(new System.Windows.Forms.RowStyle()); @@ -1615,15 +1581,16 @@ namespace Mesen.GUI.Forms.Config this.tlpStereoFilter.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tlpStereoFilter.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tlpStereoFilter.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpStereoFilter.Size = new System.Drawing.Size(451, 106); + this.tlpStereoFilter.Size = new System.Drawing.Size(604, 126); this.tlpStereoFilter.TabIndex = 0; // // radStereoCombFilter // this.radStereoCombFilter.AutoSize = true; - this.radStereoCombFilter.Location = new System.Drawing.Point(3, 72); + this.radStereoCombFilter.Location = new System.Drawing.Point(4, 91); + this.radStereoCombFilter.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.radStereoCombFilter.Name = "radStereoCombFilter"; - this.radStereoCombFilter.Size = new System.Drawing.Size(77, 17); + this.radStereoCombFilter.Size = new System.Drawing.Size(100, 21); this.radStereoCombFilter.TabIndex = 4; this.radStereoCombFilter.TabStop = true; this.radStereoCombFilter.Tag = "Panning"; @@ -1634,9 +1601,10 @@ namespace Mesen.GUI.Forms.Config // this.lblStereoDelayMs.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblStereoDelayMs.AutoSize = true; - this.lblStereoDelayMs.Location = new System.Drawing.Point(131, 28); + this.lblStereoDelayMs.Location = new System.Drawing.Point(172, 35); + this.lblStereoDelayMs.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblStereoDelayMs.Name = "lblStereoDelayMs"; - this.lblStereoDelayMs.Size = new System.Drawing.Size(20, 13); + this.lblStereoDelayMs.Size = new System.Drawing.Size(26, 17); this.lblStereoDelayMs.TabIndex = 1; this.lblStereoDelayMs.Text = "ms"; // @@ -1644,9 +1612,10 @@ namespace Mesen.GUI.Forms.Config // this.lblStereoPanningAngle.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblStereoPanningAngle.AutoSize = true; - this.lblStereoPanningAngle.Location = new System.Drawing.Point(131, 51); + this.lblStereoPanningAngle.Location = new System.Drawing.Point(172, 64); + this.lblStereoPanningAngle.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblStereoPanningAngle.Name = "lblStereoPanningAngle"; - this.lblStereoPanningAngle.Size = new System.Drawing.Size(92, 13); + this.lblStereoPanningAngle.Size = new System.Drawing.Size(125, 17); this.lblStereoPanningAngle.TabIndex = 1; this.lblStereoPanningAngle.Text = "(Angle in degrees)"; // @@ -1654,9 +1623,10 @@ namespace Mesen.GUI.Forms.Config // this.radStereoDisabled.AutoSize = true; this.radStereoDisabled.Checked = true; - this.radStereoDisabled.Location = new System.Drawing.Point(3, 3); + this.radStereoDisabled.Location = new System.Drawing.Point(4, 4); + this.radStereoDisabled.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.radStereoDisabled.Name = "radStereoDisabled"; - this.radStereoDisabled.Size = new System.Drawing.Size(66, 17); + this.radStereoDisabled.Size = new System.Drawing.Size(84, 21); this.radStereoDisabled.TabIndex = 1; this.radStereoDisabled.TabStop = true; this.radStereoDisabled.Tag = "None"; @@ -1666,9 +1636,10 @@ namespace Mesen.GUI.Forms.Config // radStereoDelay // this.radStereoDelay.AutoSize = true; - this.radStereoDelay.Location = new System.Drawing.Point(3, 26); + this.radStereoDelay.Location = new System.Drawing.Point(4, 33); + this.radStereoDelay.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.radStereoDelay.Name = "radStereoDelay"; - this.radStereoDelay.Size = new System.Drawing.Size(52, 17); + this.radStereoDelay.Size = new System.Drawing.Size(65, 21); this.radStereoDelay.TabIndex = 2; this.radStereoDelay.TabStop = true; this.radStereoDelay.Tag = "Delay"; @@ -1678,9 +1649,10 @@ namespace Mesen.GUI.Forms.Config // radStereoPanning // this.radStereoPanning.AutoSize = true; - this.radStereoPanning.Location = new System.Drawing.Point(3, 49); + this.radStereoPanning.Location = new System.Drawing.Point(4, 62); + this.radStereoPanning.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.radStereoPanning.Name = "radStereoPanning"; - this.radStereoPanning.Size = new System.Drawing.Size(64, 17); + this.radStereoPanning.Size = new System.Drawing.Size(81, 21); this.radStereoPanning.TabIndex = 3; this.radStereoPanning.TabStop = true; this.radStereoPanning.Tag = "Panning"; @@ -1697,22 +1669,22 @@ namespace Mesen.GUI.Forms.Config 0, 0}); this.nudStereoDelay.IsHex = false; - this.nudStereoDelay.Location = new System.Drawing.Point(83, 24); + this.nudStereoDelay.Location = new System.Drawing.Point(108, 30); this.nudStereoDelay.Margin = new System.Windows.Forms.Padding(0); this.nudStereoDelay.Maximum = new decimal(new int[] { 100, 0, 0, 0}); - this.nudStereoDelay.MaximumSize = new System.Drawing.Size(10000, 20); + this.nudStereoDelay.MaximumSize = new System.Drawing.Size(13333, 26); this.nudStereoDelay.Minimum = new decimal(new int[] { 0, 0, 0, 0}); - this.nudStereoDelay.MinimumSize = new System.Drawing.Size(0, 21); + this.nudStereoDelay.MinimumSize = new System.Drawing.Size(0, 27); this.nudStereoDelay.Name = "nudStereoDelay"; - this.nudStereoDelay.Size = new System.Drawing.Size(45, 21); + this.nudStereoDelay.Size = new System.Drawing.Size(60, 27); this.nudStereoDelay.TabIndex = 1; this.nudStereoDelay.Value = new decimal(new int[] { 0, @@ -1730,22 +1702,22 @@ namespace Mesen.GUI.Forms.Config 0, 0}); this.nudStereoPanning.IsHex = false; - this.nudStereoPanning.Location = new System.Drawing.Point(83, 47); + this.nudStereoPanning.Location = new System.Drawing.Point(108, 59); this.nudStereoPanning.Margin = new System.Windows.Forms.Padding(0); this.nudStereoPanning.Maximum = new decimal(new int[] { 180, 0, 0, 0}); - this.nudStereoPanning.MaximumSize = new System.Drawing.Size(10000, 20); + this.nudStereoPanning.MaximumSize = new System.Drawing.Size(13333, 26); this.nudStereoPanning.Minimum = new decimal(new int[] { 180, 0, 0, -2147483648}); - this.nudStereoPanning.MinimumSize = new System.Drawing.Size(0, 21); + this.nudStereoPanning.MinimumSize = new System.Drawing.Size(0, 27); this.nudStereoPanning.Name = "nudStereoPanning"; - this.nudStereoPanning.Size = new System.Drawing.Size(45, 21); + this.nudStereoPanning.Size = new System.Drawing.Size(60, 27); this.nudStereoPanning.TabIndex = 1; this.nudStereoPanning.Value = new decimal(new int[] { 0, @@ -1771,12 +1743,12 @@ namespace Mesen.GUI.Forms.Config this.tableLayoutPanel9.Controls.Add(this.lblStereoCombFilterStrength, 3, 0); this.tableLayoutPanel9.Controls.Add(this.lblCombFilterPercent, 5, 0); this.tableLayoutPanel9.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel9.Location = new System.Drawing.Point(83, 69); + this.tableLayoutPanel9.Location = new System.Drawing.Point(108, 87); this.tableLayoutPanel9.Margin = new System.Windows.Forms.Padding(0); this.tableLayoutPanel9.Name = "tableLayoutPanel9"; this.tableLayoutPanel9.RowCount = 1; this.tableLayoutPanel9.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel9.Size = new System.Drawing.Size(368, 23); + this.tableLayoutPanel9.Size = new System.Drawing.Size(496, 35); this.tableLayoutPanel9.TabIndex = 5; // // nudStereoCombFilterStrength @@ -1789,22 +1761,22 @@ namespace Mesen.GUI.Forms.Config 0, 0}); this.nudStereoCombFilterStrength.IsHex = false; - this.nudStereoCombFilterStrength.Location = new System.Drawing.Point(187, 1); + this.nudStereoCombFilterStrength.Location = new System.Drawing.Point(247, 4); this.nudStereoCombFilterStrength.Margin = new System.Windows.Forms.Padding(0); this.nudStereoCombFilterStrength.Maximum = new decimal(new int[] { 200, 0, 0, 0}); - this.nudStereoCombFilterStrength.MaximumSize = new System.Drawing.Size(10000, 20); + this.nudStereoCombFilterStrength.MaximumSize = new System.Drawing.Size(13333, 26); this.nudStereoCombFilterStrength.Minimum = new decimal(new int[] { 1, 0, 0, 0}); - this.nudStereoCombFilterStrength.MinimumSize = new System.Drawing.Size(0, 21); + this.nudStereoCombFilterStrength.MinimumSize = new System.Drawing.Size(0, 27); this.nudStereoCombFilterStrength.Name = "nudStereoCombFilterStrength"; - this.nudStereoCombFilterStrength.Size = new System.Drawing.Size(45, 21); + this.nudStereoCombFilterStrength.Size = new System.Drawing.Size(60, 27); this.nudStereoCombFilterStrength.TabIndex = 5; this.nudStereoCombFilterStrength.Value = new decimal(new int[] { 1, @@ -1816,9 +1788,10 @@ namespace Mesen.GUI.Forms.Config // this.lblStereoCombFilterMs.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblStereoCombFilterMs.AutoSize = true; - this.lblStereoCombFilterMs.Location = new System.Drawing.Point(91, 5); + this.lblStereoCombFilterMs.Location = new System.Drawing.Point(120, 9); + this.lblStereoCombFilterMs.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblStereoCombFilterMs.Name = "lblStereoCombFilterMs"; - this.lblStereoCombFilterMs.Size = new System.Drawing.Size(20, 13); + this.lblStereoCombFilterMs.Size = new System.Drawing.Size(26, 17); this.lblStereoCombFilterMs.TabIndex = 3; this.lblStereoCombFilterMs.Text = "ms"; // @@ -1832,22 +1805,22 @@ namespace Mesen.GUI.Forms.Config 0, 0}); this.nudStereoCombFilterDelay.IsHex = false; - this.nudStereoCombFilterDelay.Location = new System.Drawing.Point(43, 1); + this.nudStereoCombFilterDelay.Location = new System.Drawing.Point(56, 4); this.nudStereoCombFilterDelay.Margin = new System.Windows.Forms.Padding(0); this.nudStereoCombFilterDelay.Maximum = new decimal(new int[] { 100, 0, 0, 0}); - this.nudStereoCombFilterDelay.MaximumSize = new System.Drawing.Size(10000, 20); + this.nudStereoCombFilterDelay.MaximumSize = new System.Drawing.Size(13333, 26); this.nudStereoCombFilterDelay.Minimum = new decimal(new int[] { 1, 0, 0, 0}); - this.nudStereoCombFilterDelay.MinimumSize = new System.Drawing.Size(0, 21); + this.nudStereoCombFilterDelay.MinimumSize = new System.Drawing.Size(0, 27); this.nudStereoCombFilterDelay.Name = "nudStereoCombFilterDelay"; - this.nudStereoCombFilterDelay.Size = new System.Drawing.Size(45, 21); + this.nudStereoCombFilterDelay.Size = new System.Drawing.Size(60, 27); this.nudStereoCombFilterDelay.TabIndex = 2; this.nudStereoCombFilterDelay.Value = new decimal(new int[] { 1, @@ -1859,9 +1832,10 @@ namespace Mesen.GUI.Forms.Config // this.lblStereoCombFilterDelay.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblStereoCombFilterDelay.AutoSize = true; - this.lblStereoCombFilterDelay.Location = new System.Drawing.Point(3, 5); + this.lblStereoCombFilterDelay.Location = new System.Drawing.Point(4, 9); + this.lblStereoCombFilterDelay.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblStereoCombFilterDelay.Name = "lblStereoCombFilterDelay"; - this.lblStereoCombFilterDelay.Size = new System.Drawing.Size(37, 13); + this.lblStereoCombFilterDelay.Size = new System.Drawing.Size(48, 17); this.lblStereoCombFilterDelay.TabIndex = 0; this.lblStereoCombFilterDelay.Text = "Delay:"; // @@ -1869,10 +1843,10 @@ namespace Mesen.GUI.Forms.Config // this.lblStereoCombFilterStrength.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblStereoCombFilterStrength.AutoSize = true; - this.lblStereoCombFilterStrength.Location = new System.Drawing.Point(134, 5); - this.lblStereoCombFilterStrength.Margin = new System.Windows.Forms.Padding(20, 0, 3, 0); + this.lblStereoCombFilterStrength.Location = new System.Drawing.Point(177, 9); + this.lblStereoCombFilterStrength.Margin = new System.Windows.Forms.Padding(27, 0, 4, 0); this.lblStereoCombFilterStrength.Name = "lblStereoCombFilterStrength"; - this.lblStereoCombFilterStrength.Size = new System.Drawing.Size(50, 13); + this.lblStereoCombFilterStrength.Size = new System.Drawing.Size(66, 17); this.lblStereoCombFilterStrength.TabIndex = 4; this.lblStereoCombFilterStrength.Text = "Strength:"; // @@ -1880,9 +1854,10 @@ namespace Mesen.GUI.Forms.Config // this.lblCombFilterPercent.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblCombFilterPercent.AutoSize = true; - this.lblCombFilterPercent.Location = new System.Drawing.Point(235, 5); + this.lblCombFilterPercent.Location = new System.Drawing.Point(311, 9); + this.lblCombFilterPercent.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblCombFilterPercent.Name = "lblCombFilterPercent"; - this.lblCombFilterPercent.Size = new System.Drawing.Size(15, 13); + this.lblCombFilterPercent.Size = new System.Drawing.Size(20, 17); this.lblCombFilterPercent.TabIndex = 6; this.lblCombFilterPercent.Text = "%"; // @@ -1890,9 +1865,11 @@ namespace Mesen.GUI.Forms.Config // this.grpReverb.Controls.Add(this.tableLayoutPanel5); this.grpReverb.Dock = System.Windows.Forms.DockStyle.Fill; - this.grpReverb.Location = new System.Drawing.Point(3, 134); + this.grpReverb.Location = new System.Drawing.Point(4, 162); + this.grpReverb.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.grpReverb.Name = "grpReverb"; - this.grpReverb.Size = new System.Drawing.Size(457, 106); + this.grpReverb.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.grpReverb.Size = new System.Drawing.Size(612, 139); this.grpReverb.TabIndex = 1; this.grpReverb.TabStop = false; this.grpReverb.Text = "Reverb"; @@ -1908,23 +1885,25 @@ namespace Mesen.GUI.Forms.Config this.tableLayoutPanel5.Controls.Add(this.trkReverbDelay, 1, 2); this.tableLayoutPanel5.Controls.Add(this.trkReverbStrength, 1, 1); this.tableLayoutPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel5.Location = new System.Drawing.Point(3, 16); + this.tableLayoutPanel5.Location = new System.Drawing.Point(4, 20); + this.tableLayoutPanel5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel5.Name = "tableLayoutPanel5"; this.tableLayoutPanel5.RowCount = 4; this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); + this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 42F)); + this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 42F)); this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel5.Size = new System.Drawing.Size(451, 87); + this.tableLayoutPanel5.Size = new System.Drawing.Size(604, 115); this.tableLayoutPanel5.TabIndex = 0; // // chkReverbEnabled // this.chkReverbEnabled.AutoSize = true; this.tableLayoutPanel5.SetColumnSpan(this.chkReverbEnabled, 2); - this.chkReverbEnabled.Location = new System.Drawing.Point(3, 3); + this.chkReverbEnabled.Location = new System.Drawing.Point(4, 4); + this.chkReverbEnabled.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.chkReverbEnabled.Name = "chkReverbEnabled"; - this.chkReverbEnabled.Size = new System.Drawing.Size(97, 17); + this.chkReverbEnabled.Size = new System.Drawing.Size(124, 21); this.chkReverbEnabled.TabIndex = 0; this.chkReverbEnabled.Text = "Enable Reverb"; this.chkReverbEnabled.UseVisualStyleBackColor = true; @@ -1933,9 +1912,10 @@ namespace Mesen.GUI.Forms.Config // this.lblReverbStrength.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblReverbStrength.AutoSize = true; - this.lblReverbStrength.Location = new System.Drawing.Point(3, 32); + this.lblReverbStrength.Location = new System.Drawing.Point(4, 41); + this.lblReverbStrength.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblReverbStrength.Name = "lblReverbStrength"; - this.lblReverbStrength.Size = new System.Drawing.Size(50, 13); + this.lblReverbStrength.Size = new System.Drawing.Size(66, 17); this.lblReverbStrength.TabIndex = 2; this.lblReverbStrength.Text = "Strength:"; // @@ -1943,29 +1923,32 @@ namespace Mesen.GUI.Forms.Config // this.lblReverbDelay.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblReverbDelay.AutoSize = true; - this.lblReverbDelay.Location = new System.Drawing.Point(3, 64); + this.lblReverbDelay.Location = new System.Drawing.Point(4, 83); + this.lblReverbDelay.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblReverbDelay.Name = "lblReverbDelay"; - this.lblReverbDelay.Size = new System.Drawing.Size(37, 13); + this.lblReverbDelay.Size = new System.Drawing.Size(48, 17); this.lblReverbDelay.TabIndex = 3; this.lblReverbDelay.Text = "Delay:"; // // trkReverbDelay // - this.trkReverbDelay.Location = new System.Drawing.Point(59, 58); + this.trkReverbDelay.Location = new System.Drawing.Point(78, 75); + this.trkReverbDelay.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trkReverbDelay.Maximum = 30; this.trkReverbDelay.Minimum = 1; this.trkReverbDelay.Name = "trkReverbDelay"; - this.trkReverbDelay.Size = new System.Drawing.Size(104, 26); + this.trkReverbDelay.Size = new System.Drawing.Size(128, 34); this.trkReverbDelay.TabIndex = 4; this.trkReverbDelay.TickFrequency = 3; this.trkReverbDelay.Value = 1; // // trkReverbStrength // - this.trkReverbStrength.Location = new System.Drawing.Point(59, 26); + this.trkReverbStrength.Location = new System.Drawing.Point(78, 33); + this.trkReverbStrength.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trkReverbStrength.Minimum = 1; this.trkReverbStrength.Name = "trkReverbStrength"; - this.trkReverbStrength.Size = new System.Drawing.Size(104, 26); + this.trkReverbStrength.Size = new System.Drawing.Size(128, 34); this.trkReverbStrength.TabIndex = 1; this.trkReverbStrength.Value = 1; // @@ -1976,20 +1959,20 @@ namespace Mesen.GUI.Forms.Config this.flowLayoutPanel5.Controls.Add(this.nudCrossFeedRatio); this.flowLayoutPanel5.Controls.Add(this.lblCrossFeedRatio); this.flowLayoutPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.flowLayoutPanel5.Location = new System.Drawing.Point(6, 243); - this.flowLayoutPanel5.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.flowLayoutPanel5.Location = new System.Drawing.Point(8, 305); + this.flowLayoutPanel5.Margin = new System.Windows.Forms.Padding(8, 0, 0, 0); this.flowLayoutPanel5.Name = "flowLayoutPanel5"; - this.flowLayoutPanel5.Size = new System.Drawing.Size(457, 25); + this.flowLayoutPanel5.Size = new System.Drawing.Size(612, 32); this.flowLayoutPanel5.TabIndex = 6; // // chkCrossFeedEnabled // this.chkCrossFeedEnabled.Anchor = System.Windows.Forms.AnchorStyles.Left; this.chkCrossFeedEnabled.AutoSize = true; - this.chkCrossFeedEnabled.Location = new System.Drawing.Point(3, 5); - this.chkCrossFeedEnabled.Margin = new System.Windows.Forms.Padding(3, 5, 3, 3); + this.chkCrossFeedEnabled.Location = new System.Drawing.Point(4, 7); + this.chkCrossFeedEnabled.Margin = new System.Windows.Forms.Padding(4, 7, 4, 4); this.chkCrossFeedEnabled.Name = "chkCrossFeedEnabled"; - this.chkCrossFeedEnabled.Size = new System.Drawing.Size(112, 17); + this.chkCrossFeedEnabled.Size = new System.Drawing.Size(146, 21); this.chkCrossFeedEnabled.TabIndex = 1; this.chkCrossFeedEnabled.Text = "Enable Crossfeed:"; this.chkCrossFeedEnabled.UseVisualStyleBackColor = true; @@ -2004,22 +1987,22 @@ namespace Mesen.GUI.Forms.Config 0, 0}); this.nudCrossFeedRatio.IsHex = false; - this.nudCrossFeedRatio.Location = new System.Drawing.Point(118, 2); + this.nudCrossFeedRatio.Location = new System.Drawing.Point(154, 2); this.nudCrossFeedRatio.Margin = new System.Windows.Forms.Padding(0); this.nudCrossFeedRatio.Maximum = new decimal(new int[] { 100, 0, 0, 0}); - this.nudCrossFeedRatio.MaximumSize = new System.Drawing.Size(10000, 20); + this.nudCrossFeedRatio.MaximumSize = new System.Drawing.Size(13333, 26); this.nudCrossFeedRatio.Minimum = new decimal(new int[] { 0, 0, 0, 0}); - this.nudCrossFeedRatio.MinimumSize = new System.Drawing.Size(0, 21); + this.nudCrossFeedRatio.MinimumSize = new System.Drawing.Size(0, 27); this.nudCrossFeedRatio.Name = "nudCrossFeedRatio"; - this.nudCrossFeedRatio.Size = new System.Drawing.Size(42, 21); + this.nudCrossFeedRatio.Size = new System.Drawing.Size(56, 27); this.nudCrossFeedRatio.TabIndex = 2; this.nudCrossFeedRatio.Value = new decimal(new int[] { 0, @@ -2031,19 +2014,21 @@ namespace Mesen.GUI.Forms.Config // this.lblCrossFeedRatio.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblCrossFeedRatio.AutoSize = true; - this.lblCrossFeedRatio.Location = new System.Drawing.Point(163, 6); + this.lblCrossFeedRatio.Location = new System.Drawing.Point(214, 7); + this.lblCrossFeedRatio.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblCrossFeedRatio.Name = "lblCrossFeedRatio"; - this.lblCrossFeedRatio.Size = new System.Drawing.Size(15, 13); + this.lblCrossFeedRatio.Size = new System.Drawing.Size(20, 17); this.lblCrossFeedRatio.TabIndex = 3; this.lblCrossFeedRatio.Text = "%"; // // tpgAdvanced // this.tpgAdvanced.Controls.Add(this.tableLayoutPanel3); - this.tpgAdvanced.Location = new System.Drawing.Point(4, 22); + this.tpgAdvanced.Location = new System.Drawing.Point(4, 26); + this.tpgAdvanced.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tpgAdvanced.Name = "tpgAdvanced"; - this.tpgAdvanced.Padding = new System.Windows.Forms.Padding(3); - this.tpgAdvanced.Size = new System.Drawing.Size(469, 401); + this.tpgAdvanced.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tpgAdvanced.Size = new System.Drawing.Size(628, 521); this.tpgAdvanced.TabIndex = 2; this.tpgAdvanced.Text = "Advanced"; this.tpgAdvanced.UseVisualStyleBackColor = true; @@ -2060,26 +2045,27 @@ namespace Mesen.GUI.Forms.Config this.tableLayoutPanel3.Controls.Add(this.chkSwapDutyCycles, 0, 3); this.tableLayoutPanel3.Controls.Add(this.chkReduceDmcPopping, 0, 1); this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 3); + this.tableLayoutPanel3.Location = new System.Drawing.Point(4, 4); + this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.RowCount = 7; - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31F)); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31F)); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31F)); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31F)); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31F)); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(463, 395); + this.tableLayoutPanel3.Size = new System.Drawing.Size(620, 513); this.tableLayoutPanel3.TabIndex = 1; // // chkDisableDynamicSampleRate // this.chkDisableDynamicSampleRate.Checked = false; this.chkDisableDynamicSampleRate.Dock = System.Windows.Forms.DockStyle.Fill; - this.chkDisableDynamicSampleRate.Location = new System.Drawing.Point(0, 60); + this.chkDisableDynamicSampleRate.Location = new System.Drawing.Point(0, 62); this.chkDisableDynamicSampleRate.Name = "chkDisableDynamicSampleRate"; - this.chkDisableDynamicSampleRate.Size = new System.Drawing.Size(463, 30); + this.chkDisableDynamicSampleRate.Size = new System.Drawing.Size(620, 31); this.chkDisableDynamicSampleRate.TabIndex = 4; this.chkDisableDynamicSampleRate.Text = "Disable dynamic sample rate"; // @@ -2087,9 +2073,9 @@ namespace Mesen.GUI.Forms.Config // this.chkDisableNoiseModeFlag.Checked = false; this.chkDisableNoiseModeFlag.Dock = System.Windows.Forms.DockStyle.Fill; - this.chkDisableNoiseModeFlag.Location = new System.Drawing.Point(0, 120); + this.chkDisableNoiseModeFlag.Location = new System.Drawing.Point(0, 124); this.chkDisableNoiseModeFlag.Name = "chkDisableNoiseModeFlag"; - this.chkDisableNoiseModeFlag.Size = new System.Drawing.Size(463, 30); + this.chkDisableNoiseModeFlag.Size = new System.Drawing.Size(620, 31); this.chkDisableNoiseModeFlag.TabIndex = 3; this.chkDisableNoiseModeFlag.Text = "Disable noise channel mode flag"; // @@ -2103,21 +2089,22 @@ namespace Mesen.GUI.Forms.Config 0, 0}); this.nudEPSMClockFrequency.IsHex = false; - this.nudEPSMClockFrequency.Location = new System.Drawing.Point(3, 183); + this.nudEPSMClockFrequency.Location = new System.Drawing.Point(4, 190); + this.nudEPSMClockFrequency.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.nudEPSMClockFrequency.Maximum = new decimal(new int[] { 32000000, 0, 0, 0}); - this.nudEPSMClockFrequency.MaximumSize = new System.Drawing.Size(10000, 20); + this.nudEPSMClockFrequency.MaximumSize = new System.Drawing.Size(13333, 26); this.nudEPSMClockFrequency.Minimum = new decimal(new int[] { 10000, 0, 0, 0}); - this.nudEPSMClockFrequency.MinimumSize = new System.Drawing.Size(200, 21); + this.nudEPSMClockFrequency.MinimumSize = new System.Drawing.Size(267, 27); this.nudEPSMClockFrequency.Name = "nudEPSMClockFrequency"; - this.nudEPSMClockFrequency.Size = new System.Drawing.Size(457, 21); + this.nudEPSMClockFrequency.Size = new System.Drawing.Size(612, 27); this.nudEPSMClockFrequency.TabIndex = 3; this.nudEPSMClockFrequency.Value = new decimal(new int[] { 10000, @@ -2129,18 +2116,20 @@ namespace Mesen.GUI.Forms.Config // this.lblEPSMClockFrequency.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblEPSMClockFrequency.AutoSize = true; - this.lblEPSMClockFrequency.Location = new System.Drawing.Point(3, 158); + this.lblEPSMClockFrequency.Location = new System.Drawing.Point(4, 162); + this.lblEPSMClockFrequency.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblEPSMClockFrequency.Name = "lblEPSMClockFrequency"; - this.lblEPSMClockFrequency.Size = new System.Drawing.Size(229, 13); + this.lblEPSMClockFrequency.Size = new System.Drawing.Size(303, 17); this.lblEPSMClockFrequency.TabIndex = 3; this.lblEPSMClockFrequency.Text = "EPSM Clock Frequency (default is 3579545Hz)"; // // chkSilenceTriangleHighFreq // this.chkSilenceTriangleHighFreq.AutoSize = true; - this.chkSilenceTriangleHighFreq.Location = new System.Drawing.Point(3, 3); + this.chkSilenceTriangleHighFreq.Location = new System.Drawing.Point(4, 4); + this.chkSilenceTriangleHighFreq.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.chkSilenceTriangleHighFreq.Name = "chkSilenceTriangleHighFreq"; - this.chkSilenceTriangleHighFreq.Size = new System.Drawing.Size(337, 17); + this.chkSilenceTriangleHighFreq.Size = new System.Drawing.Size(449, 21); this.chkSilenceTriangleHighFreq.TabIndex = 1; this.chkSilenceTriangleHighFreq.Text = "Mute ultrasonic frequencies on triangle channel (reduces popping)"; // @@ -2148,9 +2137,9 @@ namespace Mesen.GUI.Forms.Config // this.chkSwapDutyCycles.Checked = false; this.chkSwapDutyCycles.Dock = System.Windows.Forms.DockStyle.Fill; - this.chkSwapDutyCycles.Location = new System.Drawing.Point(0, 90); + this.chkSwapDutyCycles.Location = new System.Drawing.Point(0, 93); this.chkSwapDutyCycles.Name = "chkSwapDutyCycles"; - this.chkSwapDutyCycles.Size = new System.Drawing.Size(463, 30); + this.chkSwapDutyCycles.Size = new System.Drawing.Size(620, 31); this.chkSwapDutyCycles.TabIndex = 0; this.chkSwapDutyCycles.Text = "Swap square channels duty cycles (Mimics old clones)"; // @@ -2158,9 +2147,10 @@ namespace Mesen.GUI.Forms.Config // this.chkReduceDmcPopping.AutoSize = true; this.chkReduceDmcPopping.CheckAlign = System.Drawing.ContentAlignment.TopLeft; - this.chkReduceDmcPopping.Location = new System.Drawing.Point(3, 33); + this.chkReduceDmcPopping.Location = new System.Drawing.Point(4, 35); + this.chkReduceDmcPopping.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.chkReduceDmcPopping.Name = "chkReduceDmcPopping"; - this.chkReduceDmcPopping.Size = new System.Drawing.Size(243, 17); + this.chkReduceDmcPopping.Size = new System.Drawing.Size(316, 21); this.chkReduceDmcPopping.TabIndex = 2; this.chkReduceDmcPopping.Text = "Reduce popping sounds on the DMC channel"; this.chkReduceDmcPopping.TextAlign = System.Drawing.ContentAlignment.TopLeft; @@ -2168,12 +2158,13 @@ namespace Mesen.GUI.Forms.Config // // frmAudioConfig // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 17F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(477, 456); + this.ClientSize = new System.Drawing.Size(636, 588); this.Controls.Add(this.tabMain); this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "frmAudioConfig"; @@ -2353,9 +2344,5 @@ namespace Mesen.GUI.Forms.Config private System.Windows.Forms.Label lblStereoCombFilterDelay; private System.Windows.Forms.Label lblStereoCombFilterStrength; private System.Windows.Forms.Label lblCombFilterPercent; - private ctrlTrackbar trkInvA13Vol; - private ctrlTrackbar trkInvOE1Vol; - private ctrlHorizontalTrackbar trkInvOE1Pan; - private ctrlHorizontalTrackbar trkInvA13Pan; - } + } } \ No newline at end of file diff --git a/GUI.NET/Forms/Config/frmAudioConfig.cs b/GUI.NET/Forms/Config/frmAudioConfig.cs index 2024dd02..ae0fdb57 100644 --- a/GUI.NET/Forms/Config/frmAudioConfig.cs +++ b/GUI.NET/Forms/Config/frmAudioConfig.cs @@ -46,8 +46,6 @@ namespace Mesen.GUI.Forms.Config AddBinding("Sunsoft5bVolume", trkSunsoft5b); AddBinding("EPSMVolume_L", trkEPSMVol_L); AddBinding("EPSMVolume_R", trkEPSMVol_R); - AddBinding("InvA13Volume", trkInvA13Vol); - AddBinding("InvOE1Volume", trkInvOE1Vol); AddBinding("Square1Panning", trkSquare1Pan); AddBinding("Square2Panning", trkSquare2Pan); @@ -62,8 +60,6 @@ namespace Mesen.GUI.Forms.Config AddBinding("Sunsoft5bPanning", trkSunsoftPan); AddBinding("EPSMPanning_L", trkEPSMPan_L); AddBinding("EPSMPanning_R", trkEPSMPan_R); - AddBinding("InvA13Panning", trkInvA13Pan); - AddBinding("InvOE1Panning", trkInvOE1Pan); AddBinding("EPSMClockFrequency", nudEPSMClockFrequency); diff --git a/GUI.NET/Forms/frmMain.cs b/GUI.NET/Forms/frmMain.cs index cd19dbf7..b4e96624 100644 --- a/GUI.NET/Forms/frmMain.cs +++ b/GUI.NET/Forms/frmMain.cs @@ -691,7 +691,7 @@ namespace Mesen.GUI.Forms this.StartEmuThread(); this.BeginInvoke((MethodInvoker)(() => { - if(DebugWindowManager.HasOpenedWindow) { + if(DebugWindowManager.HasOpenedWindow || _luaScriptsToLoad.Count > 0) { DebugWorkspaceManager.GetWorkspace(); DebugWorkspaceManager.AutoLoadDbgFiles(true); } diff --git a/GUI.NET/InteropEmu.cs b/GUI.NET/InteropEmu.cs index 97ee7a01..80e04b60 100644 --- a/GUI.NET/InteropEmu.cs +++ b/GUI.NET/InteropEmu.cs @@ -2303,10 +2303,8 @@ namespace Mesen.GUI Namco163 = 9, Sunsoft5B = 10, EPSM_L = 11, - EPSM_R = 12, - InvA13 = 13, - InvOE1 = 14 - } + EPSM_R= 12 + } public enum EqualizerFilterType { @@ -2563,10 +2561,10 @@ namespace Mesen.GUI SortByUsageFrequency = 2, GroupBlankTiles = 4, IgnoreOverscan = 8, - SaveFrame = 16, - } + SaveFrame = 16, + } - [StructLayout(LayoutKind.Sequential)] + [StructLayout(LayoutKind.Sequential)] public class AddressTypeInfo { public Int32 Address;