CW Cyrix's Git Repository Mirror

Browse code

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.

Naram Qashat authored on 2013/04/23 20:29:21
Showing 28 changed files

src/in_2sf/XSFPlayer_2SF.cpp index c52e048..1cc019a 100644
src/in_2sf/desmume/metaspu/SoundTouch/RateTransposer.cpp index 892c103..d1356d4 100644
src/in_2sf/desmume/metaspu/SoundTouch/STTypes.h index 7149e10..b38ea11 100644
src/in_2sf/desmume/metaspu/SoundTouch/SoundTouch.cpp index 8cbbc4a..5d4537c 100644
src/in_2sf/desmume/types.h index 9e74dae..2b3cca2 100644
src/in_2sf/desmume/utils/AsmJit/core/build.h index aa12e00..6d452da 100644
src/in_2sf/desmume/utils/dlditool.cpp index a775b0b..ce12ddd 100644
src/in_gsf/XSFPlayer_GSF.cpp index f81cf4f..a3e8220 100644
src/in_ncsf/SSEQPlayer/Channel.cpp index 7a5dc85..3a88a8b 100644
src/in_ncsf/SSEQPlayer/Channel.h index 0aa152f..7e32596 100644
src/in_ncsf/SSEQPlayer/common.h index bf15a92..cc0fe56 100644
src/in_ncsf/SSEQPlayer/consts.h index bcf0c3b..b9808e9 100644
src/in_ncsf/XSFConfig_NCSF.cpp index 4687177..a0bf70b 100644
src/in_ncsf/XSFPlayer_NCSF.cpp index 43bc611..de9b623 100644
src/in_snsf/XSFPlayer_SNSF.cpp index 144a24e..f735c3e 100644
src/in_snsf/snes9x/port.h index b5db7b5..3716835 100644
src/in_xsf_framework/DialogBuilder.cpp index 89b2d94..ffd282b 100644
src/in_xsf_framework/UTFEncodeDecode.h index f796b4c..e8c4cf7 100644
src/in_xsf_framework/XSFCommon.h index 545dee5..59b21e8 100644
src/in_xsf_framework/XSFConfig.cpp index 1d612af..39c03d4 100644
src/in_xsf_framework/XSFConfig_Winamp.cpp index 2b40814..801d237 100644
src/in_xsf_framework/XSFFile.h index 2bd8b17..9a9b69a 100644
src/in_xsf_framework/XSFPlayer.cpp index 8cdb3e1..1360281 100644
src/in_xsf_framework/XSFPlayer.h index 4ffac92..957b2bf 100644
src/in_xsf_framework/convert.h index efd37d4..cae7326 100644
src/in_xsf_framework/DialogBuilder.h index 6d2b994..a2024d0 100644
src/in_xsf_framework/in_xsf.cpp index b4f92eb..8e51855 100644
src/in_xsf_framework/pstdint.h index cf6c18d..0000000

@@ -1,7 +1,7 @@
 /*
  * xSF - 2SF Player
  * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-04-17
+ * Last modification on 2013-04-23
  *
  * Based on a modified vio2sf v0.22c
  *
@@ -185,12 +185,12 @@ bool XSFPlayer_2SF::Load2SF(XSFFile *xSFToLoad)
 
 XSFPlayer_2SF::XSFPlayer_2SF(const std::string &filename) : XSFPlayer()
 {
-	this->xSF = new XSFFile(filename, 4, 8);
+	this->xSF.reset(new XSFFile(filename, 4, 8));
 }
 
 XSFPlayer_2SF::XSFPlayer_2SF(const std::wstring &filename) : XSFPlayer()
 {
-	this->xSF = new XSFFile(filename, 4, 8);
+	this->xSF.reset(new XSFFile(filename, 4, 8));
 }
 
 bool XSFPlayer_2SF::Load()
@@ -199,7 +199,7 @@ bool XSFPlayer_2SF::Load()
 	sndifwork.sync_type = this->xSF->GetTagValue("_2sf_sync_type", 0);
 
 	sndifwork.xfs_load = false;
-	if (!this->Load2SF(this->xSF))
+	if (!this->Load2SF(this->xSF.get()))
 		return false;
 
 	if (NDS_Init())

src/in_2sf/desmume/metaspu/SoundTouch/RateTransposer.cpp

History View file @ 7e09154

@@ -221,7 +221,7 @@ void RateTransposer::processSamples(const SAMPLETYPE *src, uint32_t nSamples)
+                     {
                      	if (!nSamples)
                      		return;
                     -	assert(this->pAAFilter.get());
                     +	assert(this->pAAFilter);
                      	// If anti-alias filter is turned off, simply transpose without applying
                      	// the filter

src/in_2sf/desmume/metaspu/SoundTouch/STTypes.h

History View file @ 7e09154

@@ -39,7 +39,7 @@
                      #ifndef STTypes_H
                      #define STTypes_H
                     -#include "pstdint.h"
                     +#include <cstdint>
                      namespace soundtouch
+                     {

src/in_2sf/desmume/metaspu/SoundTouch/SoundTouch.cpp

History View file @ 7e09154

@@ -328,7 +328,7 @@ void SoundTouch::clear()
 /// Returns number of samples currently unprocessed.
 uint32_t SoundTouch::numUnprocessedSamples() const
 {
-	if (this->pTDStretch.get())
+	if (this->pTDStretch)
 	{
 		FIFOSamplePipe *psp = this->pTDStretch->getInput();
 		if (psp)

src/in_2sf/desmume/types.h

History View file @ 7e09154

@@ -19,7 +19,7 @@
                      #ifndef TYPES_HPP
                      #define TYPES_HPP
                     -#include "pstdint.h"
                     +#include <cstdint>
                      #ifdef _WINDOWS
                      # define HAVE_LIBAGG

src/in_2sf/desmume/utils/AsmJit/core/build.h

History View file @ 7e09154

@@ -164,7 +164,7 @@ namespace AsmJit
                      // [AsmJit - Types]
                      // ============================================================================
                     -#include "pstdint.h"
                     +#include <cstdint>
                      #ifdef ASMJIT_X86
                      typedef int32_t sysint_t;

src/in_2sf/desmume/utils/dlditool.cpp

History View file @ 7e09154

@@ -60,7 +60,7 @@
                      #include <cstdlib>
                      #include <cstdarg>
                     -#include "pstdint.h"
                     +#include <cstdint>
                      #ifndef _MSC_VER
                      # include <unistd.h>
                      # include <sys/param.h>

src/in_gsf/XSFPlayer_GSF.cpp

History View file @ 7e09154

@@ -1,7 +1,7 @@
 /*
  * xSF - GSF Player
  * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-03-30
+ * Last modification on 2013-04-23
  *
  * Based on a modified viogsf v0.08
  *
@@ -192,17 +192,17 @@ static bool Load2SF(XSFFile *xSF)
 
 XSFPlayer_GSF::XSFPlayer_GSF(const std::string &filename) : XSFPlayer()
 {
-	this->xSF = new XSFFile(filename, 8, 12);
+	this->xSF.reset(new XSFFile(filename, 8, 12));
 }
 
 XSFPlayer_GSF::XSFPlayer_GSF(const std::wstring &filename) : XSFPlayer()
 {
-	this->xSF = new XSFFile(filename, 8, 12);
+	this->xSF.reset(new XSFFile(filename, 8, 12));
 }
 
 bool XSFPlayer_GSF::Load()
 {
-	if (!Load2SF(this->xSF))
+	if (!Load2SF(this->xSF.get()))
 		return false;
 
 	cpuIsMultiBoot = (loaderwork.entry >> 24) == 2;

src/in_ncsf/SSEQPlayer/Channel.cpp

History View file @ 7e09154

@@ -1,7 +1,7 @@
                      /*
                       * SSEQ Player - Channel structures
                       * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
                     - * Last modification on 2013-04-18
                     + * Last modification on 2013-04-23
+                      *
                       * Adapted from source code of FeOS Sound System
                       * By fincs
@@ -11,8 +11,7 @@
                       * http://desmume.org/
                       */
                     -#define _USE_MATH_DEFINES
                     -#include <cmath>
                     +#include "XSFCommon.h"
                      #include "Channel.h"
                      #include "Player.h"
                      #include "common.h"
@@ -43,11 +42,33 @@ TempSndReg::TempSndReg() : CR(0), SOURCE(nullptr), TIMER(0), REPEAT_POINT(0), LE
+                     {
+                     }
                     +bool Channel::initializedLUTs = false;
                     +double Channel::cosine_lut[Channel::COSINE_RESOLUTION];
                     +double Channel::lanczos_lut[Channel::LANCZOS_SAMPLES];
+                    +
                     +#ifndef M_PI
                     +static const double M_PI = 3.14159265358979323846;
                     +#endif
+                    +
                     +static inline double sinc(double x)
                     +{
                     +	return fEqual(x, 0.0) ? 1.0 : std::sin(x * M_PI) / (x * M_PI);
                     +}
+                    +
                      Channel::Channel() : chnId(-1), tempReg(), state(CS_NONE), trackId(-1), prio(0), manualSweep(false), flags(), pan(0), extAmpl(0), velocity(0), extPan(0),
                      	key(0), ampl(0), extTune(0), orgKey(0), modType(0), modSpeed(0), modDepth(0), modRange(0), modDelay(0), modDelayCnt(0), modCounter(0),
                      	sweepLen(0), sweepCnt(0), sweepPitch(0), attackLvl(0), sustainLvl(0x7F), decayRate(0), releaseRate(0xFFFF), noteLength(-1), vol(0), ply(nullptr), reg()
+                     {
                      	this->clearHistory();
                     +	if (!this->initializedLUTs)
                     +	{
                     +		for (unsigned i = 0; i < COSINE_RESOLUTION; ++i)
                     +			this->cosine_lut[i] = (1.0 - std::cos((static_cast<double>(i) / COSINE_RESOLUTION) * M_PI)) * 0.5;
                     +		double dx = static_cast<double>(LANCZOS_WIDTH) / LANCZOS_SAMPLES, x = 0.0;
                     +		for (unsigned i = 0; i < LANCZOS_SAMPLES; ++i, x += dx)
                     +			this->lanczos_lut[i] = std::abs(x) < LANCZOS_WIDTH ? sinc(x) * sinc(x / LANCZOS_WIDTH) : 0.0;
                     +		this->initializedLUTs = true;
                     +	}
+                     }
                      void Channel::UpdateVol(const Track &trk)
@@ -575,10 +596,6 @@ static const int16_t wavedutytbl[8][8] =
                      	{ -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF }
                      };
                     -#ifndef M_PI
                     -static const double M_PI = 3.14159265358979323846;
                     -#endif
+                    -
                      // Linear and Cosine interpolation code originally from DeSmuME
                      // B-spline and Osculating come from Olli Niemitalo:
                      // http://www.student.oulu.fi/~oniemita/dsp/deip.pdf
@@ -612,7 +629,7 @@ int32_t Channel::Interpolate()
                      				c5 = 1 / 120.0 * (d - y) + 1 / 24.0 * (z - c) + 1 / 12.0 * (b - a);
                      				return static_cast<int32_t>(((((c5 * ratio + c4) * ratio + c3) * ratio + c2) * ratio + c1) * ratio + c0);
+                     			}
                     -			else // INTERPOLATION_6POINTOSCULATING
                     +			else if (this->ply->interpolation == INTERPOLATION_6POINTOSCULATING)
+                     			{
                      				ratio -= 0.5;
                      				double even1 = y + d, odd1 = y - d;
@@ -626,6 +643,19 @@ int32_t Channel::Interpolate()
                      				c5 = 25 / 24.0 * odd2 - 25 / 12.0 * odd3 - 5 / 24.0 * odd1;
                      				return static_cast<int32_t>(((((c5 * ratio + c4) * ratio + c3) * ratio + c2) * ratio + c1) * ratio + c0);
+                     			}
                     +			else // INTERPOLATION_6POINTLANCZOS
                     +			{
                     +				double kernel[6], kernel_sum = 0.0;
                     +				int i = 3, shift = static_cast<int>(std::floor(ratio * LANCZOS_RESOLUTION));
                     +				for (; i >= -2; --i)
                     +				{
                     +					int pos = i * LANCZOS_RESOLUTION;
                     +					kernel_sum += kernel[i + 2] = this->lanczos_lut[std::abs(shift - pos)];
                     +				}
                     +				for (i = 0; i < 6; ++i)
                     +					kernel[i] /= kernel_sum;
                     +				return static_cast<int32_t>(y * kernel[0] + z * kernel[1] + a * kernel[2] + b * kernel[3] + c * kernel[4] + d * kernel[5]);
                     +			}
+                     		}
                      		else // INTERPOLATION_4POINTBSPLINE
+                     		{
@@ -638,10 +668,7 @@ int32_t Channel::Interpolate()
+                     		}
+                     	}
                      	else if (this->ply->interpolation == INTERPOLATION_COSINE)
                     -	{
                     -		double ratio2 = (1.0 - std::cos(ratio * M_PI)) * 0.5;
                     -		return static_cast<int32_t>(a + ratio2 * (b - a));
                     -	}
                     +		return static_cast<int32_t>(a + this->cosine_lut[static_cast<unsigned>(ratio * COSINE_RESOLUTION)] * (b - a));
                      	else // INTERPOLATION_LINEAR
                      		return static_cast<int32_t>(a + ratio * (b - a));
+                     }

src/in_ncsf/SSEQPlayer/Channel.h

History View file @ 7e09154

