@@ -18,6 +18,7 @@

 #include <cstdint>

 #include "common.h"

 #include "consts.h"

+#include "convert.h"

 struct SWAV;

 struct Track;

@@ -179,7 +180,7 @@ struct Channel

 	std::uint8_t prio;

 	bool manualSweep;

-	std::bitset<ToIntegral(ChannelFlag::Bits)> flags;

+	std::bitset<ConvertFuncs::ToIntegral(ChannelFlag::Bits)> flags;

 	std::int8_t pan; // -64 .. 63

 	std::int16_t extAmpl;

@@ -106,11 +106,11 @@ template<std::size_t N> struct RingBuffer

 	RingBuffer() : bufferPos(N / 2), getPos(N / 2)

 	{

-		std::fill_n(&this->buffer[0], N * 2, 0);

+		std::fill_n(&this->buffer[0], N * 2, static_cast<std::int16_t>(0));

 	}

 	void Clear()

 	{

-		std::fill_n(&this->buffer[0], N * 2, 0);

+		std::fill_n(&this->buffer[0], N * 2, static_cast<std::int16_t>(0));

 		this->bufferPos = this->getPos = N / 2;

 	}

 	void PushSample(std::int16_t sample)

@@ -14,9 +14,13 @@

 #include <algorithm>

 #include <bitset>

+#include <cstddef>

 #include <cstdint>

-#include "SWAV.h"

-#include "Track.h"

+#include "common.h"

+#include "consts.h"

+

+struct SWAV;

+struct Track;

 /*

  * This structure is meant to be similar to what is stored in the actual

@@ -27,41 +31,41 @@

 struct NDSSoundRegister

 {

 	// Control Register

-	uint8_t volumeMul;

-	uint8_t volumeDiv;

-	uint8_t panning;

-	uint8_t waveDuty;

-	uint8_t repeatMode;

-	uint8_t format;

+	std::uint8_t volumeMul;

+	std::uint8_t volumeDiv;

+	std::uint8_t panning;

+	std::uint8_t waveDuty;

+	std::uint8_t repeatMode;

+	std::uint8_t format;

 	bool enable;

 	// Data Source Register

 	const SWAV *source;

 	// Timer Register

-	uint16_t timer;

+	std::uint16_t timer;

 	// PSG Handling, not a DS register

-	uint16_t psgX;

-	int16_t psgLast;

-	uint32_t psgLastCount;

+	std::uint16_t psgX;

+	std::int16_t psgLast;

+	std::uint32_t psgLastCount;

 	// The following are taken from DeSmuME

 	double samplePosition;

 	double sampleIncrease;

 	// Loopstart Register

-	uint32_t loopStart;

+	std::uint32_t loopStart;

 	// Length Register

-	uint32_t length;

+	std::uint32_t length;

-	uint32_t totalLength;

+	std::uint32_t totalLength;

 	NDSSoundRegister();

 	void ClearControlRegister();

-	void SetControlRegister(uint32_t reg);

+	void SetControlRegister(std::uint32_t reg);

 };

 /*

@@ -72,10 +76,10 @@ struct NDSSoundRegister

  */

 struct TempSndReg

 {

-	uint32_t CR;

+	std::uint32_t CR;

 	const SWAV *SOURCE;

-	uint16_t TIMER;

-	uint32_t REPEAT_POINT, LENGTH;

+	std::uint16_t TIMER;

+	std::uint32_t REPEAT_POINT, LENGTH;

 	TempSndReg();

 };

@@ -95,10 +99,10 @@ struct Player;

  * accessing the SWAVs samples and also doesn't use 0s before the

  * start of the SWAV or use 0s after the end of a non-looping SWAV.

  */

-template<size_t N> struct RingBuffer

