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

 /*

  * SSEQ Player - SDAT INFO Entry structures

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

- * Last modification on 2013-03-21

+ * Last modification on 2014-10-25

  *

  * Nintendo DS Nitro Composer (SDAT) Specification document found at

  * http://www.feshrine.net/hacking/doc/nds-sdat.html

@@ -9,7 +9,7 @@

 #include "INFOEntry.h"

-INFOEntrySEQ::INFOEntrySEQ() : fileID(0), bank(0), vol(0)

+INFOEntrySEQ::INFOEntrySEQ() : fileID(0), bank(0), vol(0), ply(0)

 {

 }

@@ -23,7 +23,7 @@ void INFOEntrySEQ::Read(PseudoFile &file)

 		this->vol = 0x7F; // Prevents nothing for volume

 	file.ReadLE<uint8_t>(); // cpr

 	file.ReadLE<uint8_t>(); // ppr

-	file.ReadLE<uint8_t>(); // ply

+	this->ply = file.ReadLE<uint8_t>();

 }

 INFOEntryBANK::INFOEntryBANK() : fileID(0)

@@ -45,4 +45,16 @@ INFOEntryWAVEARC::INFOEntryWAVEARC() : fileID(0)

 void INFOEntryWAVEARC::Read(PseudoFile &file)

 {

 	this->fileID = file.ReadLE<uint16_t>();

+	file.ReadLE<uint16_t>(); // unknown

+}

+

+INFOEntryPLAYER::INFOEntryPLAYER() : channelMask(0)

+{

+}

+

+void INFOEntryPLAYER::Read(PseudoFile &file)

+{

+	file.ReadLE<uint16_t>(); // maxSeqs

+	this->channelMask = file.ReadLE<uint16_t>();

+	file.ReadLE<uint32_t>(); // heapSize

 }

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

 /*

  * SSEQ Player - SDAT INFO Entry structures

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

- * Last modification on 2014-09-08

+ * Last modification on 2014-10-25

  *

  * Nintendo DS Nitro Composer (SDAT) Specification document found at

  * http://www.feshrine.net/hacking/doc/nds-sdat.html

@@ -25,6 +25,7 @@ struct INFOEntrySEQ : INFOEntry

 	uint16_t fileID;

 	uint16_t bank;

 	uint8_t vol;

+	uint8_t ply;

 	INFOEntrySEQ();

@@ -49,3 +50,12 @@ struct INFOEntryWAVEARC : INFOEntry

 	void Read(PseudoFile &file);

 };

+

+struct INFOEntryPLAYER : INFOEntry

+{

+	uint16_t channelMask;

+

+	INFOEntryPLAYER();

+

+	void Read(PseudoFile &file);

+};

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

 /*

  * SSEQ Player - SDAT INFO Section structures

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

- * Last modification on 2013-03-25

+ * Last modification on 2014-10-25

  *

  * Nintendo DS Nitro Composer (SDAT) Specification document found at

  * http://www.feshrine.net/hacking/doc/nds-sdat.html

@@ -28,7 +28,7 @@ template<typename T> void INFORecord<T>::Read(PseudoFile &file, uint32_t startOf

 		}

 }

-INFOSection::INFOSection() : SEQrecord(), BANKrecord(), WAVEARCrecord()

+INFOSection::INFOSection() : SEQrecord(), BANKrecord(), WAVEARCrecord(), PLAYERrecord()

 {

 }

@@ -57,4 +57,9 @@ void INFOSection::Read(PseudoFile &file)

 		file.pos = startOfINFO + recordOffsets[REC_WAVEARC];

 		this->WAVEARCrecord.Read(file, startOfINFO);

 	}

+	if (recordOffsets[REC_PLAYER])

+	{

+		file.pos = startOfINFO + recordOffsets[REC_PLAYER];

+		this->PLAYERrecord.Read(file, startOfINFO);

+	}

 }

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

 /*

  * SSEQ Player - SDAT INFO Section structures

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

- * Last modification on 2014-09-08

+ * Last modification on 2014-10-25

  *

  * Nintendo DS Nitro Composer (SDAT) Specification document found at

  * http://www.feshrine.net/hacking/doc/nds-sdat.html

@@ -27,6 +27,7 @@ struct INFOSection

 	INFORecord<INFOEntrySEQ> SEQrecord;

 	INFORecord<INFOEntryBANK> BANKrecord;

 	INFORecord<INFOEntryWAVEARC> WAVEARCrecord;

+	INFORecord<INFOEntryPLAYER> PLAYERrecord;

 	INFOSection();

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

 /*

  * SSEQ Player - Player structure

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

- * Last modification on 2014-10-23

+ * Last modification on 2014-10-25

  *

  * Adapted from source code of FeOS Sound System

  * By fincs

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

 #include "Player.h"

 #include "common.h"

-Player::Player() : prio(0), nTracks(0), tempo(0), tempoCount(0), tempoRate(0), masterVol(0), sseqVol(0), sseq(nullptr), sampleRate(0), interpolation(INTERPOLATION_NONE)

+Player::Player() : prio(0), nTracks(0), tempo(0), tempoCount(0), tempoRate(0), masterVol(0), sseqVol(0), sseq(nullptr), allowedChannels(0), sampleRate(0),

+	interpolation(INTERPOLATION_NONE)

 {

 	memset(this->trackIds, 0, sizeof(this->trackIds));

 	for (size_t i = 0; i < 16; ++i)

@@ -99,6 +100,8 @@ int Player::ChannelAlloc(int type, int priority)

 	for (int i = 0; i < arraySize; ++i)

 	{

 		int thisChnNo = chnArray[i];

+		if (!this->allowedChannels[thisChnNo])

+			continue;

 		Channel &thisChn = this->channels[thisChnNo];

 		Channel &curChn = this->channels[curChnNo];

 		if (curChnNo != -1 && thisChn.prio >= curChn.prio)

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

 /*

  * SSEQ Player - Player structure

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

- * Last modification on 2014-10-18

+ * Last modification on 2014-10-25

  *

  * Adapted from source code of FeOS Sound System

  * By fincs

@@ -10,6 +10,7 @@

 #pragma once

+#include <bitset>

 #include "SSEQ.h"

 #include "Track.h"

 #include "Channel.h"

@@ -26,6 +27,7 @@ struct Player

 	uint8_t trackIds[FSS_TRACKCOUNT];

 	Track tracks[FSS_MAXTRACKS];

 	Channel channels[16];

+	std::bitset<16> allowedChannels;

 	int16_t variables[32];

 	uint32_t sampleRate;

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

 /*

  * SSEQ Player - SDAT structure

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

- * Last modification on 2013-03-21

+ * Last modification on 2014-10-25

  *

  * Nintendo DS Nitro Composer (SDAT) Specification document found at

  * http://www.feshrine.net/hacking/doc/nds-sdat.html

@@ -14,7 +14,7 @@

 #include "FATSection.h"

 #include "convert.h"

-SDAT::SDAT(PseudoFile &file, uint32_t sseqToLoad) : sseq(), sbnk()

+SDAT::SDAT(PseudoFile &file, uint32_t sseqToLoad) : sseq(), sbnk(), player()

 {

 	// Read sections

 	NDSStdHeader header;

@@ -89,5 +89,11 @@ SDAT::SDAT(PseudoFile &file, uint32_t sseqToLoad) : sseq(), sbnk()

 			}

 			else

 				this->swar[i].release();

+

+		// Get PLAYER for this SSEQ, if it exists

+		if (!infoSection.PLAYERrecord.entries.empty())

+			this->player = infoSection.PLAYERrecord.entries[this->sseq->info.ply];

+		if (!this->player.channelMask)

+			this->player.channelMask = 0xFFFF;

 	}

 }

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

 /*

  * SSEQ Player - SDAT structure

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

- * Last modification on 2014-09-08

+ * Last modification on 2014-10-25

  *

  * Nintendo DS Nitro Composer (SDAT) Specification document found at

  * http://www.feshrine.net/hacking/doc/nds-sdat.html

@@ -20,6 +20,7 @@ struct SDAT

 	std::unique_ptr<SSEQ> sseq;

 	std::unique_ptr<SBNK> sbnk;

 	std::unique_ptr<SWAR> swar[4];

+	INFOEntryPLAYER player;

 	SDAT(PseudoFile &file, uint32_t sseqToLoad);

 private:

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

 /*

  * SSEQ Player - SDAT SYMB (Symbol/Filename) Section structures

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

- * Last modification on 2013-03-25

+ * Last modification on 2014-10-25

  *

  * Nintendo DS Nitro Composer (SDAT) Specification document found at

  * http://www.feshrine.net/hacking/doc/nds-sdat.html

@@ -27,7 +27,7 @@ void SYMBRecord::Read(PseudoFile &file, uint32_t startOffset)

 		}

 }

-SYMBSection::SYMBSection() : SEQrecord(), BANKrecord(), WAVEARCrecord()

+SYMBSection::SYMBSection() : SEQrecord(), BANKrecord(), WAVEARCrecord(), PLAYERrecord()

 {

 }

@@ -56,4 +56,9 @@ void SYMBSection::Read(PseudoFile &file)

 		file.pos = startOfSYMB + recordOffsets[REC_WAVEARC];

 		this->WAVEARCrecord.Read(file, startOfSYMB);

 	}

+	if (recordOffsets[REC_PLAYER])

+	{

+		file.pos = startOfSYMB + recordOffsets[REC_PLAYER];

+		this->PLAYERrecord.Read(file, startOfSYMB);

+	}

 }

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

 /*

  * SSEQ Player - SDAT SYMB (Symbol/Filename) Section structures

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

- * Last modification on 2014-09-08

+ * Last modification on 2014-10-25

  *

  * Nintendo DS Nitro Composer (SDAT) Specification document found at

  * http://www.feshrine.net/hacking/doc/nds-sdat.html

@@ -29,6 +29,7 @@ struct SYMBSection

 	SYMBRecord SEQrecord;

 	SYMBRecord BANKrecord;

 	SYMBRecord WAVEARCrecord;

+	SYMBRecord PLAYERrecord;

 	SYMBSection();

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

 /*

  * xSF - NCSF configuration

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

- * Last modification on 2014-10-23

+ * Last modification on 2014-10-25

  *

  * Partially based on the vio*sf framework

  */

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

 unsigned XSFConfig::initSampleRate = 44100;

 std::string XSFConfig::commonName = "NCSF Decoder";

-std::string XSFConfig::versionNumber = "1.10.3";

+std::string XSFConfig::versionNumber = "1.11";

 unsigned XSFConfig_NCSF::initInterpolation = 4;

 std::string XSFConfig_NCSF::initMutes = "0000000000000000";

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

 /*

  * xSF - NCSF Player

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

- * Last modification on 2014-10-18

+ * Last modification on 2014-10-25

  *

  * Partially based on the vio*sf framework

  *

@@ -173,6 +173,7 @@ bool XSFPlayer_NCSF::Load()

 	file.data = &this->sdatData;

 	this->sdat.reset(new SDAT(file, this->sseq));

 	auto *sseqToPlay = this->sdat->sseq.get();

+	this->player.allowedChannels = std::bitset<16>(this->sdat->player.channelMask);

 	this->player.sseqVol = Cnv_Scale(sseqToPlay->info.vol);

 	this->player.sampleRate = this->sampleRate;

 	this->player.Setup(sseqToPlay);