CW Cyrix's Git Repository Mirror

Browse code

Various changes:

* Use enum class instead of enum (except for the enums for the resource IDs, not really necessary there).
* For NCSF specifically, included a function to convert an enum class to its underlying integral type (as this is needed for use with the std::bitset class).
* Cleanup headers so all the ones needed in a file are explicitly included even if they may possibly be included in another header.
* Used forward declarations in a few spots.
* Explicitly namespaced all (u)int*_t uses (this might seem like overkill, but it helps me see when the standard types are being used with a simple search for std::).
* Made sure it all builds with MinGW-w64 as well (both gcc and clang).
* Removed some std::move from DialogBuilder.cpp based on clang's warnings for that.
* Replaced use of std::copy_n on strings in DialogBuilder.cpp with my CopyToString functions that use wcscpy.
* Replaced CHAR_MIN/CHAR_MAX in eqstr.h and ltstr.h with std::numeric_limits<char>::min/max().

Naram Qashat authored on 2021/03/21 03:16:45
Showing 1 changed files

@@ -5,9 +5,19 @@
                                       * Partially based on the vio*sf framework
                                       */
                                     +#include <bitset>
                                     +#include <sstream>
                                     +#include <string>
                                     +#include <cstddef>
                                     +#include "windowsh_wrapper.h"
                                     +#include <windowsx.h>
                                      #include "XSFConfig_NCSF.h"
                                     +#include "XSFPlayer_NCSF.h"
                                      #include "convert.h"
                                      #ifdef _DEBUG
                                     +# include <cstdint>
                                     +# include "SSEQPlayer/common.h"
                                     +# include "SSEQPlayer/consts.h"
                                      # include "resource.h"
                                      # include <CommCtrl.h>
                                      #endif
@@ -62,11 +72,11 @@ void XSFConfig_NCSF::SaveSpecificConfig()
                                      void XSFConfig_NCSF::GenerateSpecificDialogs()
+                                     {
                                     -	this->configDialog.AddLabelControl(DialogLabelBuilder(L"Interpolation").WithSize(50, 8).InGroup(L"Output").WithRelativePositionToSibling(RelativePosition::FROM_BOTTOMLEFT, Point<short>(0, 10), 2).IsLeftJustified());
                                     -	this->configDialog.AddComboBoxControl(DialogComboBoxBuilder().WithSize(110, 14).InGroup(L"Output").WithRelativePositionToSibling(RelativePosition::FROM_TOPRIGHT, Point<short>(5, -3)).WithID(idInterpolation).
                                     +	this->configDialog.AddLabelControl(DialogLabelBuilder(L"Interpolation").WithSize(50, 8).InGroup(L"Output").WithRelativePositionToSibling(RelativePosition::PositionType::FromBottomLeft, Point<short>(0, 10), 2).IsLeftJustified());
                                     +	this->configDialog.AddComboBoxControl(DialogComboBoxBuilder().WithSize(110, 14).InGroup(L"Output").WithRelativePositionToSibling(RelativePosition::PositionType::FromTopRight, Point<short>(5, -3)).WithID(idInterpolation).
                                      		IsDropDownList().WithTabStop());
                                     -	this->configDialog.AddLabelControl(DialogLabelBuilder(L"Mute").WithSize(50, 8).InGroup(L"Output").WithRelativePositionToSibling(RelativePosition::FROM_BOTTOMLEFT, Point<short>(0, 10), 2).IsLeftJustified());
                                     -	this->configDialog.AddListBoxControl(DialogListBoxBuilder().WithSize(78, 45).WithExactHeight().InGroup(L"Output").WithRelativePositionToSibling(RelativePosition::FROM_TOPRIGHT, Point<short>(5, -3)).WithID(idMutes).
                                     +	this->configDialog.AddLabelControl(DialogLabelBuilder(L"Mute").WithSize(50, 8).InGroup(L"Output").WithRelativePositionToSibling(RelativePosition::PositionType::FromBottomLeft, Point<short>(0, 10), 2).IsLeftJustified());
                                     +	this->configDialog.AddListBoxControl(DialogListBoxBuilder().WithSize(78, 45).WithExactHeight().InGroup(L"Output").WithRelativePositionToSibling(RelativePosition::PositionType::FromTopRight, Point<short>(5, -3)).WithID(idMutes).
                                      		WithBorder().WithVerticalScrollbar().WithMultipleSelect().WithTabStop());
+                                     }
@@ -83,7 +93,7 @@ INT_PTR CALLBACK XSFConfig_NCSF::ConfigDialogProc(HWND hwndDlg, UINT uMsg, WPARA
                                      			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"16-point Sinc (Nuttall 3-term Window)"));
                                      			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_SETCURSEL, this->interpolation, 0);
                                      			// Mutes
                                     -			for (int x = 0, numMutes = this->mutes.size(); x < numMutes; ++x)
                                     +			for (std::size_t x = 0, numMutes = this->mutes.size(); x < numMutes; ++x)
+                                     			{
                                      				SendMessageW(GetDlgItem(hwndDlg, idMutes), LB_ADDSTRING, 0, reinterpret_cast<LPARAM>((L"SPU " + std::to_wstring(x + 1)).c_str()));
                                      				SendMessageW(GetDlgItem(hwndDlg, idMutes), LB_SETSEL, this->mutes[x], x);
@@ -100,14 +110,14 @@ void XSFConfig_NCSF::ResetSpecificConfigDefaults(HWND hwndDlg)
+                                     {
                                      	SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_SETCURSEL, XSFConfig_NCSF::initInterpolation, 0);
                                      	auto tmpMutes = std::bitset<16>(XSFConfig_NCSF::initMutes);
                                     -	for (int x = 0, numMutes = tmpMutes.size(); x < numMutes; ++x)
                                     +	for (std::size_t x = 0, numMutes = tmpMutes.size(); x < numMutes; ++x)
                                      		SendMessageW(GetDlgItem(hwndDlg, idMutes), LB_SETSEL, tmpMutes[x], x);
+                                     }
                                      void XSFConfig_NCSF::SaveSpecificConfigDialog(HWND hwndDlg)
+                                     {
                                      	this->interpolation = static_cast<unsigned>(SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_GETCURSEL, 0, 0));
                                     -	for (int x = 0, numMutes = this->mutes.size(); x < numMutes; ++x)
                                     +	for (std::size_t x = 0, numMutes = this->mutes.size(); x < numMutes; ++x)
                                      		this->mutes[x] = !!SendMessageW(GetDlgItem(hwndDlg, idMutes), LB_GETSEL, x, 0);
+                                     }
@@ -235,7 +245,7 @@ static inline void ProgressSetPosImmediate(HWND hDlg, int nIDDlgItem, int nPos)
+                                     	}
+                                     }
                                     -static inline int32_t muldiv7(int32_t val, uint8_t mul)
                                     +static inline std::int32_t muldiv7(std::int32_t val, std::uint8_t mul)