@@ -1,7 +1,7 @@
                      /*
                       * SSEQ Player - Channel structures
                       * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
                     - * Last modification on 2013-04-18
                     + * Last modification on 2013-04-23
+                      *
                       * Adapted from source code of FeOS Sound System
                       * By fincs
@@ -15,10 +15,9 @@
                      #define SSEQPLAYER_CHANNEL_H
                      #include <bitset>
                     -#include <tuple>
                     +#include <cstdint>
                      #include "SWAV.h"
                      #include "Track.h"
                     -#include "pstdint.h"
                      /*
                       * This structure is meant to be similar to what is stored in the actual
@@ -135,6 +134,20 @@ struct Channel
                      	uint32_t sampleHistoryPtr;
                      	int16_t sampleHistory[16];
                     +	/*
                     +	 * Lookup tables for the cosine and Lanczos Sinc interpolations, to
                     +	 * avoid the need to call the sin/cos functions all the time.
                     +	 * These are static as they will not change between channels or runs
                     +	 * of the program.
                     +	 */
                     +	static bool initializedLUTs;
                     +	static const unsigned COSINE_RESOLUTION = 8192;
                     +	static const unsigned LANCZOS_RESOLUTION = 8192;
                     +	static const unsigned LANCZOS_WIDTH = 3;
                     +	static const unsigned LANCZOS_SAMPLES = LANCZOS_RESOLUTION * LANCZOS_WIDTH;
                     +	static double cosine_lut[COSINE_RESOLUTION];
                     +	static double lanczos_lut[LANCZOS_SAMPLES];
+                    +
                      	Channel();
                      	void UpdateVol(const Track &trk);

src/in_ncsf/SSEQPlayer/common.h

History View file @ 7e09154

@@ -1,7 +1,7 @@
                      /*
                       * SSEQ Player - Common functions
                       * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
                     - * Last modification on 2013-03-3
                     + * Last modification on 2013-04-23
+                      *
                       * Some code from FeOS Sound System
                       * By fincs
@@ -14,7 +14,7 @@
                      #include <string>
                      #include <vector>
                      #include <cstring>
                     -#include "pstdint.h"
                     +#include <cstdint>
                      /*
                       * Pseudo-file data structure

src/in_ncsf/SSEQPlayer/consts.h

History View file @ 7e09154

@@ -1,7 +1,7 @@
                      /*
                       * SSEQ Player - Constants/Macros
                       * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
                     - * Last modification on 2013-04-12
                     + * Last modification on 2013-04-23
+                      *
                       * Adapted from source code of FeOS Sound System
                       * By fincs
@@ -14,7 +14,7 @@
                      #ifndef SSEQPLAYER_CONSTS_H
                      #define SSEQPLAYER_CONSTS_H
                     -#include "pstdint.h"
                     +#include <cstdint>
                      const uint32_t ARM7_CLOCK = 33513982;
                      const double SecondsPerClockCycle = 64.0 * 2728.0 / ARM7_CLOCK;
@@ -58,7 +58,8 @@ enum Interpolation
                      	INTERPOLATION_COSINE,
                      	INTERPOLATION_4POINTBSPLINE,
                      	INTERPOLATION_6POINTOSCULATING,
                     -	INTERPOLATION_6POINTBSPLINE
                     +	INTERPOLATION_6POINTBSPLINE,
                     +	INTERPOLATION_6POINTLANCZOS
                      };
                      #endif

src/in_ncsf/XSFConfig_NCSF.cpp

History View file @ 7e09154

@@ -1,7 +1,7 @@
                      /*
                       * xSF - NCSF configuration
                       * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
                     - * Last modification on 2013-04-18
                     + * Last modification on 2013-04-23
+                      *
                       * 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.5";
                     +std::wstring XSFConfig::versionNumber = L"1.6";
                      unsigned XSFConfig_NCSF::initInterpolation = 5;
                      std::wstring XSFConfig_NCSF::initMutes = L"0000000000000000";
@@ -101,6 +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"6-point Lanczos (Sinc)"));
                      			SendMessageW(GetDlgItem(hwndDlg, idInterpolation), CB_SETCURSEL, this->interpolation, 0);
                      			// Mutes
                      			for (int x = 0, numMutes = this->mutes.size(); x < numMutes; ++x)

src/in_ncsf/XSFPlayer_NCSF.cpp

History View file @ 7e09154

@@ -1,7 +1,7 @@
 /*
  * xSF - NCSF Player
  * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-04-01
+ * Last modification on 2013-04-23
  *
  * Partially based on the vio*sf framework
  *
@@ -96,17 +96,17 @@ bool XSFPlayer_NCSF::RecursiveLoadNCSF(XSFFile *xSFToLoad, int level)
 
 bool XSFPlayer_NCSF::LoadNCSF()
 {
-	return this->RecursiveLoadNCSF(this->xSF, 1);
+	return this->RecursiveLoadNCSF(this->xSF.get(), 1);
 }
 
 XSFPlayer_NCSF::XSFPlayer_NCSF(const std::string &filename) : XSFPlayer()
 {
-	this->xSF = new XSFFile(filename, 8, 12);
+	this->xSF.reset(new XSFFile(filename, 8, 12));
 }
 
 XSFPlayer_NCSF::XSFPlayer_NCSF(const std::wstring &filename) : XSFPlayer()
 {
-	this->xSF = new XSFFile(filename, 8, 12);
+	this->xSF.reset(new XSFFile(filename, 8, 12));
 }
 
 bool XSFPlayer_NCSF::Load()

src/in_snsf/XSFPlayer_SNSF.cpp

History View file @ 7e09154

@@ -1,7 +1,7 @@
 /*
  * xSF - SNSF Player
  * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-03-30
+ * Last modification on 2013-04-23
  *
  * Based on a modified in_snsf by Caitsith2
  * http://snsf.caitsith2.net/
@@ -207,17 +207,17 @@ static bool Load2SF(XSFFile *xSF)
 
 XSFPlayer_SNSF::XSFPlayer_SNSF(const std::string &filename) : XSFPlayer()
 {
-	this->xSF = new XSFFile(filename, 4, 8);
+	this->xSF.reset(new XSFFile(filename, 4, 8));
 }
 
 XSFPlayer_SNSF::XSFPlayer_SNSF(const std::wstring &filename) : XSFPlayer()
 {
-	this->xSF = new XSFFile(filename, 4, 8);
+	this->xSF.reset(new XSFFile(filename, 4, 8));
 }
 
 bool XSFPlayer_SNSF::Load()
 {
-	if (!Load2SF(this->xSF))
+	if (!Load2SF(this->xSF.get()))
 		return false;
 
 	Settings.SoundSync = true;

src/in_snsf/snes9x/port.h

History View file @ 7e09154

@@ -211,7 +211,7 @@
                      #define PIXEL_FORMAT RGB555
                      #endif
                     -#include "pstdint.h"
                     +#include <cstdint>
                      /*#ifndef snes9x_types_defined
                      #define snes9x_types_defined
                      typedef unsigned char		bool8;

src/in_xsf_framework/DialogBuilder.cpp

History View file @ 7e09154

@@ -1,7 +1,7 @@
                      /*
                       * Windows Dynamic Dialog Builder framework
                       * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
                     - * Last modification on 2013-03-30
                     + * Last modification on 2013-04-23
                       */
                      #include "DialogBuilder.h"
@@ -16,13 +16,33 @@ static inline uint32_t getNextMultipleOf4(uint32_t origNum)
                      	return origNum + 4 - remainder;
+                     }
                     +Point<short> RelativePosition::CalculatePosition(const Rect<short> &child, const Rect<short> &other)
                     +{
                     +	Point<short> newPosition = child.position;
                     +	if (this->relativePosition.y != -1)
                     +	{
                     +		if (this->positionType == FROM_TOP || this->positionType == FROM_TOPLEFT || this->positionType == FROM_TOPRIGHT)
                     +			newPosition.y = other.position.y + this->relativePosition.y;
                     +		if (this->positionType == FROM_BOTTOM || this->positionType == FROM_BOTTOMLEFT || this->positionType == FROM_BOTTOMRIGHT)
                     +			newPosition.y = other.position.y + other.size.height + this->relativePosition.y;
                     +	}
                     +	if (this->relativePosition.x != -1)
                     +	{
                     +		if (this->positionType == FROM_LEFT || this->positionType == FROM_TOPLEFT || this->positionType == FROM_BOTTOMLEFT)
                     +			newPosition.x = other.position.x + this->relativePosition.x;
                     +		if (this->positionType == FROM_RIGHT || this->positionType == FROM_TOPRIGHT || this->positionType == FROM_BOTTOMRIGHT)
                     +			newPosition.x = other.position.x + other.size.width + this->relativePosition.x;
                     +	}
                     +	return newPosition;
                     +}
+                    +
                      void DialogTemplate::DialogGroup::CalculatePositions(bool doRightAndBottom)