+template<std::size_t N> struct RingBuffer

 {

-	int16_t buffer[N * 2];

-	size_t bufferPos, getPos;

+	std::int16_t buffer[N * 2];

+	std::size_t bufferPos, getPos;

 	RingBuffer() : bufferPos(N / 2), getPos(N / 2)

 	{

@@ -109,7 +113,7 @@ template<size_t N> struct RingBuffer

 		std::fill_n(&this->buffer[0], N * 2, 0);

 		this->bufferPos = this->getPos = N / 2;

 	}

-	void PushSample(int16_t sample)

+	void PushSample(std::int16_t sample)

 	{

 		this->buffer[this->bufferPos] = sample;

 		if (this->bufferPos >= N)

@@ -120,23 +124,23 @@ template<size_t N> struct RingBuffer

 		if (this->bufferPos >= N * 3 / 2)

 			this->bufferPos -= N;

 	}

-	void PushSamples(const int16_t *samples, size_t size)

+	void PushSamples(const std::int16_t *samples, std::size_t size)

 	{

 		if (this->bufferPos + size > N * 3 / 2)

 		{

-			size_t free = N * 3 / 2 - this->bufferPos;

+			std::size_t free = N * 3 / 2 - this->bufferPos;

 			std::copy_n(&samples[0], free, &this->buffer[this->bufferPos]);

 			std::copy(&samples[free], &samples[size], &this->buffer[N / 2]);

 		}

 		else

 			std::copy_n(&samples[0], size, &this->buffer[this->bufferPos]);

-		size_t rightFree = this->bufferPos < N ? N - this->bufferPos : 0;

+		std::size_t rightFree = this->bufferPos < N ? N - this->bufferPos : 0;

 		if (rightFree < size)

 		{

 			if (!rightFree)

 			{

-				size_t leftStart = this->bufferPos - N;

-				size_t leftSize = std::min(N / 2 - leftStart, size);

+				std::size_t leftStart = this->bufferPos - N;

+				std::size_t leftSize = std::min(N / 2 - leftStart, size);

 				std::copy_n(&samples[0], leftSize, &this->buffer[leftStart]);

 				if (leftSize < size)

 					std::copy(&samples[leftSize], &samples[size], &this->buffer[N * 3 / 2]);

@@ -153,7 +157,7 @@ template<size_t N> struct RingBuffer

 		if (this->bufferPos >= N * 3 / 2)

 			this->bufferPos -= N;

 	}

-	const int16_t *GetBuffer() const

+	const std::int16_t *GetBuffer() const

 	{

 		return &this->buffer[this->getPos];

 	}

@@ -167,35 +171,35 @@ template<size_t N> struct RingBuffer

 struct Channel

 {

-	int8_t chnId;

+	std::int8_t chnId;

 	TempSndReg tempReg;

-	uint8_t state;

-	int8_t trackId; // -1 = none

-	uint8_t prio;

+	ChannelState state;

+	std::int8_t trackId; // -1 = none

+	std::uint8_t prio;

 	bool manualSweep;

-	std::bitset<CF_BITS> flags;

-	int8_t pan; // -64 .. 63

-	int16_t extAmpl;

+	std::bitset<ToIntegral(ChannelFlag::Bits)> flags;

+	std::int8_t pan; // -64 .. 63

+	std::int16_t extAmpl;

-	int16_t velocity;

-	int8_t extPan;

-	uint8_t key;

+	std::int16_t velocity;

+	std::int8_t extPan;

+	std::uint8_t key;

 	int ampl; // 7 fractionary bits

 	int extTune; // in 64ths of a semitone

-	uint8_t orgKey;

+	std::uint8_t orgKey;

-	uint8_t modType, modSpeed, modDepth, modRange;

-	uint16_t modDelay, modDelayCnt, modCounter;

+	std::uint8_t modType, modSpeed, modDepth, modRange;

+	std::uint16_t modDelay, modDelayCnt, modCounter;

-	uint32_t sweepLen, sweepCnt;

-	int16_t sweepPitch;

+	std::uint32_t sweepLen, sweepCnt;

+	std::int16_t sweepPitch;

-	uint8_t attackLvl, sustainLvl;

-	uint16_t decayRate, releaseRate;

+	std::uint8_t attackLvl, sustainLvl;

+	std::uint16_t decayRate, releaseRate;

 	/*

 	 * These were originally global variables in FeOS Sound System, but

@@ -203,7 +207,7 @@ struct Channel

 	 * into this class.

 	 */

 	int noteLength;

-	uint16_t vol;

+	std::uint16_t vol;

 	const Player *ply;

 	NDSSoundRegister reg;

@@ -234,7 +238,7 @@ struct Channel

 	void Kill();

 	void UpdateTrack();

 	void Update();

-	int32_t Interpolate();

-	int32_t GenerateSample();

+	std::int32_t Interpolate();

+	std::int32_t GenerateSample();

 	void IncrementSample();

 };

@@ -1,7 +1,6 @@

 /*

  * SSEQ Player - Channel structures

  * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]

- * Last modification on 2014-10-27

  *

  * Adapted from source code of FeOS Sound System

  * By fincs

@@ -21,7 +21,7 @@

 /*

  * This structure is meant to be similar to what is stored in the actual

- * Nintendo DS's sound registers.  Items that were not being used by this

+ * Nintendo DS's sound registers. Items that were not being used by this

  * player have been removed, and items which help the simulated registers

  * have been added.

  */

@@ -67,7 +67,7 @@ struct NDSSoundRegister

 /*

  * From FeOS Sound System, this is temporary storage of what will go into

- * the Nintendo DS sound registers.  It is kept separate as the original code

+ * the Nintendo DS sound registers. It is kept separate as the original code

  * from FeOS Sound System utilized this to hold data prior to passing it into

  * the DS's registers.

  */

@@ -88,7 +88,7 @@ struct Player;

  * data, duplicated. The way it is duplicated is done as follows:

  * the samples are stored in the center of the buffer, and on both

  * sides is half of the data, the first half being after the data

- * and the second half before before the data. This in essense

+ * and the second half begin before the data. This in essence

  * mirrors the data while allowing a pointer to always be retrieved

  * and no extra copies of the buffer are created. Part of the idea

  * for this came from kode54's original buffer implementation, but

@@ -1,7 +1,7 @@

 /*

  * SSEQ Player - Channel structures

  * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]

- * Last modification on 2014-09-17

+ * Last modification on 2014-10-27

  *

  * Adapted from source code of FeOS Sound System

  * By fincs

@@ -220,6 +220,7 @@ struct Channel

 	static const unsigned SINC_WIDTH = 8;

 	static const unsigned SINC_SAMPLES = SINC_RESOLUTION * SINC_WIDTH;

 	static double sinc_lut[SINC_SAMPLES + 1];

+	static double window_lut[SINC_SAMPLES + 1];

 	RingBuffer<SINC_WIDTH * 2> ringBuffer;

@@ -210,7 +210,7 @@ struct Channel

 	NDSSoundRegister reg;

 	/*

-	 * Lookup tables for the cosine and Lanczos Sinc interpolations, to

+	 * Lookup tables for the Sinc interpolation, 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.

@@ -216,11 +216,9 @@ struct Channel

 	 * of the program.

 	 */

 	static bool initializedLUTs;

-	static const unsigned COSINE_RESOLUTION = 8192;

 	static const unsigned SINC_RESOLUTION = 8192;

 	static const unsigned SINC_WIDTH = 8;

 	static const unsigned SINC_SAMPLES = SINC_RESOLUTION * SINC_WIDTH;

-	static double cosine_lut[COSINE_RESOLUTION];

 	static double sinc_lut[SINC_SAMPLES + 1];

 	RingBuffer<SINC_WIDTH * 2> ringBuffer;

@@ -1,7 +1,7 @@

 /*

  * SSEQ Player - Channel structures

  * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]

- * Last modification on 2014-09-08

+ * Last modification on 2014-09-17

  *

  * Adapted from source code of FeOS Sound System

  * By fincs

@@ -13,6 +13,7 @@

 #pragma once

+#include <algorithm>

 #include <bitset>

 #include <cstdint>

 #include "SWAV.h"

@@ -153,7 +154,7 @@ template<size_t N> struct RingBuffer

 		if (this->bufferPos >= N * 3 / 2)

 			this->bufferPos -= N;

 	}

-	const int16_t *const GetBuffer() const

+	const int16_t *GetBuffer() const

 	{

 		return &this->buffer[this->getPos];

 	}

@@ -102,11 +102,11 @@ template<size_t N> struct RingBuffer

 	RingBuffer() : bufferPos(N / 2), getPos(N / 2)

 	{

-		std::fill(&this->buffer[0], &this->buffer[N * 2], 0);

+		std::fill_n(&this->buffer[0], N * 2, 0);

 	}

 	void Clear()

 	{

-		std::fill(&this->buffer[0], &this->buffer[N * 2], 0);

+		std::fill_n(&this->buffer[0], N * 2, 0);

 		this->bufferPos = this->getPos = N / 2;

 	}

 	void PushSample(int16_t sample)

@@ -125,11 +125,11 @@ template<size_t N> struct RingBuffer

 		if (this->bufferPos + size > N * 3 / 2)

 		{

 			size_t free = N * 3 / 2 - this->bufferPos;

-			std::copy(&samples[0], &samples[free], &this->buffer[this->bufferPos]);

+			std::copy_n(&samples[0], free, &this->buffer[this->bufferPos]);

 			std::copy(&samples[free], &samples[size], &this->buffer[N / 2]);

 		}

 		else

-			std::copy(&samples[0], &samples[size], &this->buffer[this->bufferPos]);

+			std::copy_n(&samples[0], size, &this->buffer[this->bufferPos]);

 		size_t rightFree = this->bufferPos < N ? N - this->bufferPos : 0;

 		if (rightFree < size)

 		{

@@ -137,18 +137,18 @@ template<size_t N> struct RingBuffer

 			{

 				size_t leftStart = this->bufferPos - N;

 				size_t leftSize = std::min(N / 2 - leftStart, size);

-				std::copy(&samples[0], &samples[leftSize], &this->buffer[leftStart]);

+				std::copy_n(&samples[0], leftSize, &this->buffer[leftStart]);

 				if (leftSize < size)

 					std::copy(&samples[leftSize], &samples[size], &this->buffer[N * 3 / 2]);

 			}

 			else

 			{

-				std::copy(&samples[0], &samples[rightFree], &this->buffer[this->bufferPos + N]);

+				std::copy_n(&samples[0], rightFree, &this->buffer[this->bufferPos + N]);

 				std::copy(&samples[rightFree], &samples[size], &this->buffer[0]);

 			}

 		}

 		else

-			std::copy(&samples[0], &samples[size], &this->buffer[this->bufferPos + N]);

+			std::copy_n(&samples[0], size, &this->buffer[this->bufferPos + N]);

 		this->bufferPos += size;

 		if (this->bufferPos >= N * 3 / 2)

 			this->bufferPos -= N;

@@ -1,7 +1,7 @@

 /*

  * SSEQ Player - Channel structures

  * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]

- * Last modification on 2013-05-07

+ * Last modification on 2014-09-08

  *

  * Adapted from source code of FeOS Sound System

  * By fincs

@@ -11,8 +11,7 @@

  * http://desmume.org/

  */

-#ifndef SSEQPLAYER_CHANNEL_H

-#define SSEQPLAYER_CHANNEL_H

+#pragma once

 #include <bitset>

 #include <cstdint>

@@ -240,5 +239,3 @@ struct Channel

 	int32_t GenerateSample();

 	void IncrementSample();

 };

-

-#endif

@@ -1,7 +1,7 @@

 /*

  * SSEQ Player - Channel structures

  * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]

- * Last modification on 2013-04-26

+ * Last modification on 2013-05-07

  *

  * Adapted from source code of FeOS Sound System

  * By fincs

@@ -83,6 +83,89 @@ struct TempSndReg

 struct Player;

+/*

+ * This creates a ring buffer, which will store N samples of SWAV

+ * data, duplicated. The way it is duplicated is done as follows:

+ * the samples are stored in the center of the buffer, and on both

+ * sides is half of the data, the first half being after the data

+ * and the second half before before the data. This in essense

+ * mirrors the data while allowing a pointer to always be retrieved

+ * and no extra copies of the buffer are created. Part of the idea

+ * for this came from kode54's original buffer implementation, but

+ * this has been designed to make sure that there are no delays in

+ * accessing the SWAVs samples and also doesn't use 0s before the

+ * start of the SWAV or use 0s after the end of a non-looping SWAV.

+ */

+template<size_t N> struct RingBuffer

+{

+	int16_t buffer[N * 2];

+	size_t bufferPos, getPos;

+

+	RingBuffer() : bufferPos(N / 2), getPos(N / 2)

+	{

+		std::fill(&this->buffer[0], &this->buffer[N * 2], 0);

+	}

+	void Clear()

+	{

+		std::fill(&this->buffer[0], &this->buffer[N * 2], 0);

+		this->bufferPos = this->getPos = N / 2;

+	}

+	void PushSample(int16_t sample)

+	{

+		this->buffer[this->bufferPos] = sample;

+		if (this->bufferPos >= N)

+			this->buffer[this->bufferPos - N] = sample;

+		else

+			this->buffer[this->bufferPos + N] = sample;

+		++this->bufferPos;

+		if (this->bufferPos >= N * 3 / 2)

+			this->bufferPos -= N;

+	}

+	void PushSamples(const int16_t *samples, size_t size)

+	{

+		if (this->bufferPos + size > N * 3 / 2)

+		{

+			size_t free = N * 3 / 2 - this->bufferPos;

+			std::copy(&samples[0], &samples[free], &this->buffer[this->bufferPos]);

+			std::copy(&samples[free], &samples[size], &this->buffer[N / 2]);

+		}

+		else

+			std::copy(&samples[0], &samples[size], &this->buffer[this->bufferPos]);

+		size_t rightFree = this->bufferPos < N ? N - this->bufferPos : 0;

+		if (rightFree < size)

+		{

+			if (!rightFree)

+			{

+				size_t leftStart = this->bufferPos - N;

+				size_t leftSize = std::min(N / 2 - leftStart, size);

+				std::copy(&samples[0], &samples[leftSize], &this->buffer[leftStart]);

+				if (leftSize < size)

+					std::copy(&samples[leftSize], &samples[size], &this->buffer[N * 3 / 2]);

+			}

+			else

+			{

+				std::copy(&samples[0], &samples[rightFree], &this->buffer[this->bufferPos + N]);

+				std::copy(&samples[rightFree], &samples[size], &this->buffer[0]);

+			}

+		}

+		else

+			std::copy(&samples[0], &samples[size], &this->buffer[this->bufferPos + N]);

+		this->bufferPos += size;

+		if (this->bufferPos >= N * 3 / 2)

+			this->bufferPos -= N;

+	}

+	const int16_t *const GetBuffer() const

+	{

+		return &this->buffer[this->getPos];

+	}

+	void NextSample()

+	{

+		++this->getPos;

+		if (this->getPos >= N * 3 / 2)

+			this->getPos -= N;

+	}

+};

+

 struct Channel

 {

 	int8_t chnId;

@@ -126,14 +209,6 @@ struct Channel

 	const Player *ply;

 	NDSSoundRegister reg;

-	/*

-	 * Interpolation history buffer, which contains the maximum number of

-	 * samples required for any given interpolation mode. Doubled to

-	 * simplify the case of wrapping. Thanks to kode54 for providing this.

-	 */

-	uint32_t sampleHistoryPtr;

-	int16_t sampleHistory[64];

-

 	/*

 	 * Lookup tables for the cosine and Lanczos Sinc interpolations, to

 	 * avoid the need to call the sin/cos functions all the time.

@@ -142,11 +217,13 @@ struct Channel

 	 */

 	static bool initializedLUTs;

 	static const unsigned COSINE_RESOLUTION = 8192;

-	static const unsigned LANCZOS_RESOLUTION = 8192;

-	static const unsigned LANCZOS_WIDTH = 8;

-	static const unsigned LANCZOS_SAMPLES = LANCZOS_RESOLUTION * LANCZOS_WIDTH;

+	static const unsigned SINC_RESOLUTION = 8192;

+	static const unsigned SINC_WIDTH = 8;

+	static const unsigned SINC_SAMPLES = SINC_RESOLUTION * SINC_WIDTH;

 	static double cosine_lut[COSINE_RESOLUTION];

-	static double lanczos_lut[LANCZOS_SAMPLES + 1];

+	static double sinc_lut[SINC_SAMPLES + 1];

+

+	RingBuffer<SINC_WIDTH * 2> ringBuffer;

 	Channel();

@@ -162,7 +239,6 @@ struct Channel

 	int32_t Interpolate();

 	int32_t GenerateSample();

 	void IncrementSample();

-	void clearHistory();

 };

 #endif

@@ -1,7 +1,7 @@

 /*

  * SSEQ Player - Channel structures

  * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]

- * Last modification on 2013-04-23

+ * Last modification on 2013-04-26

  *

  * Adapted from source code of FeOS Sound System

  * By fincs

@@ -132,7 +132,7 @@ struct Channel

 	 * simplify the case of wrapping. Thanks to kode54 for providing this.

 	 */

 	uint32_t sampleHistoryPtr;

-	int16_t sampleHistory[16];

+	int16_t sampleHistory[64];

 	/*

 	 * Lookup tables for the cosine and Lanczos Sinc interpolations, to

@@ -143,10 +143,10 @@ struct Channel

 	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_WIDTH = 8;

 	static const unsigned LANCZOS_SAMPLES = LANCZOS_RESOLUTION * LANCZOS_WIDTH;

 	static double cosine_lut[COSINE_RESOLUTION];

-	static double lanczos_lut[LANCZOS_SAMPLES];

+	static double lanczos_lut[LANCZOS_SAMPLES + 1];

 	Channel();

@@ -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);

@@ -1,7 +1,7 @@

 /*

  * SSEQ Player - Channel structures

  * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]

- * Last modification on 2013-04-02

+ * Last modification on 2013-04-18

  *

  * Adapted from source code of FeOS Sound System

  * By fincs

@@ -127,6 +127,14 @@ struct Channel

 	const Player *ply;

 	NDSSoundRegister reg;

+	/*

+	 * Interpolation history buffer, which contains the maximum number of

+	 * samples required for any given interpolation mode. Doubled to

+	 * simplify the case of wrapping. Thanks to kode54 for providing this.

+	 */

+	uint32_t sampleHistoryPtr;

+	int16_t sampleHistory[16];

+

 	Channel();

 	void UpdateVol(const Track &trk);

@@ -141,6 +149,7 @@ struct Channel

 	int32_t Interpolate();

 	int32_t GenerateSample();

 	void IncrementSample();

+	void clearHistory();

 };

 #endif

@@ -58,6 +58,8 @@ struct NDSSoundRegister

 	// Length Register

 	uint32_t length;

+	uint32_t totalLength;

+

 	NDSSoundRegister();

 	void ClearControlRegister();

@@ -1,7 +1,7 @@

 /*

  * SSEQ Player - Channel structures

  * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]

- * Last modification on 2013-03-21

+ * Last modification on 2013-04-02

  *

  * Adapted from source code of FeOS Sound System

  * By fincs

@@ -15,6 +15,7 @@

 #define SSEQPLAYER_CHANNEL_H

 #include <bitset>

+#include <tuple>

 #include "SWAV.h"

 #include "Track.h"

 #include "pstdint.h"

@@ -135,7 +136,7 @@ struct Channel

 	void Kill();

 	void UpdateTrack();

 	void Update();

-	int32_t Interpolate(int32_t a, int32_t b, double ratio);

+	int32_t Interpolate();

 	int32_t GenerateSample();

 	void IncrementSample();

 };

new file mode 100644

@@ -0,0 +1,143 @@

+/*

+ * SSEQ Player - Channel structures

+ * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]

+ * Last modification on 2013-03-21

+ *

+ * Adapted from source code of FeOS Sound System

+ * By fincs

+ * https://github.com/fincs/FSS

+ *

+ * Some code/concepts from DeSmuME

+ * http://desmume.org/

+ */

+

+#ifndef SSEQPLAYER_CHANNEL_H

+#define SSEQPLAYER_CHANNEL_H

+

+#include <bitset>

+#include "SWAV.h"

+#include "Track.h"

+#include "pstdint.h"

+

+/*

+ * This structure is meant to be similar to what is stored in the actual

+ * Nintendo DS's sound registers.  Items that were not being used by this

+ * player have been removed, and items which help the simulated registers

+ * have been added.

+ */

+struct NDSSoundRegister

+{

+	// Control Register

+	uint8_t volumeMul;

+	uint8_t volumeDiv;

+	uint8_t panning;

+	uint8_t waveDuty;

+	uint8_t repeatMode;

+	uint8_t format;

+	bool enable;

+

+	// Data Source Register

+	const SWAV *source;

+

+	// Timer Register

+	uint16_t timer;

+

+	// PSG Handling, not a DS register

+	uint16_t psgX;

+	int16_t psgLast;

+	uint32_t psgLastCount;

+

+	// The following are taken from DeSmuME

+	double samplePosition;

+	double sampleIncrease;

+

+	// Loopstart Register

+	uint32_t loopStart;

+

+	// Length Register

+	uint32_t length;

+

+	NDSSoundRegister();

+

+	void ClearControlRegister();

+	void SetControlRegister(uint32_t reg);

+};

+

+/*

+ * From FeOS Sound System, this is temporary storage of what will go into

+ * the Nintendo DS sound registers.  It is kept separate as the original code

+ * from FeOS Sound System utilized this to hold data prior to passing it into

+ * the DS's registers.

+ */

+struct TempSndReg

+{

+	uint32_t CR;

+	const SWAV *SOURCE;

+	uint16_t TIMER;

+	uint32_t REPEAT_POINT, LENGTH;

+

+	TempSndReg();

+};

+

+struct Player;

+

+struct Channel

+{

+	int8_t chnId;

+

+	TempSndReg tempReg;

+	uint8_t state;

+	int8_t trackId; // -1 = none

+	uint8_t prio;

+	bool manualSweep;

+

+	std::bitset<CF_BITS> flags;

+	int8_t pan; // -64 .. 63

+	int16_t extAmpl;

+

+	int16_t velocity;

+	int8_t extPan;

+	uint8_t key;

+

+	int ampl; // 7 fractionary bits

+	int extTune; // in 64ths of a semitone

+

+	uint8_t orgKey;

+

+	uint8_t modType, modSpeed, modDepth, modRange;

+	uint16_t modDelay, modDelayCnt, modCounter;

+

+	uint32_t sweepLen, sweepCnt;

+	int16_t sweepPitch;

+

+	uint8_t attackLvl, sustainLvl;

+	uint16_t decayRate, releaseRate;

+

+	/*

+	 * These were originally global variables in FeOS Sound System, but

+	 * since they were linked to a certain channel anyways, I moved them

+	 * into this class.

+	 */

+	int noteLength;

+	uint16_t vol;

+

+	const Player *ply;

+	NDSSoundRegister reg;

+

+	Channel();

+

+	void UpdateVol(const Track &trk);

+	void UpdatePan(const Track &trk);

+	void UpdateTune(const Track &trk);

+	void UpdateMod(const Track &trk);

+	void UpdatePorta(const Track &trk);

+	void Release();

+	void Kill();

+	void UpdateTrack();

+	void Update();

+	int32_t Interpolate(int32_t a, int32_t b, double ratio);

+	int32_t GenerateSample();

+	void IncrementSample();

+};

+

+#endif