+                                     {
                                      	return mul == 127 ? val : ((val * mul) >> 7);
+                                     }
@@ -245,17 +255,17 @@ void XSFConfig_NCSF::RefreshSoundView()
                                      	auto player = this->soundViewData->player;
                                      	auto hDlg = this->soundViewData->hDlg;
                                      	std::wstring buf;
                                     -	for (size_t chanId = 0; chanId < 16; ++chanId)
                                     +	for (std::size_t chanId = 0; chanId < 16; ++chanId)
+                                     	{
                                      		const auto &chn = player->GetChannel(chanId);
                                     -		if (chn.state > CS_START)
                                     +		if (chn.state > ChannelState::Start)
+                                     		{
                                      			ProgressSetPosImmediate(hDlg, IDC_SOUND0PANBAR + chanId, muldiv7(128, chn.reg.panning));
                                     -			uint8_t datashift = chn.reg.volumeDiv;
                                     +			std::uint8_t datashift = chn.reg.volumeDiv;
                                      			if (datashift == 3)
                                      				datashift = 4;
                                     -			int32_t vol = muldiv7(128, chn.reg.volumeMul) >> datashift;
                                     +			std::int32_t vol = muldiv7(128, chn.reg.volumeMul) >> datashift;
                                      			ProgressSetPosImmediate(hDlg, IDC_SOUND0VOLBAR + chanId, vol);
                                      			if (this->soundViewData->volModeAlternative)
@@ -298,7 +308,7 @@ void XSFConfig_NCSF::RefreshSoundView()
+                                     			}
                                      			static const std::wstring states[] = { L"NONE", L"START", L"ATTACK", L"DECAY", L"SUSTAIN", L"RELEASE" };
                                     -			SetDlgItemTextW(hDlg, IDC_SOUND0STATE + chanId, states[chn.state].c_str());
                                     +			SetDlgItemTextW(hDlg, IDC_SOUND0STATE + chanId, states[ToIntegral(chn.state)].c_str());
                                      			SetDlgItemTextW(hDlg, IDC_SOUND0PNT + chanId, (L"samp #" + std::to_wstring(chn.reg.loopStart)).c_str());
@@ -310,9 +320,9 @@ void XSFConfig_NCSF::RefreshSoundView()
                                      			buf += tmpBuf + L" Hz)";
                                      			SetDlgItemTextW(hDlg, IDC_SOUND0TMR + chanId, buf.c_str());
                                     -			SetDlgItemTextW(hDlg, IDC_SOUND0POSLEN + chanId, (L"samp #" + std::to_wstring(static_cast<uint32_t>(chn.reg.samplePosition)) + L" / " + std::to_wstring(chn.reg.totalLength)).c_str());
                                     +			SetDlgItemTextW(hDlg, IDC_SOUND0POSLEN + chanId, (L"samp #" + std::to_wstring(static_cast<std::uint32_t>(chn.reg.samplePosition)) + L" / " + std::to_wstring(chn.reg.totalLength)).c_str());
+                                     		}
                                     -		else if (this->soundViewData->channelLastStates[chanId] != CS_NONE)
                                     +		else if (this->soundViewData->channelLastStates[chanId] != ChannelState::None)