+                     {
                      	short x = 0, num = this->controls.empty() ? 0 : this->controls.size();
                      	for (; x < num; ++x)
+                     	{
                      		auto &control = this->controls[x];
                     -		if (control->relativePosition.get())
                     +		if (control->relativePosition)
+                     		{
                      			bool valid = true;
                      			if (!doRightAndBottom && control->relativePosition->type == RelativePosition::TO_PARENT)
@@ -61,7 +81,7 @@ void DialogTemplate::DialogGroup::CalculateSize()
                      	std::for_each(this->controls.begin(), this->controls.end(), [&](const std::unique_ptr<DialogControl> &control)
+                     	{
                      		bool usePosition = true;
                     -		if (control->relativePosition.get())
                     +		if (control->relativePosition)
+                     		{
                      			if (control->relativePosition->type == RelativePosition::TO_PARENT)
+                     			{
@@ -129,6 +149,7 @@ std::vector<uint8_t> DialogTemplate::DialogGroup::GenerateControlTemplate() cons
                      std::vector<uint8_t> DialogTemplate::DialogControlWithoutLabel::GenerateControlTemplate() const
+                     {
                      	auto data = std::vector<uint8_t>(getNextMultipleOf4(24 + sizeof(wchar_t)), 0);
+                    +
                      	*reinterpret_cast<uint32_t *>(&data[0]) = WS_CHILD | WS_VISIBLE | this->style;
                      	*reinterpret_cast<uint32_t *>(&data[4]) = this->exstyle;
                      	*reinterpret_cast<uint16_t *>(&data[8]) = this->rect.position.x;
@@ -145,6 +166,7 @@ std::vector<uint8_t> DialogTemplate::DialogControlWithoutLabel::GenerateControlT
                      std::vector<uint8_t> DialogTemplate::DialogControlWithLabel::GenerateControlTemplate() const
+                     {
                      	auto data = std::vector<uint8_t>(getNextMultipleOf4(24 + sizeof(wchar_t) * (this->label.length() + 1)), 0);
+                    +
                      	*reinterpret_cast<uint32_t *>(&data[0]) = WS_CHILD | WS_VISIBLE | this->style;
                      	*reinterpret_cast<uint32_t *>(&data[4]) = this->exstyle;
                      	*reinterpret_cast<uint16_t *>(&data[8]) = this->rect.position.x;
@@ -168,7 +190,7 @@ uint16_t DialogTemplate::GetTotalControlCount() const
                      void DialogTemplate::AddGroupControl(const DialogControlBuilder<DialogGroupBuilder> &builder)
+                     {
                     -	std::unique_ptr<DialogControl> newGroup = DialogGroup::CreateControl(builder);
                     +	auto newGroup = DialogGroup::CreateControl(builder);
                      	if (builder.index == -1)
                      		this->controls.push_back(std::move(newGroup));
                      	else
@@ -209,7 +231,7 @@ bool DialogTemplate::CalculateControlPosition(short index, bool doRightAndBottom
+                     {
                      	auto &control = this->controls[index];
                      	bool valid = true;
                     -	if (control->relativePosition.get())
                     +	if (control->relativePosition)
+                     	{
                      		if (!doRightAndBottom && control->relativePosition->type == RelativePosition::TO_PARENT)
+                     		{
@@ -247,7 +269,7 @@ void DialogTemplate::CalculateSize()
                      	std::for_each(this->controls.begin(), this->controls.end(), [&](const std::unique_ptr<DialogControl> &control)
+                     	{
                      		bool usePosition = true;
                     -		if (control->relativePosition.get())
                     +		if (control->relativePosition)
+                     		{
                      			if (control->relativePosition->type == RelativePosition::TO_PARENT)
+                     			{
@@ -319,6 +341,7 @@ const DLGTEMPLATE *DialogTemplate::GenerateTemplate()
                      	this->templateData.clear();
                      	uint16_t controlCount = this->GetTotalControlCount();
                      	this->templateData.resize(getNextMultipleOf4(24 + sizeof(wchar_t) * (this->title.length() + 1 + (this->fontName.empty() ? 0 : this->fontName.length() + 1))), 0);
+                    +
                      	*reinterpret_cast<uint32_t *>(&this->templateData[0]) = this->style | (this->fontName.empty() ? 0 : DS_SETFONT);
                      	*reinterpret_cast<uint32_t *>(&this->templateData[4]) = this->exstyle;
                      	*reinterpret_cast<uint16_t *>(&this->templateData[8]) = controlCount;

src/in_xsf_framework/UTFEncodeDecode.h

History View file @ 7e09154

@@ -17,11 +17,11 @@ template<size_t buf_size = 100> class cp_converter
 	const std::locale loc;
 public:
 	cp_converter(const std::locale &L = std::locale::classic()) : loc(L) { }
-	inline std::wstring widen(const std::string &in)
+	std::wstring widen(const std::string &in)
 	{
 		return this->convert<char, wchar_t>(in);
 	}
-	inline std::string narrow(const std::wstring &in)
+	std::string narrow(const std::wstring &in)
 	{
 		return this->convert<wchar_t, char>(in);
 	}
@@ -29,13 +29,13 @@ private:
 	typedef std::codecvt<wchar_t, char, mbstate_t> codecvt_facet;
 
 	// widen
-	inline codecvt_facet::result cv(const codecvt_facet &facet, mbstate_t &s, const char *f1, const char *l1, const char *&n1, wchar_t *f2, wchar_t *l2, wchar_t *&n2) const
+	codecvt_facet::result cv(const codecvt_facet &facet, mbstate_t &s, const char *f1, const char *l1, const char *&n1, wchar_t *f2, wchar_t *l2, wchar_t *&n2) const
 	{
 		return facet.in(s, f1, l1, n1, f2, l2, n2);
 	}
 
 	// narrow
-	inline codecvt_facet::result cv(const codecvt_facet &facet, mbstate_t &s, const wchar_t *f1, const wchar_t *l1, const wchar_t *&n1, char *f2, char *l2, char *&n2) const
+	codecvt_facet::result cv(const codecvt_facet &facet, mbstate_t &s, const wchar_t *f1, const wchar_t *l1, const wchar_t *&n1, char *f2, char *l2, char *&n2) const
 	{
 		return facet.out(s, f1, l1, n1, f2, l2, n2);
 	}

src/in_xsf_framework/XSFCommon.h

History View file @ 7e09154

@@ -1,7 +1,7 @@
                      /*
                       * xSF - Common functions
                       * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
                     - * Last modification on 2013-03-21
                     + * Last modification on 2013-04-23
+                      *
                       * Partially based on the vio*sf framework
                       */
@@ -14,7 +14,7 @@
                      #include <string>
                      #define _USE_MATH_DEFINES
                      #include <cmath>
                     -#include "pstdint.h"
                     +#include <cstdint>
                      // Code from http://learningcppisfun.blogspot.com/2010/04/comparing-floating-point-numbers.html
                      template<typename T> inline bool fEqual(T x, T y, int N = 1)
@@ -39,7 +39,7 @@ inline uint32_t Get32BitsLE(std::ifstream &input)
                      // This gets the directory for the path, including the final forward/backward slash
                      template<typename T> inline std::basic_string<T> ExtractDirectoryFromPath(const std::basic_string<T> &fullPath)
+                     {
                     -	size_t lastSlash = fullPath.rfind('\\');
                     +	auto lastSlash = fullPath.rfind('\\');
                      	if (lastSlash == std::basic_string<T>::npos)
                      		lastSlash = fullPath.rfind('/');
                      	return lastSlash != std::basic_string<T>::npos ? fullPath.substr(0, lastSlash + 1) : std::basic_string<T>();
@@ -48,7 +48,7 @@ template<typename T> inline std::basic_string<T> ExtractDirectoryFromPath(const
                      // This gets the filename for the path
                      template<typename T> inline std::basic_string<T> ExtractFilenameFromPath(const std::basic_string<T> &fullPath)
+                     {
                     -	size_t lastSlash = fullPath.rfind('\\');
                     +	auto lastSlash = fullPath.rfind('\\');
                      	if (lastSlash == std::basic_string<T>::npos)
                      		lastSlash = fullPath.rfind('/');
                      	return lastSlash != std::basic_string<T>::npos ? fullPath.substr(lastSlash + 1) : std::basic_string<T>();
@@ -56,7 +56,7 @@ template<typename T> inline std::basic_string<T> ExtractFilenameFromPath(const s
                      // Code from the following answer on Stack Overflow:
                      // http://stackoverflow.com/a/15479212
                     -template<typename T> static inline T NextHighestPowerOf2(T value)
                     +template<typename T> inline T NextHighestPowerOf2(T value)
+                     {
                      	if (value < 1)
                      		return 1;

src/in_xsf_framework/XSFConfig.cpp

History View file @ 7e09154

@@ -1,7 +1,7 @@
                      /*
                       * xSF - Core configuration handler
                       * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
                     - * Last modification on 2013-04-02
                     + * Last modification on 2013-04-23
+                      *
                       * Partially based on the vio*sf framework
                       */
@@ -57,7 +57,7 @@ const String &XSFConfig::CommonNameWithVersion()
                      std::wstring XSFConfig::GetTextFromWindow(HWND hwnd)
+                     {
                      	LRESULT length = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0);
                     -	std::vector<wchar_t> value(length + 1);
                     +	auto value = std::vector<wchar_t>(length + 1);
                      	length = SendMessageW(hwnd, WM_GETTEXT, length + 1, reinterpret_cast<LPARAM>(&value[0]));
                      	return std::wstring(value.begin(), value.begin() + length);
+                     }
@@ -340,7 +340,7 @@ void XSFConfig::ResetConfigDefaults(HWND hwndDlg)
                      	SetWindowTextW(GetDlgItem(hwndDlg, idVolume), wstringify(XSFConfig::initVolume).c_str());
                      	SendMessageW(GetDlgItem(hwndDlg, idReplayGain), CB_SETCURSEL, XSFConfig::initVolumeType, 0);
                      	SendMessageW(GetDlgItem(hwndDlg, idClipProtect), CB_SETCURSEL, XSFConfig::initPeakType, 0);
                     -	std::vector<unsigned>::const_iterator found = std::find(this->supportedSampleRates.begin(), this->supportedSampleRates.end(), XSFConfig::initSampleRate);
                     +	auto found = std::find(this->supportedSampleRates.begin(), this->supportedSampleRates.end(), XSFConfig::initSampleRate);
                      	SendMessageW(GetDlgItem(hwndDlg, idSampleRate), CB_SETCURSEL, found - this->supportedSampleRates.begin(), 0);
                      	SetWindowTextW(GetDlgItem(hwndDlg, idTitleFormat), XSFConfig::initTitleFormat.c_str());

src/in_xsf_framework/XSFConfig_Winamp.cpp

History View file @ 7e09154

@@ -1,7 +1,7 @@
                      /*
                       * xSF - Winamp-specification configuration handler
                       * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
                     - * Last modification on 2013-03-30
                     + * Last modification on 2013-04-23
+                      *
                       * Partially based on the vio*sf framework
                       */
@@ -36,7 +36,7 @@ XSFConfigIO_Winamp::XSFConfigIO_Winamp() : iniFilename(L"")
                      		this->iniFilename = String(reinterpret_cast<char *>(SendMessage(inMod.hMainWindow, WM_WA_IPC, 0, IPC_GETINIFILE))).GetWStr();
                      	else
+                     	{
                     -		std::vector<wchar_t> executablePath(MAX_PATH / 2);
                     +		auto executablePath = std::vector<wchar_t>(MAX_PATH / 2);
                      		DWORD result;
                      		do
@@ -59,7 +59,7 @@ void XSFConfigIO_Winamp::SetValueString(const std::wstring &name, const std::wst
                      std::wstring XSFConfigIO_Winamp::GetValueString(const std::wstring &name, const std::wstring &defaultValue)
+                     {
                     -	std::vector<wchar_t> value(MAX_PATH / 2);
                     +	auto value = std::vector<wchar_t>(MAX_PATH / 2);
                      	DWORD result;
                      	do

src/in_xsf_framework/XSFFile.h

History View file @ 7e09154

@@ -1,7 +1,7 @@
                      /*
                       * xSF - File structure
                       * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
                     - * Last modification on 2013-03-21
                     + * Last modification on 2013-04-23
+                      *
                       * Partially based on the vio*sf framework
                       */
@@ -9,9 +9,9 @@
                      #ifndef XSFFILE_H
                      #define XSFFILE_H
                     +#include <cstdint>
                      #include "TagList.h"
                      #include "BigSString.h"
                     -#include "pstdint.h"
                      enum VolumeType
+                     {

src/in_xsf_framework/XSFPlayer.cpp

History View file @ 7e09154

@@ -1,7 +1,7 @@
                      /*
                       * xSF - Core Player
                       * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
                     - * Last modification on 2013-03-30
                     + * Last modification on 2013-04-23
+                      *
                       * Partially based on the vio*sf framework
                       */
@@ -13,8 +13,8 @@
                      extern XSFConfig *xSFConfig;
                     -XSFPlayer::XSFPlayer() : xSF(nullptr), sampleRate(0), detectedSilenceSample(0), detectedSilenceSec(0), skipSilenceOnStartSec(5), lengthSample(0), fadeSample(0), currentSample(0),
                     -	prevSampleL(XSFPlayer::CHECK_SILENCE_BIAS), prevSampleR(XSFPlayer::CHECK_SILENCE_BIAS), lengthInMS(-1), fadeInMS(-1), volume(1.0), ignoreVolume(false)
                     +XSFPlayer::XSFPlayer() : xSF(), sampleRate(0), detectedSilenceSample(0), detectedSilenceSec(0), skipSilenceOnStartSec(5), lengthSample(0), fadeSample(0), currentSample(0),
                     +	prevSampleL(CHECK_SILENCE_BIAS), prevSampleR(CHECK_SILENCE_BIAS), lengthInMS(-1), fadeInMS(-1), volume(1.0), ignoreVolume(false)
+                     {
+                     }
@@ -30,7 +30,7 @@ XSFPlayer &XSFPlayer::operator=(const XSFPlayer &xSFPlayer)
                      	if (this != &xSFPlayer)
+                     	{
                      		if (!this->xSF)
                     -			this->xSF = new XSFFile();
                     +			this->xSF.reset(new XSFFile());
                      		*this->xSF = *xSFPlayer.xSF;
                      		this->sampleRate = xSFPlayer.sampleRate;
                      		this->detectedSilenceSample = xSFPlayer.detectedSilenceSample;
@@ -65,8 +65,8 @@ bool XSFPlayer::FillBuffer(std::vector<uint8_t> &buf, unsigned &samplesWritten)
+                     			{
                      				short *bufShort = reinterpret_cast<short *>(&buf[0]);
                      				unsigned long sampleL = bufShort[2 * (offset + ofs)], sampleR = bufShort[2 * (offset + ofs) + 1];
                     -				bool silence = (sampleL + XSFPlayer::CHECK_SILENCE_BIAS + XSFPlayer::CHECK_SILENCE_LEVEL) - this->prevSampleL <= XSFPlayer::CHECK_SILENCE_LEVEL * 2 &&
                     -					(sampleR + XSFPlayer::CHECK_SILENCE_BIAS + XSFPlayer::CHECK_SILENCE_LEVEL) - this->prevSampleR <= XSFPlayer::CHECK_SILENCE_LEVEL * 2;
                     +				bool silence = (sampleL + CHECK_SILENCE_BIAS + CHECK_SILENCE_LEVEL) - this->prevSampleL <= CHECK_SILENCE_LEVEL * 2 &&
                     +					(sampleR + CHECK_SILENCE_BIAS + CHECK_SILENCE_LEVEL) - this->prevSampleR <= CHECK_SILENCE_LEVEL * 2;
                      				if (silence)
+                     				{
@@ -93,15 +93,15 @@ bool XSFPlayer::FillBuffer(std::vector<uint8_t> &buf, unsigned &samplesWritten)
+                     					}
+                     				}
                     -				prevSampleL = sampleL + XSFPlayer::CHECK_SILENCE_BIAS;
                     -				prevSampleR = sampleR + XSFPlayer::CHECK_SILENCE_BIAS;
                     +				prevSampleL = sampleL + CHECK_SILENCE_BIAS;
                     +				prevSampleR = sampleR + CHECK_SILENCE_BIAS;
+                     			}
                      			if (!this->skipSilenceOnStartSec)
+                     			{
                      				if (skipOffset)
+                     				{
                     -					std::vector<uint8_t> tmpBuf = std::vector<uint8_t>(2 * skipOffset);
                     +					auto tmpBuf = std::vector<uint8_t>(2 * skipOffset);
                      					memcpy(&tmpBuf[0], &buf[offset + 2 * skipOffset], 2 * skipOffset);
                      					memcpy(&buf[offset], &tmpBuf[0], 2 * skipOffset);
                      					pos += skipOffset;
@@ -186,11 +186,10 @@ void XSFPlayer::SeekTop()
+                     {
                      	this->skipSilenceOnStartSec = xSFConfig->GetSkipSilenceOnStartSec();
                      	this->currentSample = this->detectedSilenceSec = this->detectedSilenceSample = 0;
                     -	this->prevSampleL = this->prevSampleR = XSFPlayer::CHECK_SILENCE_BIAS;
                     +	this->prevSampleL = this->prevSampleR = CHECK_SILENCE_BIAS;
+                     }
                      #ifdef WINAMP_PLUGIN
+                    -
                      static inline DWORD TicksDiff(DWORD prev, DWORD cur) { return cur >= prev ? cur - prev : 0xFFFFFFFF - prev + cur; }
                      int XSFPlayer::Seek(unsigned seekPosition, volatile int *killswitch, std::vector<uint8_t> &buf, Out_Module *outMod)
@@ -229,5 +228,4 @@ int XSFPlayer::Seek(unsigned seekPosition, volatile int *killswitch, std::vector
                      		outMod->Flush(seekPosition);
                      	return 0;
+                     }
+                    -
                      #endif

src/in_xsf_framework/XSFPlayer.h

History View file @ 7e09154

@@ -1,7 +1,7 @@
                      /*
                       * xSF - Core Player
                       * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
                     - * Last modification on 2013-03-25
                     + * Last modification on 2013-04-23
+                      *
                       * Partially based on the vio*sf framework
                       */
@@ -22,7 +22,7 @@ protected:
                      	static const unsigned CHECK_SILENCE_BIAS = 0x8000000;
                      	static const unsigned CHECK_SILENCE_LEVEL = 7;
                     -	XSFFile *xSF;
                     +	std::unique_ptr<XSFFile> xSF;
                      	unsigned sampleRate, detectedSilenceSample, detectedSilenceSec, skipSilenceOnStartSec, lengthSample, fadeSample, currentSample;
                      	unsigned long prevSampleL, prevSampleR;
                      	int lengthInMS, fadeInMS;
@@ -38,10 +38,10 @@ public:
                      	static XSFPlayer *Create(const std::string &fn);
                      	static XSFPlayer *Create(const std::wstring &fn);
                     -	virtual ~XSFPlayer() { if (this->xSF) delete this->xSF; }
                     +	virtual ~XSFPlayer() { }
                      	XSFPlayer &operator=(const XSFPlayer &xSFPlayer);
                     -	XSFFile *GetXSFFile() { return this->xSF; }
                     -	const XSFFile *GetXSFFile() const { return this->xSF; }
                     +	XSFFile *GetXSFFile() { return this->xSF.get(); }
                     +	const XSFFile *GetXSFFile() const { return this->xSF.get(); }
                      	unsigned GetLengthInSamples() const { return this->lengthSample + this->fadeSample; }
                      	unsigned GetSampleRate() const { return this->sampleRate; }
                      	void SetSampleRate(unsigned newSampleRate) { this->sampleRate = newSampleRate; }

src/in_xsf_framework/convert.h

History View file @ 7e09154

@@ -1,7 +1,7 @@
                      /*
                       * Common conversion functions
                       * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
                     - * Last modification on 2013-03-30
                     + * Last modification on 2013-04-23
                       */
                      #ifndef _CONVERT_H_
@@ -66,14 +66,14 @@ template<typename T, typename S> inline T convertTo(const std::basic_string<S> &
                      class ConvertFuncs
+                     {
                      private:
                     -	static inline bool IsDigitsOnly(const std::string &input, const std::locale &loc = std::locale::classic())
                     +	template<typename T> static bool IsDigitsOnly(const std::basic_string<T> &input, const std::locale &loc = std::locale::classic())
+                     	{
                     -		auto inputChars = std::vector<char>(input.begin(), input.end());
                     +		auto inputChars = std::vector<T>(input.begin(), input.end());
                      		size_t length = inputChars.size();
                     -		auto masks = std::vector<std::ctype<char>::mask>(length);
                     -		std::use_facet<std::ctype<char>>(loc).is(&inputChars[0], &inputChars[length], &masks[0]);
                     +		auto masks = std::vector<std::ctype<T>::mask>(length);
                     +		std::use_facet<std::ctype<T>>(loc).is(&inputChars[0], &inputChars[length], &masks[0]);
                      		for (size_t x = 0; x < length; ++x)
                     -			if (inputChars[x] != '.' && !(masks[x] & std::ctype<char>::digit))
                     +			if (inputChars[x] != '.' && !(masks[x] & std::ctype<T>::digit))
                      				return false;
                      		return true;
+                     	}

src/in_xsf_framework/DialogBuilder.h

History View file @ 7e09154

                     similarity index 92%
                     rename from src/in_xsf_framework/DialogBuilder.h
                     rename to src/in_xsf_framework/ialogBuilder.h
@@ -1,7 +1,7 @@
                      /*
                       * Windows Dynamic Dialog Builder framework
                       * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
                     - * Last modification on 2013-03-30
                     + * Last modification on 2013-04-23
                       */
                      #ifndef DIALOG_BUILDER_H
@@ -12,7 +12,7 @@
                      #include <vector>
                      #include <algorithm>
                      #include <stdexcept>
                     -#include "pstdint.h"
                     +#include <cstdint>
                      #include "windowsh_wrapper.h"
                      #include "UtfConverter.h"
@@ -38,7 +38,7 @@ template<typename T> struct Rect
                      	Size<T> size;
                      	Rect() : position(), size() { }
                     -	Rect(Point<T> Position, Size<T> Sz) : position(Position), size(Sz) { }
                     +	Rect(const Point<T> &Position, const Size<T> &Sz) : position(Position), size(Sz) { }
                      	Rect(T X, T Y, T Width, T Height) : position(X, Y), size(Width, Height) { }
                      };
@@ -63,34 +63,16 @@ public:
                      		FROM_BOTTOMRIGHT
                      	} positionType;
                     -	RelativePosition(Point<short> RelPosition, BaseType Type, PositionType PosType) : relativePosition(RelPosition), type(Type), positionType(PosType) { }
                     +	RelativePosition(const Point<short> &RelPosition, BaseType Type, PositionType PosType) : relativePosition(RelPosition), type(Type), positionType(PosType) { }
                      	virtual ~RelativePosition() { }
                      	virtual RelativePosition *Clone() const = 0;
                     -	Point<short> CalculatePosition(Rect<short> child, Rect<short> other)
                     -	{
                     -		Point<short> newPosition = child.position;
                     -		if (this->relativePosition.y != -1)
                     -		{
                     -			if (this->positionType == FROM_TOP || this->positionType == FROM_TOPLEFT || this->positionType == FROM_TOPRIGHT)
                     -				newPosition.y = other.position.y + this->relativePosition.y;
                     -			if (this->positionType == FROM_BOTTOM || this->positionType == FROM_BOTTOMLEFT || this->positionType == FROM_BOTTOMRIGHT)
                     -				newPosition.y = other.position.y + other.size.height + this->relativePosition.y;
                     -		}
                     -		if (this->relativePosition.x != -1)
                     -		{
                     -			if (this->positionType == FROM_LEFT || this->positionType == FROM_TOPLEFT || this->positionType == FROM_BOTTOMLEFT)
                     -				newPosition.x = other.position.x + this->relativePosition.x;
                     -			if (this->positionType == FROM_RIGHT || this->positionType == FROM_TOPRIGHT || this->positionType == FROM_BOTTOMRIGHT)
                     -				newPosition.x = other.position.x + other.size.width + this->relativePosition.x;
                     -		}
                     -		return newPosition;
                     -	}
                     +	Point<short> CalculatePosition(const Rect<short> &child, const Rect<short> &other);
                      };
                      class RelativePositionToParent : public RelativePosition
+                     {
                      public:
                     -	RelativePositionToParent(Point<short> RelPosition, PositionType PosType) : RelativePosition(RelPosition, TO_PARENT, PosType) { }
                     +	RelativePositionToParent(const Point<short> &RelPosition, PositionType PosType) : RelativePosition(RelPosition, TO_PARENT, PosType) { }
                      	RelativePositionToParent *Clone() const { return new RelativePositionToParent(this->relativePosition, this->positionType); }
                      };
@@ -99,7 +81,7 @@ class RelativePositionToSibling : public RelativePosition
                      public:
                      	short siblingsBack;
                     -	RelativePositionToSibling(Point<short> RelPosition, PositionType PosType, short SiblingsBack = 1) : RelativePosition(RelPosition, TO_SIBLING, PosType), siblingsBack(SiblingsBack) { }
                     +	RelativePositionToSibling(const Point<short> &RelPosition, PositionType PosType, short SiblingsBack = 1) : RelativePosition(RelPosition, TO_SIBLING, PosType), siblingsBack(SiblingsBack) { }
                      	RelativePositionToSibling *Clone() const { return new RelativePositionToSibling(this->relativePosition, this->positionType, this->siblingsBack); }
                      };
@@ -131,7 +113,7 @@ public:
                      	DialogBuilder &WithTitle(const std::wstring &Title) { this->title = Title; return *this; }
                      	DialogBuilder &WithFont(const std::wstring &FontName, uint16_t FontSizeInPts) { this->fontName = FontName; this->fontSizeInPts = FontSizeInPts; return *this; }
                      	DialogBuilder &WithSize(short Width, short Height) { this->size.width = Width; this->size.height = Height; return *this; }
                     -	DialogBuilder &WithSize(Size<short> Sz) { this->size = Sz; return *this; }
                     +	DialogBuilder &WithSize(const Size<short> &Sz) { this->size = Sz; return *this; }
                      	DialogBuilder &ResetControls(bool Reset = true) { this->resetControls = Reset; return *this; }
                      	DialogBuilder &IsOverlapped() { this->style &= ~(WS_OVERLAPPED | WS_POPUP | WS_CHILD); this->style |= WS_OVERLAPPED; return *this; }
                      	DialogBuilder &IsPopup() { this->style &= ~(WS_OVERLAPPED | WS_POPUP | WS_CHILD); this->style |= WS_POPUP; return *this; }
@@ -170,19 +152,19 @@ public:
                      	DialogControlBuilder(DialogControlType Type = NO_CONTROL) : controlType(Type), style(0), exstyle(0), rect(), id(-1), index(-1), relativePosition() { }
                      	virtual ~DialogControlBuilder() { }
                      	T &WithPosition(short X, short Y) { this->rect.position.x = X; this->rect.position.y = Y; return this->me(); }
                     -	T &WithPosition(Point<short> Position) { this->rect.position = Position; return this->me(); }
                     -	T &WithRelativePositionToParent(RelativePosition::PositionType PosType, Point<short> RelativePosition)
                     +	T &WithPosition(const Point<short> &Position) { this->rect.position = Position; return this->me(); }
                     +	T &WithRelativePositionToParent(RelativePosition::PositionType PosType, const Point<short> &RelativePosition)
+                     	{
                      		this->relativePosition.reset(new RelativePositionToParent(RelativePosition, PosType));
                      		return this->me();
+                     	}
                     -	T &WithRelativePositionToSibling(RelativePosition::PositionType PosType, Point<short> RelativePosition, short SiblingsBack = 1)
                     +	T &WithRelativePositionToSibling(RelativePosition::PositionType PosType, const Point<short> &RelativePosition, short SiblingsBack = 1)
+                     	{
                      		this->relativePosition.reset(new RelativePositionToSibling(RelativePosition, PosType, SiblingsBack));
                      		return this->me();
+                     	}
                      	T &WithSize(short Width, short Height) { this->rect.size.width = Width; this->rect.size.height = Height; return this->me(); }
                     -	T &WithSize(Size<short> Sz) { this->rect.size = Sz; return this->me(); }
                     +	T &WithSize(const Size<short> &Sz) { this->rect.size = Sz; return this->me(); }
                      	T &WithID(short ID) { this->id = ID; return this->me(); }
                      	T &AtIndex(int Index) { this->index = Index; return this->me(); }
                      	T &IsDisabled(bool Disabled = true) { if (Disabled) this->style |= WS_DISABLED; else this->style &= ~WS_DISABLED; return this->me(); }
@@ -400,7 +382,7 @@ class DialogTemplate
                      		friend class DialogTemplate;
                      		DialogControl() : controlType(NO_CONTROL), style(0), exstyle(0), rect(), id(-1), relativePosition() { }
                      		DialogControl(const DialogControl &control) : controlType(control.controlType), style(control.style), exstyle(control.exstyle), rect(control.rect), id(control.id),
                     -			relativePosition(control.relativePosition.get() ? control.relativePosition->Clone() : nullptr) { }
                     +			relativePosition(control.relativePosition ? control.relativePosition->Clone() : nullptr) { }
                      		DialogControl &operator=(const DialogControl &control)
+                     		{
                      			this->controlType = control.controlType;
@@ -408,7 +390,7 @@ class DialogTemplate
                      			this->exstyle = control.exstyle;
                      			this->rect = control.rect;
                      			this->id = control.id;
                     -			if (control.relativePosition.get())
                     +			if (control.relativePosition)
                      				this->relativePosition.reset(control.relativePosition->Clone());
                      			else
                      				this->relativePosition.reset();
@@ -426,7 +408,7 @@ class DialogTemplate
                      			control->exstyle = builder.exstyle;
                      			control->rect = builder.rect;
                      			control->id = builder.id;
                     -			if (builder.relativePosition.get())
                     +			if (builder.relativePosition)
                      				control->relativePosition.reset(builder.relativePosition->Clone());
                      			return control;
@@ -616,7 +598,7 @@ class DialogTemplate
                      	template<typename Builder> void AddControlToGroup(std::unique_ptr<DialogControl> &&control, const DialogControlBuilder<Builder> &builder)
+                     	{
                     -		const DialogInGroupBuilder<Builder> &groupBuilder = dynamic_cast<const DialogInGroupBuilder<Builder> &>(builder);
                     +		const auto &groupBuilder = dynamic_cast<const DialogInGroupBuilder<Builder> &>(builder);
                      		if (groupBuilder.groupName.empty())
+                     		{
                      			if (builder.index == -1)

src/in_xsf_framework/in_xsf.cpp

History View file @ 7e09154

@@ -1,7 +1,7 @@
 /*
  * xSF - Winamp plugin
  * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-04-10
+ * Last modification on 2013-04-23
  *
  * Partially based on the vio*sf framework
  */
@@ -308,7 +308,7 @@ extern "C" __declspec(dllexport) In_Module *winampGetInModule2()
 
 static eq_str eqstr;
 
-extern "C" __declspec(dllexport) int winampGetExtendedFileInfo(const char *fn, const char *data, char *dest, size_t destlen)
+template<typename T> int wrapperWinampGetExtendedFileInfo(const XSFFile &file, const char *data, T *dest, size_t destlen)
 {
 	if (eqstr(data, "type"))
 	{
@@ -324,7 +324,6 @@ extern "C" __declspec(dllexport) int winampGetExtendedFileInfo(const char *fn, c
 	{
 		try
 		{
-			XSFFile file = XSFFile(fn);
 			std::string tagToGet = data;
 			if (eqstr(data, "album"))
 				tagToGet = "game";
@@ -336,7 +335,7 @@ extern "C" __declspec(dllexport) int winampGetExtendedFileInfo(const char *fn, c
 			}
 			else if (eqstr(tagToGet, "length"))
 			{
-				strcpy(dest, stringify(file.GetLengthMS(xSFConfig->GetDefaultLength()) + file.GetFadeMS(xSFConfig->GetDefaultFade())).c_str());
+				String(stringify(file.GetLengthMS(xSFConfig->GetDefaultLength()) + file.GetFadeMS(xSFConfig->GetDefaultFade()))).Substring(0, destlen - 1).CopyToString(dest, true);
 				return 1;
 			}
 			file.GetTagValue(tagToGet).Substring(0, destlen - 1).CopyToString(dest, true);
@@ -349,44 +348,29 @@ extern "C" __declspec(dllexport) int winampGetExtendedFileInfo(const char *fn, c
 	}
 }
 
-extern "C" __declspec(dllexport) int winampGetExtendedFileInfoW(const wchar_t *fn, const char *data, wchar_t *dest, size_t destlen)
+extern "C" __declspec(dllexport) int winampGetExtendedFileInfo(const char *fn, const char *data, char *dest, size_t destlen)
 {
-	if (eqstr(data, "type"))
+	try
 	{
-		dest[0] = L'0';
-		dest[1] = 0;
-		return 1;
+		auto file = XSFFile(fn);
+		return wrapperWinampGetExtendedFileInfo(file, data, dest, destlen);
 	}
-	else if (eqstr(data, "family"))
+	catch (const std::exception &)
 	{
 		return 0;
 	}
-	else
+}
+
+extern "C" __declspec(dllexport) int winampGetExtendedFileInfoW(const wchar_t *fn, const char *data, wchar_t *dest, size_t destlen)
+{
+	try
 	{
-		try
-		{
-			XSFFile file = XSFFile(fn);
-			std::string tagToGet = data;
-			if (eqstr(data, "album"))
-				tagToGet = "game";
-			if (!file.GetTagExists(tagToGet))
-			{
-				if (eqstr(tagToGet, "replaygain_track_gain"))
-					return 1;
-				return 0;
-			}
-			else if (eqstr(tagToGet, "length"))
-			{
-				wcscpy(dest, wstringify(file.GetLengthMS(xSFConfig->GetDefaultLength()) + file.GetFadeMS(xSFConfig->GetDefaultFade())).c_str());
-				return 1;
-			}
-			file.GetTagValue(tagToGet).Substring(0, destlen - 1).CopyToString(dest);
-			return 1;
-		}
-		catch (const std::exception &)
-		{
-			return 0;
-		}
+		auto file = XSFFile(fn);
+		return wrapperWinampGetExtendedFileInfo(file, data, dest, destlen);
+	}
+	catch (const std::exception &)
+	{
+		return 0;
 	}
 }
 
@@ -402,7 +386,7 @@ extern "C" __declspec(dllexport) int winampSetExtendedFileInfo(const char *fn, c
 {
 	try
 	{
-		if (!extendedXSFFile.get() || extendedXSFFile->GetFilename().GetStr() != fn)
+		if (!extendedXSFFile || extendedXSFFile->GetFilename().GetStr() != fn)
 			extendedXSFFile.reset(new XSFFile(fn));
 		return wrapperWinampSetExtendedFileInfo(data, val);
 	}
@@ -416,7 +400,7 @@ extern "C" __declspec(dllexport) int winampSetExtendedFileInfoW(const wchar_t *f
 {
 	try
 	{
-		if (!extendedXSFFile.get() || extendedXSFFile->GetFilename().GetWStr() != fn)
+		if (!extendedXSFFile || extendedXSFFile->GetFilename().GetWStr() != fn)
 			extendedXSFFile.reset(new XSFFile(fn));
 		return wrapperWinampSetExtendedFileInfo(data, val);
 	}
@@ -428,7 +412,7 @@ extern "C" __declspec(dllexport) int winampSetExtendedFileInfoW(const wchar_t *f
 
 extern "C" __declspec(dllexport) int winampWriteExtendedFileInfo()
 {
-	if (!extendedXSFFile.get() || extendedXSFFile->GetFilename().empty())
+	if (!extendedXSFFile || extendedXSFFile->GetFilename().empty())
 		return 0;
 	extendedXSFFile->SaveFile();
 	return 1;

src/in_xsf_framework/pstdint.h

History View file @ 7e09154

                     deleted file mode 100644
@@ -1,800 +0,0 @@
                     -/*  A portable stdint.h
                     - ****************************************************************************
                     - *  BSD License:
                     - ****************************************************************************
                     - *
                     - *  Copyright (c) 2005-2011 Paul Hsieh
                     - *  All rights reserved.
                     - *
                     - *  Redistribution and use in source and binary forms, with or without
                     - *  modification, are permitted provided that the following conditions
                     - *  are met:
                     - *
                     - *  1. Redistributions of source code must retain the above copyright
                     - *     notice, this list of conditions and the following disclaimer.
                     - *  2. Redistributions in binary form must reproduce the above copyright
                     - *     notice, this list of conditions and the following disclaimer in the
                     - *     documentation and/or other materials provided with the distribution.
                     - *  3. The name of the author may not be used to endorse or promote products
                     - *     derived from this software without specific prior written permission.
                     - *
                     - *  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
                     - *  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
                     - *  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
                     - *  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
                     - *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
                     - *  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
                     - *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
                     - *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
                     - *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
                     - *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                     - *
                     - ****************************************************************************
                     - *
                     - *  Version 0.1.12
                     - *
                     - *  The ANSI C standard committee, for the C99 standard, specified the
                     - *  inclusion of a new standard include file called stdint.h.  This is
                     - *  a very useful and long desired include file which contains several
                     - *  very precise definitions for integer scalar types that is
                     - *  critically important for making portable several classes of
                     - *  applications including cryptography, hashing, variable length
                     - *  integer libraries and so on.  But for most developers its likely
                     - *  useful just for programming sanity.
                     - *
                     - *  The problem is that most compiler vendors have decided not to
                     - *  implement the C99 standard, and the next C++ language standard
                     - *  (which has a lot more mindshare these days) will be a long time in
                     - *  coming and its unknown whether or not it will include stdint.h or
                     - *  how much adoption it will have.  Either way, it will be a long time
                     - *  before all compilers come with a stdint.h and it also does nothing
                     - *  for the extremely large number of compilers available today which
                     - *  do not include this file, or anything comparable to it.
                     - *
                     - *  So that's what this file is all about.  Its an attempt to build a
                     - *  single universal include file that works on as many platforms as
                     - *  possible to deliver what stdint.h is supposed to.  A few things
                     - *  that should be noted about this file:
                     - *
                     - *    1) It is not guaranteed to be portable and/or present an identical
                     - *       interface on all platforms.  The extreme variability of the
                     - *       ANSI C standard makes this an impossibility right from the
                     - *       very get go. Its really only meant to be useful for the vast
                     - *       majority of platforms that possess the capability of
                     - *       implementing usefully and precisely defined, standard sized
                     - *       integer scalars.  Systems which are not intrinsically 2s
                     - *       complement may produce invalid constants.
                     - *
                     - *    2) There is an unavoidable use of non-reserved symbols.
                     - *
                     - *    3) Other standard include files are invoked.
                     - *
                     - *    4) This file may come in conflict with future platforms that do
                     - *       include stdint.h.  The hope is that one or the other can be
                     - *       used with no real difference.
                     - *
                     - *    5) In the current verison, if your platform can't represent
                     - *       int32_t, int16_t and int8_t, it just dumps out with a compiler
                     - *       error.
                     - *
                     - *    6) 64 bit integers may or may not be defined.  Test for their
                     - *       presence with the test: #ifdef INT64_MAX or #ifdef UINT64_MAX.
                     - *       Note that this is different from the C99 specification which
                     - *       requires the existence of 64 bit support in the compiler.  If
                     - *       this is not defined for your platform, yet it is capable of
                     - *       dealing with 64 bits then it is because this file has not yet
                     - *       been extended to cover all of your system's capabilities.
                     - *
                     - *    7) (u)intptr_t may or may not be defined.  Test for its presence
                     - *       with the test: #ifdef PTRDIFF_MAX.  If this is not defined
                     - *       for your platform, then it is because this file has not yet
                     - *       been extended to cover all of your system's capabilities, not
                     - *       because its optional.
                     - *
                     - *    8) The following might not been defined even if your platform is
                     - *       capable of defining it:
                     - *
                     - *       WCHAR_MIN
                     - *       WCHAR_MAX
                     - *       (u)int64_t
                     - *       PTRDIFF_MIN
                     - *       PTRDIFF_MAX
                     - *       (u)intptr_t
                     - *
                     - *    9) The following have not been defined:
                     - *
                     - *       WINT_MIN
                     - *       WINT_MAX
                     - *
                     - *   10) The criteria for defining (u)int_least(*)_t isn't clear,
                     - *       except for systems which don't have a type that precisely
                     - *       defined 8, 16, or 32 bit types (which this include file does
                     - *       not support anyways). Default definitions have been given.
                     - *
                     - *   11) The criteria for defining (u)int_fast(*)_t isn't something I
                     - *       would trust to any particular compiler vendor or the ANSI C
                     - *       committee.  It is well known that "compatible systems" are
                     - *       commonly created that have very different performance
                     - *       characteristics from the systems they are compatible with,
                     - *       especially those whose vendors make both the compiler and the
                     - *       system.  Default definitions have been given, but its strongly
                     - *       recommended that users never use these definitions for any
                     - *       reason (they do *NOT* deliver any serious guarantee of
                     - *       improved performance -- not in this file, nor any vendor's
                     - *       stdint.h).
                     - *
                     - *   12) The following macros:
                     - *
                     - *       PRINTF_INTMAX_MODIFIER
                     - *       PRINTF_INT64_MODIFIER
                     - *       PRINTF_INT32_MODIFIER
                     - *       PRINTF_INT16_MODIFIER
                     - *       PRINTF_LEAST64_MODIFIER
                     - *       PRINTF_LEAST32_MODIFIER
                     - *       PRINTF_LEAST16_MODIFIER
                     - *       PRINTF_INTPTR_MODIFIER
                     - *
                     - *       are strings which have been defined as the modifiers required
                     - *       for the "d", "u" and "x" printf formats to correctly output
                     - *       (u)intmax_t, (u)int64_t, (u)int32_t, (u)int16_t, (u)least64_t,
                     - *       (u)least32_t, (u)least16_t and (u)intptr_t types respectively.
                     - *       PRINTF_INTPTR_MODIFIER is not defined for some systems which
                     - *       provide their own stdint.h.  PRINTF_INT64_MODIFIER is not
                     - *       defined if INT64_MAX is not defined.  These are an extension
                     - *       beyond what C99 specifies must be in stdint.h.
                     - *
                     - *       In addition, the following macros are defined:
                     - *
                     - *       PRINTF_INTMAX_HEX_WIDTH
                     - *       PRINTF_INT64_HEX_WIDTH
                     - *       PRINTF_INT32_HEX_WIDTH
                     - *       PRINTF_INT16_HEX_WIDTH
                     - *       PRINTF_INT8_HEX_WIDTH
                     - *       PRINTF_INTMAX_DEC_WIDTH
                     - *       PRINTF_INT64_DEC_WIDTH
                     - *       PRINTF_INT32_DEC_WIDTH
                     - *       PRINTF_INT16_DEC_WIDTH
                     - *       PRINTF_INT8_DEC_WIDTH
                     - *
                     - *       Which specifies the maximum number of characters required to
                     - *       print the number of that type in either hexadecimal or decimal.
                     - *       These are an extension beyond what C99 specifies must be in
                     - *       stdint.h.
                     - *
                     - *  Compilers tested (all with 0 warnings at their highest respective
                     - *  settings): Borland Turbo C 2.0, WATCOM C/C++ 11.0 (16 bits and 32
                     - *  bits), Microsoft Visual C++ 6.0 (32 bit), Microsoft Visual Studio
                     - *  .net (VC7), Intel C++ 4.0, GNU gcc v3.3.3
                     - *
                     - *  This file should be considered a work in progress.  Suggestions for
                     - *  improvements, especially those which increase coverage are strongly
                     - *  encouraged.
                     - *
                     - *  Acknowledgements
                     - *
                     - *  The following people have made significant contributions to the
                     - *  development and testing of this file:
                     - *
                     - *  Chris Howie
                     - *  John Steele Scott
                     - *  Dave Thorup
                     - *  John Dill
                     - *
                     - */
+                    -
                     -#include <cstddef>
                     -#include <climits>
                     -#include <csignal>
+                    -
                     -/*
                     - *  For gcc with _STDINT_H, fill in the PRINTF_INT*_MODIFIER macros, and
                     - *  do nothing else.  On the Mac OS X version of gcc this is _STDINT_H_.
                     - */
+                    -
                     -#if ((defined(__STDC__) && __STDC__ && __STDC_VERSION__ >= 199901L) || (defined (__WATCOMC__) && (defined (_STDINT_H_INCLUDED) || __WATCOMC__ >= 1250)) || (defined(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_) || defined (__UINT_FAST64_TYPE__)) ) || (defined(_MSC_VER) && _MSC_VER >= 1600)) && !defined (_PSTDINT_H_INCLUDED)
                     -#include <stdint.h>
                     -#define _PSTDINT_H_INCLUDED
                     -# ifndef PRINTF_INT64_MODIFIER
                     -#  define PRINTF_INT64_MODIFIER "ll"
                     -# endif
                     -# ifndef PRINTF_INT32_MODIFIER
                     -#  define PRINTF_INT32_MODIFIER "l"
                     -# endif
                     -# ifndef PRINTF_INT16_MODIFIER
                     -#  define PRINTF_INT16_MODIFIER "h"
                     -# endif
                     -# ifndef PRINTF_INTMAX_MODIFIER
                     -#  define PRINTF_INTMAX_MODIFIER PRINTF_INT64_MODIFIER
                     -# endif
                     -# ifndef PRINTF_INT64_HEX_WIDTH
                     -#  define PRINTF_INT64_HEX_WIDTH "16"
                     -# endif
                     -# ifndef PRINTF_INT32_HEX_WIDTH
                     -#  define PRINTF_INT32_HEX_WIDTH "8"
                     -# endif
                     -# ifndef PRINTF_INT16_HEX_WIDTH
                     -#  define PRINTF_INT16_HEX_WIDTH "4"
                     -# endif
                     -# ifndef PRINTF_INT8_HEX_WIDTH
                     -#  define PRINTF_INT8_HEX_WIDTH "2"
                     -# endif
                     -# ifndef PRINTF_INT64_DEC_WIDTH
                     -#  define PRINTF_INT64_DEC_WIDTH "20"
                     -# endif
                     -# ifndef PRINTF_INT32_DEC_WIDTH
                     -#  define PRINTF_INT32_DEC_WIDTH "10"
                     -# endif
                     -# ifndef PRINTF_INT16_DEC_WIDTH
                     -#  define PRINTF_INT16_DEC_WIDTH "5"
                     -# endif
                     -# ifndef PRINTF_INT8_DEC_WIDTH
                     -#  define PRINTF_INT8_DEC_WIDTH "3"
                     -# endif
                     -# ifndef PRINTF_INTMAX_HEX_WIDTH
                     -#  define PRINTF_INTMAX_HEX_WIDTH PRINTF_INT64_HEX_WIDTH
                     -# endif
                     -# ifndef PRINTF_INTMAX_DEC_WIDTH
                     -#  define PRINTF_INTMAX_DEC_WIDTH PRINTF_INT64_DEC_WIDTH
                     -# endif
+                    -
                     -/*
                     - *  Something really weird is going on with Open Watcom.  Just pull some of
                     - *  these duplicated definitions from Open Watcom's stdint.h file for now.
                     - */
+                    -
                     -# if defined (__WATCOMC__) && __WATCOMC__ >= 1250
                     -#  if !defined (INT64_C)
                     -#   define INT64_C(x)   (x + (INT64_MAX - INT64_MAX))
                     -#  endif
                     -#  if !defined (UINT64_C)
                     -#   define UINT64_C(x)  (x + (UINT64_MAX - UINT64_MAX))
                     -#  endif
                     -#  if !defined (INT32_C)
                     -#   define INT32_C(x)   (x + (INT32_MAX - INT32_MAX))
                     -#  endif
                     -#  if !defined (UINT32_C)
                     -#   define UINT32_C(x)  (x + (UINT32_MAX - UINT32_MAX))
                     -#  endif
                     -#  if !defined (INT16_C)
                     -#   define INT16_C(x)   (x)
                     -#  endif
                     -#  if !defined (UINT16_C)
                     -#   define UINT16_C(x)  (x)
                     -#  endif
                     -#  if !defined (INT8_C)
                     -#   define INT8_C(x)   (x)
                     -#  endif
                     -#  if !defined (UINT8_C)
                     -#   define UINT8_C(x)  (x)
                     -#  endif
                     -#  if !defined (UINT64_MAX)
                     -#   define UINT64_MAX  18446744073709551615ULL
                     -#  endif
                     -#  if !defined (INT64_MAX)
                     -#   define INT64_MAX  9223372036854775807LL
                     -#  endif
                     -#  if !defined (UINT32_MAX)
                     -#   define UINT32_MAX  4294967295UL
                     -#  endif
                     -#  if !defined (INT32_MAX)
                     -#   define INT32_MAX  2147483647L
                     -#  endif
                     -#  if !defined (INTMAX_MAX)
                     -#   define INTMAX_MAX INT64_MAX
                     -#  endif
                     -#  if !defined (INTMAX_MIN)
                     -#   define INTMAX_MIN INT64_MIN
                     -#  endif
                     -# endif
                     -#endif
+                    -
                     -#ifndef _PSTDINT_H_INCLUDED
                     -#define _PSTDINT_H_INCLUDED
+                    -
                     -#ifndef SIZE_MAX
                     -# define SIZE_MAX (~(size_t)0)
                     -#endif
+                    -
                     -/*
                     - *  Deduce the type assignments from limits.h under the assumption that
                     - *  integer sizes in bits are powers of 2, and follow the ANSI
                     - *  definitions.
                     - */
+                    -
                     -#ifndef UINT8_MAX
                     -# define UINT8_MAX 0xff
                     -#endif
                     -#ifndef uint8_t
                     -# if (UCHAR_MAX == UINT8_MAX) || defined (S_SPLINT_S)
                     -    typedef unsigned char uint8_t;
                     -#   define UINT8_C(v) ((uint8_t) v)
                     -# else
                     -#   error "Platform not supported"
                     -# endif
                     -#endif
+                    -
                     -#ifndef INT8_MAX
                     -# define INT8_MAX 0x7f
                     -#endif
                     -#ifndef INT8_MIN
                     -# define INT8_MIN INT8_C(0x80)
                     -#endif
                     -#ifndef int8_t
                     -# if (SCHAR_MAX == INT8_MAX) || defined (S_SPLINT_S)
                     -    typedef signed char int8_t;
                     -#   define INT8_C(v) ((int8_t) v)
                     -# else
                     -#   error "Platform not supported"
                     -# endif
                     -#endif
+                    -
                     -#ifndef UINT16_MAX
                     -# define UINT16_MAX 0xffff
                     -#endif
                     -#ifndef uint16_t
                     -#if (UINT_MAX == UINT16_MAX) || defined (S_SPLINT_S)
                     -  typedef unsigned int uint16_t;
                     -# ifndef PRINTF_INT16_MODIFIER
                     -#  define PRINTF_INT16_MODIFIER ""
                     -# endif
                     -# define UINT16_C(v) ((uint16_t) (v))
                     -#elif (USHRT_MAX == UINT16_MAX)
                     -  typedef unsigned short uint16_t;
                     -# define UINT16_C(v) ((uint16_t) (v))
                     -# ifndef PRINTF_INT16_MODIFIER
                     -#  define PRINTF_INT16_MODIFIER "h"
                     -# endif
                     -#else
                     -#error "Platform not supported"
                     -#endif
                     -#endif
+                    -
                     -#ifndef INT16_MAX
                     -# define INT16_MAX 0x7fff
                     -#endif
                     -#ifndef INT16_MIN
                     -# define INT16_MIN INT16_C(0x8000)
                     -#endif
                     -#ifndef int16_t
                     -#if (INT_MAX == INT16_MAX) || defined (S_SPLINT_S)
                     -  typedef signed int int16_t;
                     -# define INT16_C(v) ((int16_t) (v))
                     -# ifndef PRINTF_INT16_MODIFIER
                     -#  define PRINTF_INT16_MODIFIER ""
                     -# endif
                     -#elif (SHRT_MAX == INT16_MAX)
                     -  typedef signed short int16_t;
                     -# define INT16_C(v) ((int16_t) (v))
                     -# ifndef PRINTF_INT16_MODIFIER
                     -#  define PRINTF_INT16_MODIFIER "h"
                     -# endif
                     -#else
                     -#error "Platform not supported"
                     -#endif
                     -#endif
+                    -
                     -#ifndef UINT32_MAX
                     -# define UINT32_MAX (0xffffffffUL)
                     -#endif
                     -#ifndef uint32_t
                     -#if (ULONG_MAX == UINT32_MAX) || defined (S_SPLINT_S)
                     -  typedef unsigned long uint32_t;
                     -# define UINT32_C(v) v ## UL
                     -# ifndef PRINTF_INT32_MODIFIER
                     -#  define PRINTF_INT32_MODIFIER "l"
                     -# endif
                     -#elif (UINT_MAX == UINT32_MAX)
                     -  typedef unsigned int uint32_t;
                     -# ifndef PRINTF_INT32_MODIFIER
                     -#  define PRINTF_INT32_MODIFIER ""
                     -# endif
                     -# define UINT32_C(v) v ## U
                     -#elif (USHRT_MAX == UINT32_MAX)
                     -  typedef unsigned short uint32_t;
                     -# define UINT32_C(v) ((unsigned short) (v))
                     -# ifndef PRINTF_INT32_MODIFIER
                     -#  define PRINTF_INT32_MODIFIER ""
                     -# endif
                     -#else
                     -#error "Platform not supported"
                     -#endif
                     -#endif
+                    -
                     -#ifndef INT32_MAX
                     -# define INT32_MAX (0x7fffffffL)
                     -#endif
                     -#ifndef INT32_MIN
                     -# define INT32_MIN INT32_C(0x80000000)
                     -#endif
                     -#ifndef int32_t
                     -#if (LONG_MAX == INT32_MAX) || defined (S_SPLINT_S)
                     -  typedef signed long int32_t;
                     -# define INT32_C(v) v ## L
                     -# ifndef PRINTF_INT32_MODIFIER
                     -#  define PRINTF_INT32_MODIFIER "l"
                     -# endif
                     -#elif (INT_MAX == INT32_MAX)
                     -  typedef signed int int32_t;
                     -# define INT32_C(v) v
                     -# ifndef PRINTF_INT32_MODIFIER
                     -#  define PRINTF_INT32_MODIFIER ""
                     -# endif
                     -#elif (SHRT_MAX == INT32_MAX)
                     -  typedef signed short int32_t;
                     -# define INT32_C(v) ((short) (v))
                     -# ifndef PRINTF_INT32_MODIFIER
                     -#  define PRINTF_INT32_MODIFIER ""
                     -# endif
                     -#else
                     -#error "Platform not supported"
                     -#endif
                     -#endif
+                    -
                     -/*
                     - *  The macro stdint_int64_defined is temporarily used to record
                     - *  whether or not 64 integer support is available.  It must be
                     - *  defined for any 64 integer extensions for new platforms that are
                     - *  added.
                     - */
+                    -
                     -#undef stdint_int64_defined
                     -#if (defined(__STDC__) && defined(__STDC_VERSION__)) || defined (S_SPLINT_S)
                     -# if (__STDC__ && __STDC_VERSION__ >= 199901L) || defined (S_SPLINT_S)
                     -#  define stdint_int64_defined
                     -   typedef long long int64_t;
                     -   typedef unsigned long long uint64_t;
                     -#  define UINT64_C(v) v ## ULL
                     -#  define  INT64_C(v) v ## LL
                     -#  ifndef PRINTF_INT64_MODIFIER
                     -#   define PRINTF_INT64_MODIFIER "ll"
                     -#  endif
                     -# endif
                     -#endif
+                    -
                     -#if !defined (stdint_int64_defined)
                     -# if defined(__GNUC__)
                     -#  define stdint_int64_defined
                     -   __extension__ typedef long long int64_t;
                     -   __extension__ typedef unsigned long long uint64_t;
                     -#  define UINT64_C(v) v ## ULL
                     -#  define  INT64_C(v) v ## LL
                     -#  ifndef PRINTF_INT64_MODIFIER
                     -#   define PRINTF_INT64_MODIFIER "ll"
                     -#  endif
                     -# elif defined(__MWERKS__) || defined (__SUNPRO_C) || defined (__SUNPRO_CC) || defined (__APPLE_CC__) || defined (_LONG_LONG) || defined (_CRAYC) || defined (S_SPLINT_S)
                     -#  define stdint_int64_defined
                     -   typedef long long int64_t;
                     -   typedef unsigned long long uint64_t;
                     -#  define UINT64_C(v) v ## ULL
                     -#  define  INT64_C(v) v ## LL
                     -#  ifndef PRINTF_INT64_MODIFIER
                     -#   define PRINTF_INT64_MODIFIER "ll"
                     -#  endif
                     -# elif (defined(__WATCOMC__) && defined(__WATCOM_INT64__)) || (defined(_MSC_VER) && _INTEGRAL_MAX_BITS >= 64) || (defined (__BORLANDC__) && __BORLANDC__ > 0x460) || defined (__alpha) || defined (__DECC)
                     -#  define stdint_int64_defined
                     -   typedef __int64 int64_t;
                     -   typedef unsigned __int64 uint64_t;
                     -#  define UINT64_C(v) v ## UI64
                     -#  define  INT64_C(v) v ## I64
                     -#  ifndef PRINTF_INT64_MODIFIER
                     -#   define PRINTF_INT64_MODIFIER "I64"
                     -#  endif
                     -# endif
                     -#endif
+                    -
                     -#if !defined (LONG_LONG_MAX) && defined (INT64_C)
                     -# define LONG_LONG_MAX INT64_C (9223372036854775807)
                     -#endif
                     -#ifndef ULONG_LONG_MAX
                     -# define ULONG_LONG_MAX UINT64_C (18446744073709551615)
                     -#endif
+                    -
                     -#if !defined (INT64_MAX) && defined (INT64_C)
                     -# define INT64_MAX INT64_C (9223372036854775807)
                     -#endif
                     -#if !defined (INT64_MIN) && defined (INT64_C)
                     -# define INT64_MIN INT64_C (-9223372036854775808)
                     -#endif
                     -#if !defined (UINT64_MAX) && defined (INT64_C)
                     -# define UINT64_MAX UINT64_C (18446744073709551615)
                     -#endif
+                    -
                     -/*
                     - *  Width of hexadecimal for number field.
                     - */
+                    -
                     -#ifndef PRINTF_INT64_HEX_WIDTH
                     -# define PRINTF_INT64_HEX_WIDTH "16"
                     -#endif
                     -#ifndef PRINTF_INT32_HEX_WIDTH
                     -# define PRINTF_INT32_HEX_WIDTH "8"
                     -#endif
                     -#ifndef PRINTF_INT16_HEX_WIDTH
                     -# define PRINTF_INT16_HEX_WIDTH "4"
                     -#endif
                     -#ifndef PRINTF_INT8_HEX_WIDTH
                     -# define PRINTF_INT8_HEX_WIDTH "2"
                     -#endif
+                    -
                     -#ifndef PRINTF_INT64_DEC_WIDTH
                     -# define PRINTF_INT64_DEC_WIDTH "20"
                     -#endif
                     -#ifndef PRINTF_INT32_DEC_WIDTH
                     -# define PRINTF_INT32_DEC_WIDTH "10"
                     -#endif
                     -#ifndef PRINTF_INT16_DEC_WIDTH
                     -# define PRINTF_INT16_DEC_WIDTH "5"
                     -#endif
                     -#ifndef PRINTF_INT8_DEC_WIDTH
                     -# define PRINTF_INT8_DEC_WIDTH "3"
                     -#endif
+                    -
                     -/*
                     - *  Ok, lets not worry about 128 bit integers for now.  Moore's law says
                     - *  we don't need to worry about that until about 2040 at which point
                     - *  we'll have bigger things to worry about.
                     - */
+                    -
                     -#ifdef stdint_int64_defined
                     -  typedef int64_t intmax_t;
                     -  typedef uint64_t uintmax_t;
                     -# define  INTMAX_MAX   INT64_MAX
                     -# define  INTMAX_MIN   INT64_MIN
                     -# define UINTMAX_MAX  UINT64_MAX
                     -# define UINTMAX_C(v) UINT64_C(v)
                     -# define  INTMAX_C(v)  INT64_C(v)
                     -# ifndef PRINTF_INTMAX_MODIFIER
                     -#   define PRINTF_INTMAX_MODIFIER PRINTF_INT64_MODIFIER
                     -# endif
                     -# ifndef PRINTF_INTMAX_HEX_WIDTH
                     -#  define PRINTF_INTMAX_HEX_WIDTH PRINTF_INT64_HEX_WIDTH
                     -# endif
                     -# ifndef PRINTF_INTMAX_DEC_WIDTH
                     -#  define PRINTF_INTMAX_DEC_WIDTH PRINTF_INT64_DEC_WIDTH
                     -# endif
                     -#else
                     -  typedef int32_t intmax_t;
                     -  typedef uint32_t uintmax_t;
                     -# define  INTMAX_MAX   INT32_MAX
                     -# define UINTMAX_MAX  UINT32_MAX
                     -# define UINTMAX_C(v) UINT32_C(v)
                     -# define  INTMAX_C(v)  INT32_C(v)
                     -# ifndef PRINTF_INTMAX_MODIFIER
                     -#   define PRINTF_INTMAX_MODIFIER PRINTF_INT32_MODIFIER
                     -# endif
                     -# ifndef PRINTF_INTMAX_HEX_WIDTH
                     -#  define PRINTF_INTMAX_HEX_WIDTH PRINTF_INT32_HEX_WIDTH
                     -# endif
                     -# ifndef PRINTF_INTMAX_DEC_WIDTH
                     -#  define PRINTF_INTMAX_DEC_WIDTH PRINTF_INT32_DEC_WIDTH
                     -# endif
                     -#endif
+                    -
                     -/*
                     - *  Because this file currently only supports platforms which have
                     - *  precise powers of 2 as bit sizes for the default integers, the
                     - *  least definitions are all trivial.  Its possible that a future
                     - *  version of this file could have different definitions.
                     - */
+                    -
                     -#ifndef stdint_least_defined
                     -  typedef   int8_t   int_least8_t;
                     -  typedef  uint8_t  uint_least8_t;
                     -  typedef  int16_t  int_least16_t;
                     -  typedef uint16_t uint_least16_t;
                     -  typedef  int32_t  int_least32_t;
                     -  typedef uint32_t uint_least32_t;
                     -# define PRINTF_LEAST32_MODIFIER PRINTF_INT32_MODIFIER
                     -# define PRINTF_LEAST16_MODIFIER PRINTF_INT16_MODIFIER
                     -# define  UINT_LEAST8_MAX  UINT8_MAX
                     -# define   INT_LEAST8_MAX   INT8_MAX
                     -# define UINT_LEAST16_MAX UINT16_MAX
                     -# define  INT_LEAST16_MAX  INT16_MAX
                     -# define UINT_LEAST32_MAX UINT32_MAX
                     -# define  INT_LEAST32_MAX  INT32_MAX
                     -# define   INT_LEAST8_MIN   INT8_MIN
                     -# define  INT_LEAST16_MIN  INT16_MIN
                     -# define  INT_LEAST32_MIN  INT32_MIN
                     -# ifdef stdint_int64_defined
                     -    typedef  int64_t  int_least64_t;
                     -    typedef uint64_t uint_least64_t;
                     -#   define PRINTF_LEAST64_MODIFIER PRINTF_INT64_MODIFIER
                     -#   define UINT_LEAST64_MAX UINT64_MAX
                     -#   define  INT_LEAST64_MAX  INT64_MAX
                     -#   define  INT_LEAST64_MIN  INT64_MIN
                     -# endif
                     -#endif
                     -#undef stdint_least_defined
+                    -
                     -/*
                     - *  The ANSI C committee pretending to know or specify anything about
                     - *  performance is the epitome of misguided arrogance.  The mandate of
                     - *  this file is to *ONLY* ever support that absolute minimum
                     - *  definition of the fast integer types, for compatibility purposes.
                     - *  No extensions, and no attempt to suggest what may or may not be a
                     - *  faster integer type will ever be made in this file.  Developers are
                     - *  warned to stay away from these types when using this or any other
                     - *  stdint.h.
                     - */
+                    -
                     -typedef   int_least8_t   int_fast8_t;
                     -typedef  uint_least8_t  uint_fast8_t;
                     -typedef  int_least16_t  int_fast16_t;
                     -typedef uint_least16_t uint_fast16_t;
                     -typedef  int_least32_t  int_fast32_t;
                     -typedef uint_least32_t uint_fast32_t;
                     -#define  UINT_FAST8_MAX  UINT_LEAST8_MAX
                     -#define   INT_FAST8_MAX   INT_LEAST8_MAX
                     -#define UINT_FAST16_MAX UINT_LEAST16_MAX
                     -#define  INT_FAST16_MAX  INT_LEAST16_MAX
                     -#define UINT_FAST32_MAX UINT_LEAST32_MAX
                     -#define  INT_FAST32_MAX  INT_LEAST32_MAX
                     -#define   INT_FAST8_MIN   INT_LEAST8_MIN
                     -#define  INT_FAST16_MIN  INT_LEAST16_MIN
                     -#define  INT_FAST32_MIN  INT_LEAST32_MIN
                     -#ifdef stdint_int64_defined
                     -  typedef  int_least64_t  int_fast64_t;
                     -  typedef uint_least64_t uint_fast64_t;
                     -# define UINT_FAST64_MAX UINT_LEAST64_MAX
                     -# define  INT_FAST64_MAX  INT_LEAST64_MAX
                     -# define  INT_FAST64_MIN  INT_LEAST64_MIN
                     -#endif
+                    -
                     -#undef stdint_int64_defined
+                    -
                     -/*
                     - *  Whatever piecemeal, per compiler thing we can do about the wchar_t
                     - *  type limits.
                     - */
+                    -
                     -#if defined(__WATCOMC__) || defined(_MSC_VER) || defined (__GNUC__)
                     -# include <wchar.h>
                     -# ifndef WCHAR_MIN
                     -#  define WCHAR_MIN 0
                     -# endif
                     -# ifndef WCHAR_MAX
                     -#  define WCHAR_MAX ((wchar_t)-1)
                     -# endif
                     -#endif
+                    -
                     -/*
                     - *  Whatever piecemeal, per compiler/platform thing we can do about the
                     - *  (u)intptr_t types and limits.
                     - */
+                    -
                     -#if defined (_MSC_VER) && defined (_UINTPTR_T_DEFINED)
                     -# define STDINT_H_UINTPTR_T_DEFINED
                     -#endif
+                    -
                     -#ifndef STDINT_H_UINTPTR_T_DEFINED
                     -# if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) || defined (_WIN64)
                     -#  define stdint_intptr_bits 64
                     -# elif defined (__WATCOMC__) || defined (__TURBOC__)
                     -#  if defined(__TINY__) || defined(__SMALL__) || defined(__MEDIUM__)
                     -#    define stdint_intptr_bits 16
                     -#  else
                     -#    define stdint_intptr_bits 32
                     -#  endif
                     -# elif defined (__i386__) || defined (_WIN32) || defined (WIN32)
                     -#  define stdint_intptr_bits 32
                     -# elif defined (__INTEL_COMPILER)
                     -/* TODO -- what did Intel do about x86-64? */
                     -# endif
+                    -
                     -# ifdef stdint_intptr_bits
                     -#  define stdint_intptr_glue3_i(a,b,c)  a##b##c
                     -#  define stdint_intptr_glue3(a,b,c)    stdint_intptr_glue3_i(a,b,c)
                     -#  ifndef PRINTF_INTPTR_MODIFIER
                     -#    define PRINTF_INTPTR_MODIFIER      stdint_intptr_glue3(PRINTF_INT,stdint_intptr_bits,_MODIFIER)
                     -#  endif
                     -#  ifndef PTRDIFF_MAX
                     -#    define PTRDIFF_MAX                 stdint_intptr_glue3(INT,stdint_intptr_bits,_MAX)
                     -#  endif
                     -#  ifndef PTRDIFF_MIN
                     -#    define PTRDIFF_MIN                 stdint_intptr_glue3(INT,stdint_intptr_bits,_MIN)
                     -#  endif
                     -#  ifndef UINTPTR_MAX
                     -#    define UINTPTR_MAX                 stdint_intptr_glue3(UINT,stdint_intptr_bits,_MAX)
                     -#  endif
                     -#  ifndef INTPTR_MAX
                     -#    define INTPTR_MAX                  stdint_intptr_glue3(INT,stdint_intptr_bits,_MAX)
                     -#  endif
                     -#  ifndef INTPTR_MIN
                     -#    define INTPTR_MIN                  stdint_intptr_glue3(INT,stdint_intptr_bits,_MIN)
                     -#  endif
                     -#  ifndef INTPTR_C
                     -#    define INTPTR_C(x)                 stdint_intptr_glue3(INT,stdint_intptr_bits,_C)(x)
                     -#  endif
                     -#  ifndef UINTPTR_C
                     -#    define UINTPTR_C(x)                stdint_intptr_glue3(UINT,stdint_intptr_bits,_C)(x)
                     -#  endif
                     -  typedef stdint_intptr_glue3(uint,stdint_intptr_bits,_t) uintptr_t;
                     -  typedef stdint_intptr_glue3( int,stdint_intptr_bits,_t)  intptr_t;
                     -# else
                     -/* TODO -- This following is likely wrong for some platforms, and does
                     -   nothing for the definition of uintptr_t. */
                     -  typedef ptrdiff_t intptr_t;
                     -# endif
                     -# define STDINT_H_UINTPTR_T_DEFINED
                     -#endif
+                    -
                     -/*
                     - *  Assumes sig_atomic_t is signed and we have a 2s complement machine.
                     - */
+                    -
                     -#ifndef SIG_ATOMIC_MAX
                     -# define SIG_ATOMIC_MAX ((((sig_atomic_t) 1) << (sizeof (sig_atomic_t)*CHAR_BIT-1)) - 1)
                     -#endif
+                    -
                     -#endif
+                    -
                     -#if defined (__TEST_PSTDINT_FOR_CORRECTNESS)
+                    -
                     -/*
                     - *  Please compile with the maximum warning settings to make sure macros are not
                     - *  defined more than once.
                     - */
+                    -
                     -#include <stdlib.h>
                     -#include <stdio.h>
                     -#include <string.h>
+                    -
                     -#define glue3_aux(x,y,z) x ## y ## z
                     -#define glue3(x,y,z) glue3_aux(x,y,z)
+                    -
                     -#define DECLU(bits) glue3(uint,bits,_t) glue3(u,bits,=) glue3(UINT,bits,_C) (0);
                     -#define DECLI(bits) glue3(int,bits,_t) glue3(i,bits,=) glue3(INT,bits,_C) (0);
+                    -
                     -#define DECL(us,bits) glue3(DECL,us,) (bits)
+                    -
                     -#define TESTUMAX(bits) glue3(u,bits,=) glue3(~,u,bits); if (glue3(UINT,bits,_MAX) glue3(!=,u,bits)) printf ("Something wrong with UINT%d_MAX\n", bits)
+                    -
                     -int main () {
                     -	DECL(I,8)
                     -	DECL(U,8)
                     -	DECL(I,16)
                     -	DECL(U,16)
                     -	DECL(I,32)
                     -	DECL(U,32)
                     -#ifdef INT64_MAX
                     -	DECL(I,64)
                     -	DECL(U,64)
                     -#endif
                     -	intmax_t imax = INTMAX_C(0);
                     -	uintmax_t umax = UINTMAX_C(0);
                     -	char str0[256], str1[256];
+                    -
                     -	sprintf (str0, "%d %x\n", 0, ~0);
+                    -
                     -	sprintf (str1, "%d %x\n",  i8, ~0);
                     -	if (0 != strcmp (str0, str1)) printf ("Something wrong with i8 : %s\n", str1);
                     -	sprintf (str1, "%u %x\n",  u8, ~0);
                     -	if (0 != strcmp (str0, str1)) printf ("Something wrong with u8 : %s\n", str1);
                     -	sprintf (str1, "%d %x\n",  i16, ~0);
                     -	if (0 != strcmp (str0, str1)) printf ("Something wrong with i16 : %s\n", str1);
                     -	sprintf (str1, "%u %x\n",  u16, ~0);
                     -	if (0 != strcmp (str0, str1)) printf ("Something wrong with u16 : %s\n", str1);
                     -	sprintf (str1, "%" PRINTF_INT32_MODIFIER "d %x\n",  i32, ~0);
                     -	if (0 != strcmp (str0, str1)) printf ("Something wrong with i32 : %s\n", str1);
                     -	sprintf (str1, "%" PRINTF_INT32_MODIFIER "u %x\n",  u32, ~0);
                     -	if (0 != strcmp (str0, str1)) printf ("Something wrong with u32 : %s\n", str1);
                     -#ifdef INT64_MAX
                     -	sprintf (str1, "%" PRINTF_INT64_MODIFIER "d %x\n",  i64, ~0);
                     -	if (0 != strcmp (str0, str1)) printf ("Something wrong with i64 : %s\n", str1);
                     -#endif
                     -	sprintf (str1, "%" PRINTF_INTMAX_MODIFIER "d %x\n",  imax, ~0);
                     -	if (0 != strcmp (str0, str1)) printf ("Something wrong with imax : %s\n", str1);
                     -	sprintf (str1, "%" PRINTF_INTMAX_MODIFIER "u %x\n",  umax, ~0);
                     -	if (0 != strcmp (str0, str1)) printf ("Something wrong with umax : %s\n", str1);
+                    -
                     -	TESTUMAX(8);
                     -	TESTUMAX(16);
                     -	TESTUMAX(32);
                     -#ifdef INT64_MAX
                     -	TESTUMAX(64);
                     -#endif
+                    -
                     -	return EXIT_SUCCESS;
                     -}
+                    -
                     -#endif

...	...	@@ -328,7 +328,7 @@ void SoundTouch::clear()
328	328	/// Returns number of samples currently unprocessed.
329	329	uint32_t SoundTouch::numUnprocessedSamples() const
330	330	{
331		- if (this->pTDStretch.get())
	331	+ if (this->pTDStretch)
332	332	{
333	333	FIFOSamplePipe *psp = this->pTDStretch->getInput();
334	334	if (psp)

...	...	@@ -1,7 +1,7 @@
1	1	/*
2	2	* xSF - 2SF Player
3	3	* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
4		- * Last modification on 2013-04-17
	4	+ * Last modification on 2013-04-23
5	5	*
6	6	* Based on a modified vio2sf v0.22c
7	7	*
...	...	@@ -185,12 +185,12 @@ bool XSFPlayer_2SF::Load2SF(XSFFile *xSFToLoad)
185	185
186	186	XSFPlayer_2SF::XSFPlayer_2SF(const std::string &filename) : XSFPlayer()
187	187	{
188		- this->xSF = new XSFFile(filename, 4, 8);
	188	+ this->xSF.reset(new XSFFile(filename, 4, 8));
189	189	}
190	190
191	191	XSFPlayer_2SF::XSFPlayer_2SF(const std::wstring &filename) : XSFPlayer()
192	192	{
193		- this->xSF = new XSFFile(filename, 4, 8);
	193	+ this->xSF.reset(new XSFFile(filename, 4, 8));
194	194	}
195	195
196	196	bool XSFPlayer_2SF::Load()
...	...	@@ -199,7 +199,7 @@ bool XSFPlayer_2SF::Load()
199	199	sndifwork.sync_type = this->xSF->GetTagValue("_2sf_sync_type", 0);
200	200
201	201	sndifwork.xfs_load = false;
202		- if (!this->Load2SF(this->xSF))
	202	+ if (!this->Load2SF(this->xSF.get()))
203	203	return false;
204	204
205	205	if (NDS_Init())

...	...	@@ -1,7 +1,7 @@
1	1	/*
2	2	* xSF - GSF Player
3	3	* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
4		- * Last modification on 2013-03-30
	4	+ * Last modification on 2013-04-23
5	5	*
6	6	* Based on a modified viogsf v0.08
7	7	*
...	...	@@ -192,17 +192,17 @@ static bool Load2SF(XSFFile *xSF)
192	192
193	193	XSFPlayer_GSF::XSFPlayer_GSF(const std::string &filename) : XSFPlayer()
194	194	{
195		- this->xSF = new XSFFile(filename, 8, 12);
	195	+ this->xSF.reset(new XSFFile(filename, 8, 12));
196	196	}
197	197
198	198	XSFPlayer_GSF::XSFPlayer_GSF(const std::wstring &filename) : XSFPlayer()
199	199	{
200		- this->xSF = new XSFFile(filename, 8, 12);
	200	+ this->xSF.reset(new XSFFile(filename, 8, 12));
201	201	}
202	202
203	203	bool XSFPlayer_GSF::Load()
204	204	{
205		- if (!Load2SF(this->xSF))
	205	+ if (!Load2SF(this->xSF.get()))
206	206	return false;
207	207
208	208	cpuIsMultiBoot = (loaderwork.entry >> 24) == 2;

...	...	@@ -1,7 +1,7 @@
1	1	/*
2	2	* xSF - NCSF Player
3	3	* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
4		- * Last modification on 2013-04-01
	4	+ * Last modification on 2013-04-23
5	5	*
6	6	* Partially based on the vio*sf framework
7	7	*
...	...	@@ -96,17 +96,17 @@ bool XSFPlayer_NCSF::RecursiveLoadNCSF(XSFFile *xSFToLoad, int level)
96	96
97	97	bool XSFPlayer_NCSF::LoadNCSF()
98	98	{
99		- return this->RecursiveLoadNCSF(this->xSF, 1);
	99	+ return this->RecursiveLoadNCSF(this->xSF.get(), 1);
100	100	}
101	101
102	102	XSFPlayer_NCSF::XSFPlayer_NCSF(const std::string &filename) : XSFPlayer()
103	103	{
104		- this->xSF = new XSFFile(filename, 8, 12);
	104	+ this->xSF.reset(new XSFFile(filename, 8, 12));
105	105	}
106	106
107	107	XSFPlayer_NCSF::XSFPlayer_NCSF(const std::wstring &filename) : XSFPlayer()
108	108	{
109		- this->xSF = new XSFFile(filename, 8, 12);
	109	+ this->xSF.reset(new XSFFile(filename, 8, 12));
110	110	}
111	111
112	112	bool XSFPlayer_NCSF::Load()

...	...	@@ -1,7 +1,7 @@
1	1	/*
2	2	* xSF - SNSF Player
3	3	* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
4		- * Last modification on 2013-03-30
	4	+ * Last modification on 2013-04-23
5	5	*
6	6	* Based on a modified in_snsf by Caitsith2
7	7	* http://snsf.caitsith2.net/
...	...	@@ -207,17 +207,17 @@ static bool Load2SF(XSFFile *xSF)
207	207
208	208	XSFPlayer_SNSF::XSFPlayer_SNSF(const std::string &filename) : XSFPlayer()
209	209	{
210		- this->xSF = new XSFFile(filename, 4, 8);
	210	+ this->xSF.reset(new XSFFile(filename, 4, 8));
211	211	}
212	212
213	213	XSFPlayer_SNSF::XSFPlayer_SNSF(const std::wstring &filename) : XSFPlayer()
214	214	{
215		- this->xSF = new XSFFile(filename, 4, 8);
	215	+ this->xSF.reset(new XSFFile(filename, 4, 8));
216	216	}
217	217
218	218	bool XSFPlayer_SNSF::Load()
219	219	{
220		- if (!Load2SF(this->xSF))
	220	+ if (!Load2SF(this->xSF.get()))
221	221	return false;
222	222
223	223	Settings.SoundSync = true;

...	...	@@ -17,11 +17,11 @@ template<size_t buf_size = 100> class cp_converter
17	17	const std::locale loc;
18	18	public:
19	19	cp_converter(const std::locale &L = std::locale::classic()) : loc(L) { }
20		- inline std::wstring widen(const std::string &in)
	20	+ std::wstring widen(const std::string &in)
21	21	{
22	22	return this->convert<char, wchar_t>(in);
23	23	}
24		- inline std::string narrow(const std::wstring &in)
	24	+ std::string narrow(const std::wstring &in)
25	25	{
26	26	return this->convert<wchar_t, char>(in);
27	27	}
...	...	@@ -29,13 +29,13 @@ private:
29	29	typedef std::codecvt<wchar_t, char, mbstate_t> codecvt_facet;
30	30
31	31	// widen
32		- inline codecvt_facet::result cv(const codecvt_facet &facet, mbstate_t &s, const char f1, const char l1, const char &n1, wchar_t f2, wchar_t l2, wchar_t &n2) const
	32	+ codecvt_facet::result cv(const codecvt_facet &facet, mbstate_t &s, const char f1, const char l1, const char &n1, wchar_t f2, wchar_t l2, wchar_t &n2) const
33	33	{
34	34	return facet.in(s, f1, l1, n1, f2, l2, n2);
35	35	}
36	36
37	37	// narrow
38		- inline codecvt_facet::result cv(const codecvt_facet &facet, mbstate_t &s, const wchar_t f1, const wchar_t l1, const wchar_t &n1, char f2, char l2, char &n2) const
	38	+ codecvt_facet::result cv(const codecvt_facet &facet, mbstate_t &s, const wchar_t f1, const wchar_t l1, const wchar_t &n1, char f2, char l2, char &n2) const
39	39	{
40	40	return facet.out(s, f1, l1, n1, f2, l2, n2);
41	41	}

...	...	@@ -1,7 +1,7 @@
1	1	/*
2	2	* xSF - Winamp plugin
3	3	* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
4		- * Last modification on 2013-04-10
	4	+ * Last modification on 2013-04-23
5	5	*
6	6	* Partially based on the vio*sf framework
7	7	*/
...	...	@@ -308,7 +308,7 @@ extern "C" __declspec(dllexport) In_Module *winampGetInModule2()
308	308
309	309	static eq_str eqstr;
310	310
311		-extern "C" __declspec(dllexport) int winampGetExtendedFileInfo(const char fn, const char data, char *dest, size_t destlen)
	311	+template<typename T> int wrapperWinampGetExtendedFileInfo(const XSFFile &file, const char data, T dest, size_t destlen)
312	312	{
313	313	if (eqstr(data, "type"))
314	314	{
...	...	@@ -324,7 +324,6 @@ extern "C" __declspec(dllexport) int winampGetExtendedFileInfo(const char *fn, c
324	324	{
325	325	try
326	326	{
327		- XSFFile file = XSFFile(fn);
328	327	std::string tagToGet = data;
329	328	if (eqstr(data, "album"))
330	329	tagToGet = "game";
...	...	@@ -336,7 +335,7 @@ extern "C" __declspec(dllexport) int winampGetExtendedFileInfo(const char *fn, c
336	335	}
337	336	else if (eqstr(tagToGet, "length"))
338	337	{
339		- strcpy(dest, stringify(file.GetLengthMS(xSFConfig->GetDefaultLength()) + file.GetFadeMS(xSFConfig->GetDefaultFade())).c_str());
	338	+ String(stringify(file.GetLengthMS(xSFConfig->GetDefaultLength()) + file.GetFadeMS(xSFConfig->GetDefaultFade()))).Substring(0, destlen - 1).CopyToString(dest, true);
340	339	return 1;
341	340	}
342	341	file.GetTagValue(tagToGet).Substring(0, destlen - 1).CopyToString(dest, true);
...	...	@@ -349,44 +348,29 @@ extern "C" __declspec(dllexport) int winampGetExtendedFileInfo(const char *fn, c
349	348	}
350	349	}
351	350
352		-extern "C" __declspec(dllexport) int winampGetExtendedFileInfoW(const wchar_t fn, const char data, wchar_t *dest, size_t destlen)
	351	+extern "C" __declspec(dllexport) int winampGetExtendedFileInfo(const char fn, const char data, char *dest, size_t destlen)
353	352	{
354		- if (eqstr(data, "type"))
	353	+ try
355	354	{
356		- dest[0] = L'0';
357		- dest[1] = 0;
358		- return 1;
	355	+ auto file = XSFFile(fn);
	356	+ return wrapperWinampGetExtendedFileInfo(file, data, dest, destlen);
359	357	}
360		- else if (eqstr(data, "family"))
	358	+ catch (const std::exception &)
361	359	{
362	360	return 0;
363	361	}
364		- else
	362	+}
	363	+
	364	+extern "C" __declspec(dllexport) int winampGetExtendedFileInfoW(const wchar_t fn, const char data, wchar_t *dest, size_t destlen)
	365	+{
	366	+ try
365	367	{
366		- try
367		- {
368		- XSFFile file = XSFFile(fn);
369		- std::string tagToGet = data;
370		- if (eqstr(data, "album"))
371		- tagToGet = "game";
372		- if (!file.GetTagExists(tagToGet))
373		- {
374		- if (eqstr(tagToGet, "replaygain_track_gain"))
375		- return 1;
376		- return 0;
377		- }
378		- else if (eqstr(tagToGet, "length"))
379		- {
380		- wcscpy(dest, wstringify(file.GetLengthMS(xSFConfig->GetDefaultLength()) + file.GetFadeMS(xSFConfig->GetDefaultFade())).c_str());
381		- return 1;
382		- }
383		- file.GetTagValue(tagToGet).Substring(0, destlen - 1).CopyToString(dest);
384		- return 1;
385		- }
386		- catch (const std::exception &)
387		- {
388		- return 0;
389		- }
	368	+ auto file = XSFFile(fn);
	369	+ return wrapperWinampGetExtendedFileInfo(file, data, dest, destlen);
	370	+ }
	371	+ catch (const std::exception &)
	372	+ {
	373	+ return 0;
390	374	}
391	375	}
392	376
...	...	@@ -402,7 +386,7 @@ extern "C" __declspec(dllexport) int winampSetExtendedFileInfo(const char *fn, c
402	386	{
403	387	try
404	388	{
405		- if (!extendedXSFFile.get() \|\| extendedXSFFile->GetFilename().GetStr() != fn)
	389	+ if (!extendedXSFFile \|\| extendedXSFFile->GetFilename().GetStr() != fn)
406	390	extendedXSFFile.reset(new XSFFile(fn));
407	391	return wrapperWinampSetExtendedFileInfo(data, val);
408	392	}
...	...	@@ -416,7 +400,7 @@ extern "C" __declspec(dllexport) int winampSetExtendedFileInfoW(const wchar_t *f
416	400	{
417	401	try
418	402	{
419		- if (!extendedXSFFile.get() \|\| extendedXSFFile->GetFilename().GetWStr() != fn)
	403	+ if (!extendedXSFFile \|\| extendedXSFFile->GetFilename().GetWStr() != fn)
420	404	extendedXSFFile.reset(new XSFFile(fn));
421	405	return wrapperWinampSetExtendedFileInfo(data, val);
422	406	}
...	...	@@ -428,7 +412,7 @@ extern "C" __declspec(dllexport) int winampSetExtendedFileInfoW(const wchar_t *f
428	412
429	413	extern "C" __declspec(dllexport) int winampWriteExtendedFileInfo()
430	414	{
431		- if (!extendedXSFFile.get() \|\| extendedXSFFile->GetFilename().empty())
	415	+ if (!extendedXSFFile \|\| extendedXSFFile->GetFilename().empty())
432	416	return 0;
433	417	extendedXSFFile->SaveFile();
434	418	return 1;