+                                     		{
                                      			ProgressSetPosImmediate(hDlg, IDC_SOUND0PANBAR + chanId, 0);
                                      			ProgressSetPosImmediate(hDlg, IDC_SOUND0VOLBAR + chanId, 0);

...	...	@@ -247,7 +247,7 @@ void XSFConfig_NCSF::RefreshSoundView()
247	247	std::wstring buf;
248	248	for (size_t chanId = 0; chanId < 16; ++chanId)
249	249	{
250		- auto chn = player->GetChannel(chanId);
	250	+ const auto &chn = player->GetChannel(chanId);
251	251
252	252	if (chn.state > CS_START)
253	253	{

@@ -290,7 +290,7 @@ void XSFConfig_NCSF::RefreshSoundView()
                                      				if (chanId < 8)
                                      					buf += L"PSG/Noise?";
                                      				else if (chanId < 14)
                                     -					buf += std::to_wstring(chn.reg.waveDuty == 7 ? 0 : 12.5 * (chn.reg.waveDuty + 1)) + L"% Square";
                                     +					buf += ConvertFuncs::TrimDoubleString(std::to_wstring(chn.reg.waveDuty == 7 ? 0 : 12.5 * (chn.reg.waveDuty + 1))) + L"% Square";
                                      				else
                                      					buf += L"Noise";
                                      				buf += L")";
@@ -304,7 +304,7 @@ void XSFConfig_NCSF::RefreshSoundView()
                                      			std::wstring tmpBuf = ConvertFuncs::StringToWString(NumToHexString(chn.reg.timer)).substr(2);
                                      			buf = L"$" + tmpBuf + L" (";
                                     -			tmpBuf = std::to_wstring((ARM7_CLOCK / 2) / static_cast<double>(0x10000 - chn.reg.timer) / 8);
                                     +			tmpBuf = ConvertFuncs::TrimDoubleString(std::to_wstring((ARM7_CLOCK / 2) / static_cast<double>(0x10000 - chn.reg.timer) / 8));
                                      			if (tmpBuf.find('.') != std::wstring::npos)
                                      				tmpBuf = tmpBuf.substr(0, tmpBuf.find('.') + 2);
                                      			buf += tmpBuf + L" Hz)";

@@ -85,7 +85,7 @@ INT_PTR CALLBACK XSFConfig_NCSF::ConfigDialogProc(HWND hwndDlg, UINT uMsg, WPARA
                                      			// Mutes
                                      			for (int x = 0, numMutes = this->mutes.size(); x < numMutes; ++x)
+                                     			{
                                     -				SendMessageW(GetDlgItem(hwndDlg, idMutes), LB_ADDSTRING, 0, reinterpret_cast<LPARAM>((L"SPU " + wstringify(x + 1)).c_str()));
                                     +				SendMessageW(GetDlgItem(hwndDlg, idMutes), LB_ADDSTRING, 0, reinterpret_cast<LPARAM>((L"SPU " + std::to_wstring(x + 1)).c_str()));
                                      				SendMessageW(GetDlgItem(hwndDlg, idMutes), LB_SETSEL, this->mutes[x], x);
+                                     			}
                                      			break;
@@ -259,9 +259,9 @@ void XSFConfig_NCSF::RefreshSoundView()
                                      			ProgressSetPosImmediate(hDlg, IDC_SOUND0VOLBAR + chanId, vol);
                                      			if (this->soundViewData->volModeAlternative)
                                     -				buf = wstringify(chn.reg.volumeMul) + L"/" + wstringify(1 << datashift);
                                     +				buf = std::to_wstring(chn.reg.volumeMul) + L"/" + std::to_wstring(1 << datashift);
                                      			else
                                     -				buf = wstringify(vol);
                                     +				buf = std::to_wstring(vol);
                                      			SetDlgItemTextW(hDlg, IDC_SOUND0VOL + chanId, buf.c_str());
                                      			if (!chn.reg.panning)
@@ -271,18 +271,18 @@ void XSFConfig_NCSF::RefreshSoundView()
                                      			else if (chn.reg.panning == 127)
                                      				buf = L"R";
                                      			else if (chn.reg.panning < 64)
                                     -				buf = L"L" + wstringify(64 - chn.reg.panning);
                                     +				buf = L"L" + std::to_wstring(64 - chn.reg.panning);
                                      			else //if (chn.reg.panning > 64)
                                     -				buf = L"R" + wstringify(chn.reg.panning - 64);
                                     +				buf = L"R" + std::to_wstring(chn.reg.panning - 64);
                                      			SetDlgItemTextW(hDlg, IDC_SOUND0PAN + chanId, buf.c_str());
                                      			static const std::wstring modes[] = { L"Manual", L"Loop Infinite", L"One-Shot", L"Prohibited" };
                                     -			SetDlgItemTextW(hDlg, IDC_SOUND0REPEATMODE + chanId, (wstringify(chn.reg.repeatMode) + L" (" + modes[chn.reg.repeatMode] + L")").c_str());
                                     +			SetDlgItemTextW(hDlg, IDC_SOUND0REPEATMODE + chanId, (std::to_wstring(chn.reg.repeatMode) + L" (" + modes[chn.reg.repeatMode] + L")").c_str());
                                      			if (chn.reg.format != 3)
+                                     			{
                                      				static const std::wstring formats[] = { L"PCM8", L"PCM16", L"IMA-ADPCM" };
                                     -				SetDlgItemTextW(hDlg, IDC_SOUND0FORMAT + chanId, (wstringify(chn.reg.format) + L" (" + formats[chn.reg.format] + L")").c_str());
                                     +				SetDlgItemTextW(hDlg, IDC_SOUND0FORMAT + chanId, (std::to_wstring(chn.reg.format) + L" (" + formats[chn.reg.format] + L")").c_str());
+                                     			}
                                      			else
+                                     			{
@@ -290,7 +290,7 @@ void XSFConfig_NCSF::RefreshSoundView()
                                      				if (chanId < 8)
                                      					buf += L"PSG/Noise?";
                                      				else if (chanId < 14)
                                     -					buf += wstringify(chn.reg.waveDuty == 7 ? 0 : 12.5 * (chn.reg.waveDuty + 1)) + L"% Square";
                                     +					buf += std::to_wstring(chn.reg.waveDuty == 7 ? 0 : 12.5 * (chn.reg.waveDuty + 1)) + L"% Square";
                                      				else
                                      					buf += L"Noise";
                                      				buf += L")";
@@ -300,17 +300,17 @@ void XSFConfig_NCSF::RefreshSoundView()
                                      			static const std::wstring states[] = { L"NONE", L"START", L"ATTACK", L"DECAY", L"SUSTAIN", L"RELEASE" };
                                      			SetDlgItemTextW(hDlg, IDC_SOUND0STATE + chanId, states[chn.state].c_str());
                                     -			SetDlgItemTextW(hDlg, IDC_SOUND0PNT + chanId, (L"samp #" + wstringify(chn.reg.loopStart)).c_str());
                                     +			SetDlgItemTextW(hDlg, IDC_SOUND0PNT + chanId, (L"samp #" + std::to_wstring(chn.reg.loopStart)).c_str());
                                      			std::wstring tmpBuf = ConvertFuncs::StringToWString(NumToHexString(chn.reg.timer)).substr(2);
                                      			buf = L"$" + tmpBuf + L" (";
                                     -			tmpBuf = wstringify((ARM7_CLOCK / 2) / static_cast<double>(0x10000 - chn.reg.timer) / 8);
                                     +			tmpBuf = std::to_wstring((ARM7_CLOCK / 2) / static_cast<double>(0x10000 - chn.reg.timer) / 8);
                                      			if (tmpBuf.find('.') != std::wstring::npos)
                                      				tmpBuf = tmpBuf.substr(0, tmpBuf.find('.') + 2);
                                      			buf += tmpBuf + L" Hz)";
                                      			SetDlgItemTextW(hDlg, IDC_SOUND0TMR + chanId, buf.c_str());
                                     -			SetDlgItemTextW(hDlg, IDC_SOUND0POSLEN + chanId, (L"samp #" + wstringify(static_cast<uint32_t>(chn.reg.samplePosition)) + L" / " + wstringify(chn.reg.totalLength)).c_str());
                                     +			SetDlgItemTextW(hDlg, IDC_SOUND0POSLEN + chanId, (L"samp #" + std::to_wstring(static_cast<uint32_t>(chn.reg.samplePosition)) + L" / " + std::to_wstring(chn.reg.totalLength)).c_str());
+                                     		}
                                      		else if (this->soundViewData->channelLastStates[chanId] != CS_NONE)
+                                     		{

@@ -1,7 +1,6 @@
                                      /*
                                       * xSF - NCSF configuration
                                       * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
                                     - * Last modification on 2014-12-09
+                                      *
                                       * Partially based on the vio*sf framework
                                       */

@@ -1,7 +1,7 @@
                                      /*
                                       * xSF - NCSF configuration
                                       * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
                                     - * Last modification on 2014-10-25
                                     + * Last modification on 2014-12-09
+                                      *
                                       * Partially based on the vio*sf framework
                                       */
@@ -21,7 +21,7 @@ enum
                                      unsigned XSFConfig::initSampleRate = 44100;
                                      std::string XSFConfig::commonName = "NCSF Decoder";
                                     -std::string XSFConfig::versionNumber = "1.11";
                                     +std::string XSFConfig::versionNumber = "1.11.1";
                                      unsigned XSFConfig_NCSF::initInterpolation = 4;
                                      std::string XSFConfig_NCSF::initMutes = "0000000000000000";

@@ -81,7 +81,7 @@ INT_PTR CALLBACK XSFConfig_NCSF::ConfigDialogProc(HWND hwndDlg, UINT uMsg, WPARA
                                      			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"Linear"));
                                      			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"4-point, 3rd-order Legrange"));
                                      			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"6-point, 5th-order Legrange"));
                                     -			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"16-point Sinc (Lanczos Window)"));
                                     +			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"16-point Sinc (Nuttall 3-term Window)"));
                                      			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_SETCURSEL, this->interpolation, 0);
                                      			// Mutes
                                      			for (int x = 0, numMutes = this->mutes.size(); x < numMutes; ++x)

@@ -277,9 +277,6 @@ void XSFConfig_NCSF::RefreshSoundView()
                                      				buf = L"R" + wstringify(chn.reg.panning - 64);
                                      			SetDlgItemTextW(hDlg, IDC_SOUND0PAN + chanId, buf.c_str());
                                     -			SetDlgItemTextW(hDlg, IDC_SOUND0HOLD + chanId, L"---");
                                     -			SetDlgItemTextW(hDlg, IDC_SOUND0BUSY + chanId, L"---");
+                                    -
                                      			static const std::wstring modes[] = { L"Manual", L"Loop Infinite", L"One-Shot", L"Prohibited" };
                                      			SetDlgItemTextW(hDlg, IDC_SOUND0REPEATMODE + chanId, (wstringify(chn.reg.repeatMode) + L" (" + modes[chn.reg.repeatMode] + L")").c_str());
@@ -301,7 +298,8 @@ void XSFConfig_NCSF::RefreshSoundView()
                                      				SetDlgItemTextW(hDlg, IDC_SOUND0FORMAT + chanId, buf.c_str());
+                                     			}
                                     -			SetDlgItemTextW(hDlg, IDC_SOUND0SAD + chanId, L"---");
                                     +			static const std::wstring states[] = { L"NONE", L"START", L"ATTACK", L"DECAY", L"SUSTAIN", L"RELEASE" };
                                     +			SetDlgItemTextW(hDlg, IDC_SOUND0STATE + chanId, states[chn.state].c_str());
                                      			SetDlgItemTextW(hDlg, IDC_SOUND0PNT + chanId, (L"samp #" + wstringify(chn.reg.loopStart)).c_str());
@@ -321,11 +319,9 @@ void XSFConfig_NCSF::RefreshSoundView()
                                      			ProgressSetPosImmediate(hDlg, IDC_SOUND0VOLBAR + chanId, 0);
                                      			SetDlgItemTextW(hDlg, IDC_SOUND0VOL + chanId, L"---");
                                      			SetDlgItemTextW(hDlg, IDC_SOUND0PAN + chanId, L"---");
                                     -			SetDlgItemTextW(hDlg, IDC_SOUND0HOLD + chanId, L"---");
                                     -			SetDlgItemTextW(hDlg, IDC_SOUND0BUSY + chanId, L"---");
                                      			SetDlgItemTextW(hDlg, IDC_SOUND0REPEATMODE + chanId, L"---");
                                      			SetDlgItemTextW(hDlg, IDC_SOUND0FORMAT + chanId, L"---");
                                     -			SetDlgItemTextW(hDlg, IDC_SOUND0SAD + chanId, L"---");
                                     +			SetDlgItemTextW(hDlg, IDC_SOUND0STATE + chanId, L"NONE");
                                      			SetDlgItemTextW(hDlg, IDC_SOUND0PNT + chanId, L"---");
                                      			SetDlgItemTextW(hDlg, IDC_SOUND0TMR + chanId, L"---");
                                      			SetDlgItemTextW(hDlg, IDC_SOUND0POSLEN + chanId, L"---");

...	...	@@ -248,7 +248,7 @@ void XSFConfig_NCSF::RefreshSoundView()
248	248	std::wstring buf;
249	249	for (size_t chanId = 0; chanId < 16; ++chanId)
250	250	{
251		- auto &chn = player->GetChannel(chanId);
	251	+ auto chn = player->GetChannel(chanId);
252	252
253	253	if (chn.state > CS_START)
254	254	{

@@ -1,15 +1,17 @@
                                      /*
                                       * xSF - NCSF configuration
                                       * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
                                     - * Last modification on 2014-09-28
                                     + * Last modification on 2014-10-05
+                                      *
                                       * Partially based on the vio*sf framework
                                       */
                                     -#include <bitset>
                                     -#include "XSFPlayer_NCSF.h"
                                     -#include "XSFConfig.h"
                                     +#include "XSFConfig_NCSF.h"
                                      #include "convert.h"
                                     +#ifdef _DEBUG
                                     +# include "resource.h"
                                     +# include <CommCtrl.h>
                                     +#endif
                                      enum
+                                     {
@@ -17,31 +19,9 @@ enum
                                      	idMutes
                                      };
                                     -class XSFConfig_NCSF : public XSFConfig
                                     -{
                                     -protected:
                                     -	static unsigned initInterpolation;
                                     -	static std::string initMutes;
+                                    -
                                     -	friend class XSFConfig;
                                     -	unsigned interpolation;
                                     -	std::bitset<16> mutes;
+                                    -
                                     -	XSFConfig_NCSF();
                                     -	void LoadSpecificConfig();
                                     -	void SaveSpecificConfig();
                                     -	void GenerateSpecificDialogs();
                                     -	INT_PTR CALLBACK ConfigDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
                                     -	void ResetSpecificConfigDefaults(HWND hwndDlg);
                                     -	void SaveSpecificConfigDialog(HWND hwndDlg);
                                     -	void CopySpecificConfigToMemory(XSFPlayer *xSFPlayer, bool preLoad);
                                     -public:
                                     -	void About(HWND parent);
                                     -};
+                                    -
                                      unsigned XSFConfig::initSampleRate = 44100;
                                      std::string XSFConfig::commonName = "NCSF Decoder";
                                     -std::string XSFConfig::versionNumber = "1.9";
                                     +std::string XSFConfig::versionNumber = "1.9.1";
                                      unsigned XSFConfig_NCSF::initInterpolation = 4;
                                      std::string XSFConfig_NCSF::initMutes = "0000000000000000";
@@ -51,6 +31,9 @@ XSFConfig *XSFConfig::Create()
+                                     }
                                      XSFConfig_NCSF::XSFConfig_NCSF() : XSFConfig(), interpolation(0), mutes()
                                     +#ifdef _DEBUG
                                     +	, soundViewData()
                                     +#endif
+                                     {
                                      	this->supportedSampleRates.push_back(8000);
                                      	this->supportedSampleRates.push_back(11025);
@@ -131,7 +114,7 @@ void XSFConfig_NCSF::SaveSpecificConfigDialog(HWND hwndDlg)
                                      void XSFConfig_NCSF::CopySpecificConfigToMemory(XSFPlayer *xSFPlayer, bool)
+                                     {
                                     -	XSFPlayer_NCSF *NCSFPlayer = static_cast<XSFPlayer_NCSF *>(xSFPlayer);
                                     +	auto NCSFPlayer = static_cast<XSFPlayer_NCSF *>(xSFPlayer);
                                      	NCSFPlayer->SetInterpolation(this->interpolation);
                                      	NCSFPlayer->SetMutes(this->mutes);
+                                     }
@@ -141,3 +124,223 @@ void XSFConfig_NCSF::About(HWND parent)
                                      	MessageBoxW(parent, ConvertFuncs::StringToWString(XSFConfig::commonName + " v" + XSFConfig::versionNumber + ", using xSF Winamp plugin framework (based on the vio*sf plugins) by Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]\n\n"
                                      		"Utilizes code adapted from the FeOS Sound System library by fincs, git revision 5204c55 on GitHub, for audio playback.").c_str(), ConvertFuncs::StringToWString(XSFConfig::commonName + " v" + XSFConfig::versionNumber).c_str(), MB_OK);
+                                     }
+                                    +
                                     +#ifdef _DEBUG
                                     +INT_PTR CALLBACK XSFConfig_NCSF::SoundViewDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
                                     +{
                                     +	auto data = reinterpret_cast<SoundViewData *>(GetWindowLongW(hwndDlg, DWLP_USER));
                                     +	if (!data && uMsg != WM_INITDIALOG)
                                     +		return false;
+                                    +
                                     +	switch (uMsg)
                                     +	{
                                     +		case WM_INITDIALOG:
                                     +			if (!data)
                                     +			{
                                     +				data = reinterpret_cast<SoundViewData *>(lParam);
                                     +				SetWindowLongW(hwndDlg, DWLP_USER, reinterpret_cast<LONG>(data));
                                     +			}
                                     +			data->hDlg = hwndDlg;
                                     +			for (int chanId = 0; chanId < 16; ++chanId)
                                     +			{
                                     +				SendDlgItemMessageW(hwndDlg, IDC_SOUND0VOLBAR + chanId, PBM_SETRANGE, 0, MAKELPARAM(0, 128));
                                     +				SendDlgItemMessageW(hwndDlg, IDC_SOUND0PANBAR + chanId, PBM_SETRANGE, 0, MAKELPARAM(0, 128));
                                     +				SendDlgItemMessageW(hwndDlg, IDC_SOUND0MUTE + chanId, BM_SETCHECK, data->config->mutes[chanId], 0);
                                     +			}
                                     +			break;
                                     +		case WM_CLOSE:
                                     +		case WM_DESTROY:
                                     +			data->config->CloseSoundView();
                                     +			break;
                                     +		case WM_COMMAND:
                                     +			{
                                     +				auto id = GET_WM_COMMAND_ID(wParam, lParam);
                                     +				switch (id)
                                     +				{
                                     +					case IDC_BUTTON_VOLMODE:
                                     +						data->volModeAlternative = !!IsDlgButtonChecked(hwndDlg, IDC_BUTTON_VOLMODE);
                                     +						break;
                                     +					case IDC_SOUND0MUTE:
                                     +					case IDC_SOUND1MUTE:
                                     +					case IDC_SOUND2MUTE:
                                     +					case IDC_SOUND3MUTE:
                                     +					case IDC_SOUND4MUTE:
                                     +					case IDC_SOUND5MUTE:
                                     +					case IDC_SOUND6MUTE:
                                     +					case IDC_SOUND7MUTE:
                                     +					case IDC_SOUND8MUTE:
                                     +					case IDC_SOUND9MUTE:
                                     +					case IDC_SOUND10MUTE:
                                     +					case IDC_SOUND11MUTE:
                                     +					case IDC_SOUND12MUTE:
                                     +					case IDC_SOUND13MUTE:
                                     +					case IDC_SOUND14MUTE:
                                     +					case IDC_SOUND15MUTE:
                                     +						data->config->mutes[id - IDC_SOUND0MUTE] = !!IsDlgButtonChecked(hwndDlg, id);
                                     +						data->config->SaveConfig();
                                     +						data->player->SetMutes(data->config->mutes);
                                     +						break;
                                     +					case IDC_SOUND_UNMUTE_ALL:
                                     +						for (int chanId = 0; chanId < 16; ++chanId)
                                     +							SendDlgItemMessageW(hwndDlg, IDC_SOUND0MUTE + chanId, BM_SETCHECK, false, 0);
                                     +						data->config->mutes.reset();
                                     +						data->config->SaveConfig();
                                     +						data->player->SetMutes(data->config->mutes);
                                     +						break;
                                     +					default:
                                     +						return false;
                                     +				}
                                     +			}
                                     +			break;
                                     +		default:
                                     +			return false;
                                     +	}
+                                    +
                                     +	return true;
                                     +}
+                                    +
                                     +void XSFConfig_NCSF::CallSoundView(XSFPlayer *xSFPlayer, HINSTANCE hInstance, HWND hwndParent)
                                     +{
                                     +	this->soundViewData.reset(new SoundViewData);
                                     +	this->soundViewData->config = this;
                                     +	this->soundViewData->player = static_cast<XSFPlayer_NCSF *>(xSFPlayer);
+                                    +
                                     +	auto hDlg = CreateDialogParamW(hInstance, MAKEINTRESOURCEW(IDD_SOUND_VIEW), hwndParent, XSFConfig_NCSF::SoundViewDialogProc, reinterpret_cast<LPARAM>(this->soundViewData.get()));
                                     +	if (!hDlg)
                                     +	{
                                     +		this->soundViewData.reset();
                                     +		return;
                                     +	}
+                                    +
                                     +	ShowWindow(hDlg, SW_SHOW);
                                     +	UpdateWindow(hDlg);
                                     +}
+                                    +
                                     +static inline void ProgressSetPosImmediate(HWND hDlg, int nIDDlgItem, int nPos)
                                     +{
                                     +	int nMin = SendDlgItemMessageW(hDlg, nIDDlgItem, PBM_GETRANGE, true, reinterpret_cast<LPARAM>(nullptr));
                                     +	int nMax = SendDlgItemMessageW(hDlg, nIDDlgItem, PBM_GETRANGE, false, reinterpret_cast<LPARAM>(nullptr));
+                                    +
                                     +	// get rid of fancy progress animation since Windows Vista
                                     +	// http://stackoverflow.com/questions/1061715/how-do-i-make-tprogressbar-stop-lagging
                                     +	if (nPos < nMax)
                                     +	{
                                     +		SendDlgItemMessageW(hDlg, nIDDlgItem, PBM_SETPOS, nPos + 1, 0);
                                     +		SendDlgItemMessageW(hDlg, nIDDlgItem, PBM_SETPOS, nPos, 0); // This will set Progress backwards and give an instant update
                                     +	}
                                     +	else
                                     +	{
                                     +		SendDlgItemMessageW(hDlg, nIDDlgItem, PBM_SETRANGE32, nMin, nPos + 1);
                                     +		SendDlgItemMessageW(hDlg, nIDDlgItem, PBM_SETPOS, nPos + 1, 0);
                                     +		SendDlgItemMessageW(hDlg, nIDDlgItem, PBM_SETRANGE32, nMin, nPos); // This will also set Progress backwards also so instant update
                                     +	}
                                     +}
+                                    +
                                     +static inline int32_t muldiv7(int32_t val, uint8_t mul)
                                     +{
                                     +	return mul == 127 ? val : ((val * mul) >> 7);
                                     +}
+                                    +
                                     +void XSFConfig_NCSF::RefreshSoundView()
                                     +{
                                     +	auto player = this->soundViewData->player;
                                     +	auto hDlg = this->soundViewData->hDlg;
                                     +	std::wstring buf;
                                     +	for (size_t chanId = 0; chanId < 16; ++chanId)
                                     +	{
                                     +		auto &chn = player->GetChannel(chanId);
+                                    +
                                     +		if (chn.state > CS_START)
                                     +		{
                                     +			ProgressSetPosImmediate(hDlg, IDC_SOUND0PANBAR + chanId, muldiv7(128, chn.reg.panning));
                                     +			uint8_t datashift = chn.reg.volumeDiv;
                                     +			if (datashift == 3)
                                     +				datashift = 4;
                                     +			int32_t vol = muldiv7(128, chn.reg.volumeMul) >> datashift;
                                     +			ProgressSetPosImmediate(hDlg, IDC_SOUND0VOLBAR + chanId, vol);
+                                    +
                                     +			if (this->soundViewData->volModeAlternative)
                                     +				buf = wstringify(chn.reg.volumeMul) + L"/" + wstringify(1 << datashift);
                                     +			else
                                     +				buf = wstringify(vol);
                                     +			SetDlgItemTextW(hDlg, IDC_SOUND0VOL + chanId, buf.c_str());
+                                    +
                                     +			if (!chn.reg.panning)
                                     +				buf = L"L";
                                     +			else if (chn.reg.panning == 64)
                                     +				buf = L"C";
                                     +			else if (chn.reg.panning == 127)
                                     +				buf = L"R";
                                     +			else if (chn.reg.panning < 64)
                                     +				buf = L"L" + wstringify(64 - chn.reg.panning);
                                     +			else //if (chn.reg.panning > 64)
                                     +				buf = L"R" + wstringify(chn.reg.panning - 64);
                                     +			SetDlgItemTextW(hDlg, IDC_SOUND0PAN + chanId, buf.c_str());
+                                    +
                                     +			SetDlgItemTextW(hDlg, IDC_SOUND0HOLD + chanId, L"---");
                                     +			SetDlgItemTextW(hDlg, IDC_SOUND0BUSY + chanId, L"---");
+                                    +
                                     +			static const std::wstring modes[] = { L"Manual", L"Loop Infinite", L"One-Shot", L"Prohibited" };
                                     +			SetDlgItemTextW(hDlg, IDC_SOUND0REPEATMODE + chanId, (wstringify(chn.reg.repeatMode) + L" (" + modes[chn.reg.repeatMode] + L")").c_str());
+                                    +
                                     +			if (chn.reg.format != 3)
                                     +			{
                                     +				static const std::wstring formats[] = { L"PCM8", L"PCM16", L"IMA-ADPCM" };
                                     +				SetDlgItemTextW(hDlg, IDC_SOUND0FORMAT + chanId, (wstringify(chn.reg.format) + L" (" + formats[chn.reg.format] + L")").c_str());
                                     +			}
                                     +			else
                                     +			{
                                     +				buf = L"3 (";
                                     +				if (chanId < 8)
                                     +					buf += L"PSG/Noise?";
                                     +				else if (chanId < 14)
                                     +					buf += wstringify(chn.reg.waveDuty == 7 ? 0 : 12.5 * (chn.reg.waveDuty + 1)) + L"% Square";
                                     +				else
                                     +					buf += L"Noise";
                                     +				buf += L")";
                                     +				SetDlgItemTextW(hDlg, IDC_SOUND0FORMAT + chanId, buf.c_str());
                                     +			}
+                                    +
                                     +			SetDlgItemTextW(hDlg, IDC_SOUND0SAD + chanId, L"---");
+                                    +
                                     +			SetDlgItemTextW(hDlg, IDC_SOUND0PNT + chanId, (L"samp #" + wstringify(chn.reg.loopStart)).c_str());
+                                    +
                                     +			std::wstring tmpBuf = ConvertFuncs::StringToWString(NumToHexString(chn.reg.timer)).substr(2);
                                     +			buf = L"$" + tmpBuf + L" (";
                                     +			tmpBuf = wstringify((ARM7_CLOCK / 2) / static_cast<double>(0x10000 - chn.reg.timer));
                                     +			if (tmpBuf.find('.') != std::wstring::npos)
                                     +				tmpBuf = tmpBuf.substr(0, tmpBuf.find('.') + 2);
                                     +			buf += tmpBuf + L" Hz)";
                                     +			SetDlgItemTextW(hDlg, IDC_SOUND0TMR + chanId, buf.c_str());
+                                    +
                                     +			SetDlgItemTextW(hDlg, IDC_SOUND0POSLEN + chanId, (L"samp #" + wstringify(static_cast<uint32_t>(chn.reg.samplePosition)) + L" / " + wstringify(chn.reg.totalLength)).c_str());
                                     +		}
                                     +		else if (this->soundViewData->channelLastStates[chanId] != CS_NONE)
                                     +		{
                                     +			ProgressSetPosImmediate(hDlg, IDC_SOUND0PANBAR + chanId, 0);
                                     +			ProgressSetPosImmediate(hDlg, IDC_SOUND0VOLBAR + chanId, 0);
                                     +			SetDlgItemTextW(hDlg, IDC_SOUND0VOL + chanId, L"---");
                                     +			SetDlgItemTextW(hDlg, IDC_SOUND0PAN + chanId, L"---");
                                     +			SetDlgItemTextW(hDlg, IDC_SOUND0HOLD + chanId, L"---");
                                     +			SetDlgItemTextW(hDlg, IDC_SOUND0BUSY + chanId, L"---");
                                     +			SetDlgItemTextW(hDlg, IDC_SOUND0REPEATMODE + chanId, L"---");
                                     +			SetDlgItemTextW(hDlg, IDC_SOUND0FORMAT + chanId, L"---");
                                     +			SetDlgItemTextW(hDlg, IDC_SOUND0SAD + chanId, L"---");
                                     +			SetDlgItemTextW(hDlg, IDC_SOUND0PNT + chanId, L"---");
                                     +			SetDlgItemTextW(hDlg, IDC_SOUND0TMR + chanId, L"---");
                                     +			SetDlgItemTextW(hDlg, IDC_SOUND0POSLEN + chanId, L"---");
                                     +		}
+                                    +
                                     +		this->soundViewData->channelLastStates[chanId] = chn.state;
                                     +	}
                                     +}
+                                    +
                                     +void XSFConfig_NCSF::CloseSoundView()
                                     +{
                                     +	if (this->soundViewData)
                                     +	{
                                     +		DestroyWindow(this->soundViewData->hDlg);
                                     +		this->soundViewData.reset();
                                     +	}
                                     +}
                                     +#endif

@@ -1,7 +1,7 @@
                                      /*
                                       * xSF - NCSF configuration
                                       * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
                                     - * Last modification on 2014-09-17
                                     + * Last modification on 2014-09-24
+                                      *
                                       * Partially based on the vio*sf framework
                                       */
@@ -10,7 +10,6 @@
                                      #include "XSFPlayer_NCSF.h"
                                      #include "XSFConfig.h"
                                      #include "convert.h"
                                     -#include "BigSString.h"
                                      enum
+                                     {
@@ -22,7 +21,7 @@ class XSFConfig_NCSF : public XSFConfig
+                                     {
                                      protected:
                                      	static unsigned initInterpolation;
                                     -	static std::wstring initMutes;
                                     +	static std::string initMutes;
                                      	friend class XSFConfig;
                                      	unsigned interpolation;
@@ -41,10 +40,10 @@ public:
                                      };
                                      unsigned XSFConfig::initSampleRate = 44100;
                                     -std::wstring XSFConfig::commonName = L"NCSF Decoder";
                                     -std::wstring XSFConfig::versionNumber = L"1.8.1";
                                     +std::string XSFConfig::commonName = "NCSF Decoder";
                                     +std::string XSFConfig::versionNumber = "1.8.1";
                                      unsigned XSFConfig_NCSF::initInterpolation = 5;
                                     -std::wstring XSFConfig_NCSF::initMutes = L"0000000000000000";
                                     +std::string XSFConfig_NCSF::initMutes = "0000000000000000";
                                      XSFConfig *XSFConfig::Create()
+                                     {
@@ -68,15 +67,15 @@ XSFConfig_NCSF::XSFConfig_NCSF() : XSFConfig(), interpolation(0), mutes()
                                      void XSFConfig_NCSF::LoadSpecificConfig()
+                                     {
                                     -	this->interpolation = this->configIO->GetValue(L"Interpolation", XSFConfig_NCSF::initInterpolation);
                                     -	std::wstringstream mutesSS(this->configIO->GetValue(L"Mutes", XSFConfig_NCSF::initMutes));
                                     +	this->interpolation = this->configIO->GetValue("Interpolation", XSFConfig_NCSF::initInterpolation);
                                     +	std::stringstream mutesSS(this->configIO->GetValue("Mutes", XSFConfig_NCSF::initMutes));
                                      	mutesSS >> this->mutes;
+                                     }
                                      void XSFConfig_NCSF::SaveSpecificConfig()
+                                     {
                                     -	this->configIO->SetValue(L"Interpolation", this->interpolation);
                                     -	this->configIO->SetValue(L"Mutes", this->mutes.to_string<wchar_t>());
                                     +	this->configIO->SetValue("Interpolation", this->interpolation);
                                     +	this->configIO->SetValue("Mutes", this->mutes.to_string<char>());
+                                     }
                                      void XSFConfig_NCSF::GenerateSpecificDialogs()
@@ -141,6 +140,6 @@ void XSFConfig_NCSF::CopySpecificConfigToMemory(XSFPlayer *xSFPlayer, bool)
                                      void XSFConfig_NCSF::About(HWND parent)
+                                     {
                                     -	MessageBoxW(parent, (XSFConfig::commonName + L" v" + XSFConfig::versionNumber + L", using xSF Winamp plugin framework (based on the vio*sf plugins) by Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]\n\n"
                                     -		L"Utilizes code adapted from the FeOS Sound System library by fincs, git revision 5204c55 on GitHub, for audio playback.").c_str(), (XSFConfig::commonName + L" v" + XSFConfig::versionNumber).c_str(), MB_OK);
                                     +	MessageBoxW(parent, ConvertFuncs::StringToWString(XSFConfig::commonName + " v" + XSFConfig::versionNumber + ", using xSF Winamp plugin framework (based on the vio*sf plugins) by Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]\n\n"
                                     +		"Utilizes code adapted from the FeOS Sound System library by fincs, git revision 5204c55 on GitHub, for audio playback.").c_str(), ConvertFuncs::StringToWString(XSFConfig::commonName + " v" + XSFConfig::versionNumber).c_str(), MB_OK);
+                                     }

...	...	@@ -1,7 +1,7 @@
1	1	/*
2	2	* xSF - NCSF configuration
3	3	* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
4		- * Last modification on 2014-06-17
	4	+ * Last modification on 2014-09-17
5	5	*
6	6	* Partially based on the vio*sf framework
7	7	*/
...	...	@@ -69,7 +69,7 @@ XSFConfig_NCSF::XSFConfig_NCSF() : XSFConfig(), interpolation(0), mutes()
69	69	void XSFConfig_NCSF::LoadSpecificConfig()
70	70	{
71	71	this->interpolation = this->configIO->GetValue(L"Interpolation", XSFConfig_NCSF::initInterpolation);
72		- std::wstringstream mutesSS = std::wstringstream(this->configIO->GetValue(L"Mutes", XSFConfig_NCSF::initMutes));
	72	+ std::wstringstream mutesSS(this->configIO->GetValue(L"Mutes", XSFConfig_NCSF::initMutes));
73	73	mutesSS >> this->mutes;
74	74	}
75	75
...	...	@@ -141,6 +141,6 @@ void XSFConfig_NCSF::CopySpecificConfigToMemory(XSFPlayer *xSFPlayer, bool)
141	141
142	142	void XSFConfig_NCSF::About(HWND parent)
143	143	{
144		- MessageBox(parent, (XSFConfig::commonName + L" v" + XSFConfig::versionNumber + L", using xSF Winamp plugin framework (based on the vio*sf plugins) by Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]\n\n"
	144	+ MessageBoxW(parent, (XSFConfig::commonName + L" v" + XSFConfig::versionNumber + L", using xSF Winamp plugin framework (based on the vio*sf plugins) by Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]\n\n"
145	145	L"Utilizes code adapted from the FeOS Sound System library by fincs, git revision 5204c55 on GitHub, for audio playback.").c_str(), (XSFConfig::commonName + L" v" + XSFConfig::versionNumber).c_str(), MB_OK);
146	146	}

@@ -1,7 +1,7 @@
                                      /*
                                       * xSF - NCSF configuration
                                       * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
                                     - * Last modification on 2013-04-26
                                     + * Last modification on 2013-05-07
+                                      *
                                       * Partially based on the vio*sf framework
                                       */
@@ -42,7 +42,7 @@ public:
                                      unsigned XSFConfig::initSampleRate = 44100;
                                      std::wstring XSFConfig::commonName = L"NCSF Decoder";
                                     -std::wstring XSFConfig::versionNumber = L"1.7.1";
                                     +std::wstring XSFConfig::versionNumber = L"1.8";
                                      unsigned XSFConfig_NCSF::initInterpolation = 5;
                                      std::wstring XSFConfig_NCSF::initMutes = L"0000000000000000";
@@ -101,7 +101,7 @@ INT_PTR CALLBACK XSFConfig_NCSF::ConfigDialogProc(HWND hwndDlg, UINT uMsg, WPARA
                                      			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"4-point, 3rd-order B-spline"));
                                      			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"6-point, 5th-order Osculating"));
                                      			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"6-point, 5th-order B-spline"));
                                     -			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"Lanczos (Sinc)"));
                                     +			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"Sinc (Hann Window)"));
                                      			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_SETCURSEL, this->interpolation, 0);
                                      			// Mutes
                                      			for (int x = 0, numMutes = this->mutes.size(); x < numMutes; ++x)
@@ -142,5 +142,5 @@ void XSFConfig_NCSF::CopySpecificConfigToMemory(XSFPlayer *xSFPlayer, bool)
                                      void XSFConfig_NCSF::About(HWND parent)
+                                     {
                                      	MessageBox(parent, (XSFConfig::commonName + L" v" + XSFConfig::versionNumber + L", using xSF Winamp plugin framework (based on the vio*sf plugins) by Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]\n\n"
                                     -		L"Utilizes code adapted from the FeOS Sound System library by fincs, git revision 9cb9820 on GitHub, for audio playback.").c_str(), (XSFConfig::commonName + L" v" + XSFConfig::versionNumber).c_str(), MB_OK);
                                     +		L"Utilizes code adapted from the FeOS Sound System library by fincs, git revision 5204c55 on GitHub, for audio playback.").c_str(), (XSFConfig::commonName + L" v" + XSFConfig::versionNumber).c_str(), MB_OK);
+                                     }

@@ -1,7 +1,7 @@
                                      /*
                                       * xSF - NCSF configuration
                                       * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
                                     - * Last modification on 2013-04-02
                                     + * Last modification on 2013-04-10
+                                      *
                                       * Partially based on the vio*sf framework
                                       */
@@ -42,8 +42,8 @@ public:
                                      unsigned XSFConfig::initSampleRate = 44100;
                                      std::wstring XSFConfig::commonName = L"NCSF Decoder";
                                     -std::wstring XSFConfig::versionNumber = L"1.2";
                                     -unsigned XSFConfig_NCSF::initInterpolation = 5;
                                     +std::wstring XSFConfig::versionNumber = L"1.3";
                                     +unsigned XSFConfig_NCSF::initInterpolation = 7;
                                      std::wstring XSFConfig_NCSF::initMutes = L"0000000000000000";
                                      XSFConfig *XSFConfig::Create()
@@ -82,7 +82,7 @@ void XSFConfig_NCSF::SaveSpecificConfig()
                                      void XSFConfig_NCSF::GenerateSpecificDialogs()
+                                     {
                                      	this->configDialog.AddLabelControl(DialogLabelBuilder(L"Interpolation").WithSize(50, 8).InGroup(L"Output").WithRelativePositionToSibling(RelativePosition::FROM_BOTTOMLEFT, Point<short>(0, 10), 2).IsLeftJustified());
                                     -	this->configDialog.AddComboBoxControl(DialogComboBoxBuilder().WithSize(90, 14).InGroup(L"Output").WithRelativePositionToSibling(RelativePosition::FROM_TOPRIGHT, Point<short>(5, -3)).WithID(idInterpolation).
                                     +	this->configDialog.AddComboBoxControl(DialogComboBoxBuilder().WithSize(110, 14).InGroup(L"Output").WithRelativePositionToSibling(RelativePosition::FROM_TOPRIGHT, Point<short>(5, -3)).WithID(idInterpolation).
                                      		IsDropDownList().WithTabStop());
                                      	this->configDialog.AddLabelControl(DialogLabelBuilder(L"Mute").WithSize(50, 8).InGroup(L"Output").WithRelativePositionToSibling(RelativePosition::FROM_BOTTOMLEFT, Point<short>(0, 10), 2).IsLeftJustified());
                                      	this->configDialog.AddListBoxControl(DialogListBoxBuilder().WithSize(78, 45).WithExactHeight().InGroup(L"Output").WithRelativePositionToSibling(RelativePosition::FROM_TOPRIGHT, Point<short>(5, -3)).WithID(idMutes).
@@ -95,12 +95,18 @@ INT_PTR CALLBACK XSFConfig_NCSF::ConfigDialogProc(HWND hwndDlg, UINT uMsg, WPARA
+                                     	{
                                      		case WM_INITDIALOG:
                                      			// Interpolation
                                     -			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"No Interpolation"));
                                     -			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"Linear Interpolation"));
                                     -			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"Cosine Interpolation"));
                                     -			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"B-spline Interpolation"));
                                     -			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"Hermite Interpolation"));
                                     -			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"Optimal Interpolation"));
                                     +			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"None"));
                                     +			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"Linear"));
                                     +			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"Cosine"));
                                     +			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"2-point, 3rd-order Optimal 16x"));
                                     +			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"4-point, 3rd-order Hermite"));
                                     +			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"4-point, 3rd-order Lagrange"));
                                     +			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"4-point, 3rd-order B-spline"));
                                     +			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"4-point, 4th-order Optimal 16x"));
                                     +			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"6-point, 5th-order Hermite"));
                                     +			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"6-point, 5th-order Lagrange"));
                                     +			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"6-point, 5th-order B-spline"));
                                     +			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"6-point, 5th-order Optimal 16x"));
                                      			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_SETCURSEL, this->interpolation, 0);
                                      			// Mutes
                                      			for (int x = 0, numMutes = this->mutes.size(); x < numMutes; ++x)
@@ -131,13 +137,11 @@ void XSFConfig_NCSF::SaveSpecificConfigDialog(HWND hwndDlg)
                                      		this->mutes[x] = !!SendMessageW(GetDlgItem(hwndDlg, idMutes), LB_GETSEL, x, 0);
+                                     }
                                     -void XSFConfig_NCSF::CopySpecificConfigToMemory(XSFPlayer *xSFPlayer, bool preLoad)
                                     +void XSFConfig_NCSF::CopySpecificConfigToMemory(XSFPlayer *xSFPlayer, bool)
+                                     {
                                      	XSFPlayer_NCSF *NCSFPlayer = static_cast<XSFPlayer_NCSF *>(xSFPlayer);
                                     -	if (preLoad)
                                     -		NCSFPlayer->SetInterpolation(this->interpolation);
                                     -	else
                                     -		NCSFPlayer->SetMutes(this->mutes);
                                     +	NCSFPlayer->SetInterpolation(this->interpolation);
                                     +	NCSFPlayer->SetMutes(this->mutes);
+                                     }
                                      void XSFConfig_NCSF::About(HWND parent)

Various changes:

Correct a few warnings Visual Studio was complaining about.

A few more conversion changes:

Some conversion replacements:

Remove last modification date from files.

[NCSF] Fix PSG output.

[NCSF] Update version and README for the previous change.

[NCSF] Utilize the PLAYER blocks in the SDAT if they exist.

[NCSF] Bump version number for the previous fixes.

[NCSF] Changed sinc interpolation to a Nuttall 3-term Window on suggestion from kode54.

[NCSF] Changes to the Sound View debug window: * No longer has the hold/busy items. * Source Address replaced with State.

[NCSF] Minor edit with the debug Sound View so it doesn't use a reference.

[NCSF] Bump version number for the previous volume fixes.

[NCSF] Move track allocation into the SSEQ command handler.

[NCSF] Implemented the random, variable, and conditional commands. Also fixed loop counter.

[NCSF] Fix volume issues with a little help from the Nintendo DS SDK.

[NCSF] Should've updated the version number before.

[NCSF] Interpolation changes:

Lots of changes in regards to strings, as follows:

* Fixes for gcc and clang (while they can compile the code, the DLLs made aren't functional, but oh well).

Reverted Sinc interpolation back to the Lanczos window.

Minor update to scale the phase offset, thanks to kode54.

Fixed up the Lanczos interpolation in NCSF (thanks to kode54), also allowed the NCSF plugin to use 32-bit samples in it's GenerateSamples function.

Added Lanczos interpolation to the NCSF plugin, and cleaned up a bit of the other code, as well as removing pstdint.h since it's no longer needed.

Forgot to update the version number on the last commit.

Removed the optimal, lagrange, and hermite interpolations and added in 2nd-order osculating.

Updated version number for the previous 2 revisions.

Added new interpolation methods, added version number in plugin description.

Import actual code.