"mm:ss.xxx" format.
+ */
+int ASAPInfo_ParseDuration(const char *s);
+
+/**
+ * Checks whether the filename represents a module type supported by ASAP.
+ * Returns true if the filename is supported by ASAP.
+ * @param filename Filename to check the extension of.
+ */
+bool ASAPInfo_IsOurFile(const char *filename);
+
+/**
+ * Checks whether the filename extension represents a module type supported by ASAP.
+ * Returns true if the filename extension is supported by ASAP.
+ * @param ext Filename extension without the leading dot.
+ */
+bool ASAPInfo_IsOurExt(const char *ext);
+
+/**
+ * Loads file information.
+ * @param self This ASAPInfo.
+ * @param filename Filename, used to determine the format.
+ * @param module Contents of the file.
+ * @param moduleLen Length of the file.
+ */
+bool ASAPInfo_Load(ASAPInfo *self, const char *filename, uint8_t const *module, int moduleLen);
+
+/**
* Returns author's name.
* A nickname may be included in parentheses after the real name.
* Multiple authors are separated with " & ".
@@ -224,28 +253,30 @@
/**
* Returns music creation date.
- * Some of the possible formats are:
+ *
+ * Some of the possible formats are: *
-
*
- YYYY *
- MM/YYYY *
- DD/MM/YYYY *
- YYYY-YYYY *
An empty string means the date is unknown.
* @param self This ASAPInfo.
*/
const char *ASAPInfo_GetDate(const ASAPInfo *self);
/**
* Sets music creation date.
- * Some of the possible formats are:
+ *
+ *
Some of the possible formats are: *
-
*
- YYYY *
- MM/YYYY *
- DD/MM/YYYY *
- YYYY-YYYY *
An empty string means the date is unknown.
* @param self This ASAPInfo.
* @param value New music creation date.
*/
@@ -317,12 +348,12 @@
/**
* Returns information whether the specified song loops.
- * Returns:
+ *
+ *
Returns: *
-
*
trueif the song loops
* falseif the song stops
*
ASAPInfo.
* @param song Song to check for looping, 0-based.
*/
@@ -330,12 +361,12 @@
/**
* Sets information whether the specified song loops.
- * Use:
+ *
+ * Use: *
-
*
trueif the song loops
* falseif the song stops
*
ASAPInfo.
* @param song Song to set as looping, 0-based.
* @param loop true if the song loops.
@@ -403,7 +434,7 @@
int ASAPInfo_GetCovoxAddress(const ASAPInfo *self);
/**
- * Retturns the length of the SAP header in bytes.
+ * Returns the length of the SAP header in bytes.
* @param self This ASAPInfo.
*/
int ASAPInfo_GetSapHeaderLength(const ASAPInfo *self);
@@ -418,35 +449,6 @@
int ASAPInfo_GetInstrumentNamesOffset(const ASAPInfo *self, uint8_t const *module, int moduleLen);
/**
- * Returns the number of milliseconds represented by the given string.
- * @param s Time in the "mm:ss.xxx" format.
- */
-int ASAPInfo_ParseDuration(const char *s);
-
-/**
- * Checks whether the filename represents a module type supported by ASAP.
- * Returns true if the filename is supported by ASAP.
- * @param filename Filename to check the extension of.
- */
-bool ASAPInfo_IsOurFile(const char *filename);
-
-/**
- * Checks whether the filename extension represents a module type supported by ASAP.
- * Returns true if the filename extension is supported by ASAP.
- * @param ext Filename extension without the leading dot.
- */
-bool ASAPInfo_IsOurExt(const char *ext);
-
-/**
- * Loads file information.
- * @param self This ASAPInfo.
- * @param filename Filename, used to determine the format.
- * @param module Contents of the file.
- * @param moduleLen Length of the file.
- */
-bool ASAPInfo_Load(ASAPInfo *self, const char *filename, uint8_t const *module, int moduleLen);
-
-/**
* Returns human-readable description of the filename extension.
* @param ext Filename extension without the leading dot.
*/
diff -Nru kodi-audiodecoder-asap-20.2.0/lib/asap-code/asapinfo.ci kodi-audiodecoder-asap-20.3.0/lib/asap-code/asapinfo.ci
--- kodi-audiodecoder-asap-20.2.0/lib/asap-code/asapinfo.ci 2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-asap-20.3.0/lib/asap-code/asapinfo.ci 2013-05-31 22:59:22.000000000 +0000
@@ -1,6 +1,6 @@
// asapinfo.ci - module parser
//
-// Copyright (C) 2010-2020 Piotr Fusik
+// Copyright (C) 2010-2021 Piotr Fusik
//
// This file is part of ASAP (Another Slight Atari Player),
// see http://asap.sourceforge.net
@@ -105,18 +105,18 @@
/// ASAP version - major part.
public const int VersionMajor = 5;
/// ASAP version - minor part.
- public const int VersionMinor = 0;
+ public const int VersionMinor = 2;
/// ASAP version - micro part.
- public const int VersionMicro = 1;
+ public const int VersionMicro = 0;
/// ASAP version as a string.
- public const string Version = VersionMajor + "." + VersionMinor + "." + VersionMicro;
+ public const string Version = $"{VersionMajor}.{VersionMinor}.{VersionMicro}";
/// Years ASAP was created in.
- public const string Years = "2005-2020";
+ public const string Years = "2005-2021";
/// Short credits for ASAP.
public const string Credits =
- "Another Slight Atari Player (C) " + Years + " Piotr Fusik\n" +
+ $"Another Slight Atari Player (C) {Years} Piotr Fusik\n" +
"CMC, MPT, TMC, TM2 players (C) 1994-2005 Marcin Lewandowski\n" +
"RMT player (C) 2002-2005 Radek Sterba\n" +
"DLT player (C) 2009 Marek Konopka\n" +
@@ -141,10 +141,12 @@
/// Maximum number of songs in a file.
public const int MaxSongs = 32;
+#if !OPENCL
string() Filename;
string() Author;
string() Title;
string() Date;
+#endif
int Channels;
int Songs;
int DefaultSong;
@@ -173,489 +175,214 @@
throw "Invalid character";
}
- static void CheckValidText(string s)
+ internal static int GetWord(byte[] array, int i) => array[i] + (array[i + 1] << 8);
+
+ void ParseModule!(byte[] module, int moduleLen)
throws
{
- int n = s.Length;
- if (n > MaxTextLength)
- throw "Text too long";
- for (int i = 0; i < n; i++)
- CheckValidChar(s[i]);
+ if ((module[0] != 0xff || module[1] != 0xff)
+ && (module[0] != 0 || module[1] != 0)) // some CMC and clones start with zeros
+ throw "Invalid two leading bytes of the module";
+ Music = GetWord(module, 2);
+ int musicLastByte = GetWord(module, 4);
+ if (Music <= 0xd7ff && musicLastByte >= 0xd000)
+ throw "Module address conflicts with hardware registers";
+ int blockLen = musicLastByte + 1 - Music;
+ if (6 + blockLen != moduleLen) {
+ if (Type != ASAPModuleType.Rmt || 11 + blockLen > moduleLen)
+ throw "Module length doesn't match headers";
+ // allow optional info for Raster Music Tracker
+ int infoAddr = GetWord(module, 6 + blockLen);
+ if (infoAddr != Music + blockLen)
+ throw "Invalid address of RMT info";
+ int infoLen = GetWord(module, 8 + blockLen) + 1 - infoAddr;
+ if (10 + blockLen + infoLen != moduleLen)
+ throw "Invalid RMT info block";
+ }
}
- /// Returns author's name.
- /// A nickname may be included in parentheses after the real name.
- /// Multiple authors are separated with `" & "`.
- /// An empty string means the author is unknown.
- public string GetAuthor() => Author;
-
- /// Sets author's name.
- /// A nickname may be included in parentheses after the real name.
- /// Multiple authors are separated with `" & "`.
- /// An empty string means the author is unknown.
- public void SetAuthor!(
- /// New author's name for the current music.
- string value)
- throws
+ void AddSong!(int playerCalls)
{
- CheckValidText(value);
- Author = value;
+ long scanlines = playerCalls * Fastplay;
+ Durations[Songs++] = scanlines * (114000 / 3) / (1773447 / 3);
}
- /// Returns music title.
- /// An empty string means the title is unknown.
- public string GetTitle() => Title;
+ // TODO: enum + 0
+ const int SeenThisCall = 1;
+ const int SeenBefore = 2;
+ const int SeenRepeat = 3;
- /// Sets music title.
- /// An empty string means the title is unknown.
- public void SetTitle!(
- /// New title for the current music.
- string value)
- throws
+ void ParseCmcSong!(byte[] module, int pos)
{
- CheckValidText(value);
- Title = value;
+ int tempo = module[0x19];
+ int playerCalls = 0;
+ int repStartPos = 0;
+ int repEndPos = 0;
+ int repTimes = 0;
+ byte[0x55] seen = 0;
+ while (pos >= 0 && pos < 0x55) {
+ if (pos == repEndPos && repTimes > 0) {
+ for (int i = 0; i < 0x55; i++)
+ if (seen[i] == SeenThisCall || seen[i] == SeenRepeat)
+ seen[i] = 0;
+ repTimes--;
+ pos = repStartPos;
+ }
+ if (seen[pos] != 0) {
+ if (seen[pos] != SeenThisCall)
+ Loops[Songs] = true;
+ break;
+ }
+ seen[pos] = SeenThisCall;
+ int p1 = module[0x206 + pos];
+ int p2 = module[0x25b + pos];
+ int p3 = module[0x2b0 + pos];
+ if (p1 == 0xfe || p2 == 0xfe || p3 == 0xfe) {
+ pos++;
+ continue;
+ }
+ p1 |= Type == ASAPModuleType.Cms ? 7 : 0xf;
+ switch (p1) {
+ case 0x87: // CMS VOLUME
+ case 0xa7: // CMS MODE
+ pos++;
+ break;
+ case 0x8f: // STOP
+ pos = -1;
+ break;
+ case 0x97: // CMS PAUSE
+ if (p2 < 128) {
+ playerCalls += p2;
+ if (p3 < 128)
+ playerCalls += p3 * 50;
+ }
+ pos++;
+ break;
+ case 0x9f: // JUMP
+ pos = p2;
+ break;
+ case 0xaf: // UP
+ pos -= p2;
+ break;
+ case 0xbf: // DOWN
+ pos += p2;
+ break;
+ case 0xcf: // TEMPO
+ if (p2 < 128) {
+ tempo = p2;
+ pos++;
+ }
+ else
+ pos = -1;
+ break;
+ case 0xdf: // REPLAY
+ pos++;
+ repStartPos = pos;
+ repEndPos = pos + p2;
+ repTimes = p3 - 1;
+ break;
+ case 0xef: // BREAK
+ Loops[Songs] = true;
+ pos = -1;
+ break;
+ default:
+ p2 = repTimes > 0 ? SeenRepeat : SeenBefore;
+ for (p1 = 0; p1 < 0x55; p1++)
+ if (seen[p1] == SeenThisCall)
+ seen[p1] = p2;
+ playerCalls += tempo * (Type == ASAPModuleType.Cm3 ? 48 : 64);
+ pos++;
+ break;
+ }
+ }
+ AddSong(playerCalls);
}
- /// Returns music title or filename.
- /// If title is unknown returns filename without the path or extension.
- public string GetTitleOrFilename() => Title.Length > 0 ? Title : Filename;
-
- /// Returns music creation date.
- /// Some of the possible formats are:
- /// * YYYY
- /// * MM/YYYY
- /// * DD/MM/YYYY
- /// * YYYY-YYYY
- ///
- /// An empty string means the date is unknown.
- public string GetDate() => Date;
+ const int CmrBassTableOffset = 0x70f;
- /// Sets music creation date.
- /// Some of the possible formats are:
- /// * YYYY
- /// * MM/YYYY
- /// * DD/MM/YYYY
- /// * YYYY-YYYY
- ///
- /// An empty string means the date is unknown.
- public void SetDate!(
- /// New music creation date.
- string value)
+ void ParseCmc!(byte[] module, int moduleLen, ASAPModuleType type)
throws
{
- CheckValidText(value);
- Date = value;
+ if (moduleLen < 0x306)
+ throw "Module too short";
+ Type = type;
+ ParseModule(module, moduleLen);
+ int lastPos = 0x54;
+ while (--lastPos >= 0) {
+ if (module[0x206 + lastPos] < 0xb0
+ || module[0x25b + lastPos] < 0x40
+ || module[0x2b0 + lastPos] < 0x40)
+ break;
+ if (Channels == 2) {
+ if (module[0x306 + lastPos] < 0xb0
+ || module[0x35b + lastPos] < 0x40
+ || module[0x3b0 + lastPos] < 0x40)
+ break;
+ }
+ }
+ Songs = 0;
+ ParseCmcSong(module, 0);
+ for (int pos = 0; pos < lastPos && Songs < MaxSongs; pos++)
+ if (module[0x206 + pos] == 0x8f || module[0x206 + pos] == 0xef)
+ ParseCmcSong(module, pos + 1);
}
- bool CheckTwoDateDigits(int i)
+ static bool IsDltTrackEmpty(byte[] module, int pos)
{
- int d1 = Date[i];
- int d2 = Date[i + 1];
- return d1 >= '0' && d1 <= '9' && d2 >= '0' && d2 <= '9';
+ return module[0x2006 + pos] >= 0x43
+ && module[0x2106 + pos] >= 0x40
+ && module[0x2206 + pos] >= 0x40
+ && module[0x2306 + pos] >= 0x40;
}
- int CheckDate()
+ static bool IsDltPatternEnd(byte[] module, int pos, int i)
{
- int n = Date.Length;
- switch (n) {
- case 10:
- if (!CheckTwoDateDigits(0) || Date[2] != '/')
- return -1;
- goto case 7;
- case 7:
- if (!CheckTwoDateDigits(n - 7) || Date[n - 5] != '/')
- return -1;
- goto case 4;
- case 4:
- if (!CheckTwoDateDigits(n - 4) || !CheckTwoDateDigits(n - 2))
- return -1;
- return n;
- default:
- return -1;
+ for (int ch = 0; ch < 4; ch++) {
+ int pattern = module[0x2006 + (ch << 8) + pos];
+ if (pattern < 64) {
+ int offset = 6 + (pattern << 7) + (i << 1);
+ if ((module[offset] & 0x80) == 0 && (module[offset + 1] & 0x80) != 0)
+ return true;
+ }
}
+ return false;
}
- int GetTwoDateDigits(int i) => (Date[i] - '0') * 10 + Date[i + 1] - '0';
+ void ParseDltSong!(byte[] module, bool[]! seen, int pos)
+ {
+ while (pos < 128 && !seen[pos] && IsDltTrackEmpty(module, pos))
+ seen[pos++] = true;
+ SongPos[Songs] = pos;
+ int playerCalls = 0;
+ bool loop = false;
+ int tempo = 6;
+ while (pos < 128) {
+ if (seen[pos]) {
+ loop = true;
+ break;
+ }
+ seen[pos] = true;
+ int p1 = module[0x2006 + pos];
+ if (p1 == 0x40 || IsDltTrackEmpty(module, pos))
+ break;
+ if (p1 == 0x41)
+ pos = module[0x2086 + pos];
+ else if (p1 == 0x42)
+ tempo = module[0x2086 + pos++];
+ else {
+ for (int i = 0; i < 64 && !IsDltPatternEnd(module, pos, i); i++)
+ playerCalls += tempo;
+ pos++;
+ }
+ }
+ if (playerCalls > 0) {
+ Loops[Songs] = loop;
+ AddSong(playerCalls);
+ }
+ }
- /// Returns music creation year.
- /// -1 means the year is unknown.
- public int GetYear()
- {
- int n = CheckDate();
- if (n < 0)
- return -1;
- return GetTwoDateDigits(n - 4) * 100 + GetTwoDateDigits(n - 2);
- }
-
- /// Returns music creation month (1-12).
- /// -1 means the month is unknown.
- public int GetMonth()
- {
- int n = CheckDate();
- if (n < 7)
- return -1;
- return GetTwoDateDigits(n - 7);
- }
-
- /// Returns day of month of the music creation date.
- /// -1 means the day is unknown.
- public int GetDayOfMonth()
- {
- int n = CheckDate();
- if (n != 10)
- return -1;
- return GetTwoDateDigits(0);
- }
-
- /// Returns 1 for mono or 2 for stereo.
- public int GetChannels() => Channels;
-
- /// Returns number of songs in the file.
- public int GetSongs() => Songs;
-
- /// Returns 0-based index of the "main" song.
- /// The specified song should be played by default.
- public int GetDefaultSong() => DefaultSong;
-
- /// Sets the 0-based index of the "main" song.
- public void SetDefaultSong!(
- /// New default song.
- int song)
- throws
- {
- if (song < 0 || song >= Songs)
- throw "Song out of range";
- DefaultSong = song;
- }
-
- /// Returns length of the specified song.
- /// The length is specified in milliseconds. -1 means the length is indeterminate.
- public int GetDuration(
- /// Song to get length of, 0-based.
- int song)
- => Durations[song];
-
- /// Sets length of the specified song.
- /// The length is specified in milliseconds. -1 means the length is indeterminate.
- public void SetDuration!(
- /// Song to set length of, 0-based.
- int song,
- /// New length in milliseconds.
- int duration)
- throws
- {
- if (song < 0 || song >= Songs)
- throw "Song out of range";
- Durations[song] = duration;
- }
-
- /// Returns information whether the specified song loops.
- /// Returns:
- /// * `true` if the song loops
- /// * `false` if the song stops
- public bool GetLoop(
- /// Song to check for looping, 0-based.
- int song)
- => Loops[song];
-
- /// Sets information whether the specified song loops.
- /// Use:
- /// * `true` if the song loops
- /// * `false` if the song stops
- public void SetLoop!(
- /// Song to set as looping, 0-based.
- int song,
- /// `true` if the song loops.
- bool loop)
- throws
- {
- if (song < 0 || song >= Songs)
- throw "Song out of range";
- Loops[song] = loop;
- }
-
- /// Returns `true` for NTSC song and `false` for PAL song.
- public bool IsNtsc() => Ntsc;
-
- /// Returns the letter argument for the TYPE SAP tag.
- /// Returns zero for non-SAP files.
- public int GetTypeLetter()
- {
- switch (Type) {
- case ASAPModuleType.SapB: return 'B';
- case ASAPModuleType.SapC: return 'C';
- case ASAPModuleType.SapD: return 'D';
- case ASAPModuleType.SapS: return 'S';
- default: return 0;
- }
- }
-
- /// Returns player routine rate in Atari scanlines.
- public int GetPlayerRateScanlines() => Fastplay;
-
- /// Returns approximate player routine rate in Hz.
- public int GetPlayerRateHz()
- {
- int scanlineClock = Ntsc ? 1789772 / 114 : 1773447 / 114;
- return (scanlineClock + (Fastplay >> 1)) / Fastplay;
- }
-
- /// Returns the address of the module.
- /// Returns -1 if unknown.
- public int GetMusicAddress() => Music;
-
- /// Causes music to be relocated.
- /// Use only with `ASAPWriter.Write`.
- public void SetMusicAddress!(
- /// New music address.
- int address)
- throws
- {
- if (address < 0 || address >= 0xffff)
- throw "Invalid music address";
- Music = address;
- }
-
- /// Returns the address of the player initialization routine.
- /// Returns -1 if no initialization routine.
- public int GetInitAddress() => Init;
-
- /// Returns the address of the player routine.
- public int GetPlayerAddress() => Player;
-
- /// Returns the address of the COVOX chip.
- /// Returns -1 if no COVOX enabled.
- public int GetCovoxAddress() => CovoxAddr;
-
- /// Retturns the length of the SAP header in bytes.
- public int GetSapHeaderLength() => HeaderLen;
-
- /// Returns the offset of instrument names for RMT module.
- /// Returns -1 if not an RMT module or RMT module without instrument names.
- public int GetInstrumentNamesOffset(
- /// Content of the RMT file.
- byte[] module,
- /// Length of the RMT file.
- int moduleLen)
- {
- if (Type != ASAPModuleType.Rmt)
- return -1;
- for (int offset = GetWord(module, 4) - GetWord(module, 2) + 12; offset < moduleLen; offset++) {
- if (module[offset - 1] == 0)
- return offset;
- }
- return -1;
- }
-
- internal static int GetWord(byte[] array, int i) => array[i] + (array[i + 1] << 8);
-
- void ParseModule!(byte[] module, int moduleLen)
- throws
- {
- if ((module[0] != 0xff || module[1] != 0xff)
- && (module[0] != 0 || module[1] != 0)) // some CMC and clones start with zeros
- throw "Invalid two leading bytes of the module";
- Music = GetWord(module, 2);
- int musicLastByte = GetWord(module, 4);
- if (Music <= 0xd7ff && musicLastByte >= 0xd000)
- throw "Module address conflicts with hardware registers";
- int blockLen = musicLastByte + 1 - Music;
- if (6 + blockLen != moduleLen) {
- if (Type != ASAPModuleType.Rmt || 11 + blockLen > moduleLen)
- throw "Module length doesn't match headers";
- // allow optional info for Raster Music Tracker
- int infoAddr = GetWord(module, 6 + blockLen);
- if (infoAddr != Music + blockLen)
- throw "Invalid address of RMT info";
- int infoLen = GetWord(module, 8 + blockLen) + 1 - infoAddr;
- if (10 + blockLen + infoLen != moduleLen)
- throw "Invalid RMT info block";
- }
- }
-
- void AddSong!(int playerCalls)
- {
- long scanlines = playerCalls * Fastplay;
- Durations[Songs++] = scanlines * (114000 / 3) / (1773447 / 3);
- }
-
- // TODO: enum + 0
- const int SeenThisCall = 1;
- const int SeenBefore = 2;
- const int SeenRepeat = 3;
-
- void ParseCmcSong!(byte[] module, int pos)
- {
- int tempo = module[0x19];
- int playerCalls = 0;
- int repStartPos = 0;
- int repEndPos = 0;
- int repTimes = 0;
- byte[0x55] seen = 0;
- while (pos >= 0 && pos < 0x55) {
- if (pos == repEndPos && repTimes > 0) {
- for (int i = 0; i < 0x55; i++)
- if (seen[i] == SeenThisCall || seen[i] == SeenRepeat)
- seen[i] = 0;
- repTimes--;
- pos = repStartPos;
- }
- if (seen[pos] != 0) {
- if (seen[pos] != SeenThisCall)
- Loops[Songs] = true;
- break;
- }
- seen[pos] = SeenThisCall;
- int p1 = module[0x206 + pos];
- int p2 = module[0x25b + pos];
- int p3 = module[0x2b0 + pos];
- if (p1 == 0xfe || p2 == 0xfe || p3 == 0xfe) {
- pos++;
- continue;
- }
- p1 |= Type == ASAPModuleType.Cms ? 7 : 0xf;
- switch (p1) {
- case 0x87: // CMS VOLUME
- case 0xa7: // CMS MODE
- pos++;
- break;
- case 0x8f: // STOP
- pos = -1;
- break;
- case 0x97: // CMS PAUSE
- if (p2 < 128) {
- playerCalls += p2;
- if (p3 < 128)
- playerCalls += p3 * 50;
- }
- pos++;
- break;
- case 0x9f: // JUMP
- pos = p2;
- break;
- case 0xaf: // UP
- pos -= p2;
- break;
- case 0xbf: // DOWN
- pos += p2;
- break;
- case 0xcf: // TEMPO
- if (p2 < 128) {
- tempo = p2;
- pos++;
- }
- else
- pos = -1;
- break;
- case 0xdf: // REPLAY
- pos++;
- repStartPos = pos;
- repEndPos = pos + p2;
- repTimes = p3 - 1;
- break;
- case 0xef: // BREAK
- Loops[Songs] = true;
- pos = -1;
- break;
- default:
- p2 = repTimes > 0 ? SeenRepeat : SeenBefore;
- for (p1 = 0; p1 < 0x55; p1++)
- if (seen[p1] == SeenThisCall)
- seen[p1] = p2;
- playerCalls += tempo * (Type == ASAPModuleType.Cm3 ? 48 : 64);
- pos++;
- break;
- }
- }
- AddSong(playerCalls);
- }
-
- const int CmrBassTableOffset = 0x70f;
-
- void ParseCmc!(byte[] module, int moduleLen, ASAPModuleType type)
- throws
- {
- if (moduleLen < 0x306)
- throw "Module too short";
- Type = type;
- ParseModule(module, moduleLen);
- int lastPos = 0x54;
- while (--lastPos >= 0) {
- if (module[0x206 + lastPos] < 0xb0
- || module[0x25b + lastPos] < 0x40
- || module[0x2b0 + lastPos] < 0x40)
- break;
- if (Channels == 2) {
- if (module[0x306 + lastPos] < 0xb0
- || module[0x35b + lastPos] < 0x40
- || module[0x3b0 + lastPos] < 0x40)
- break;
- }
- }
- Songs = 0;
- ParseCmcSong(module, 0);
- for (int pos = 0; pos < lastPos && Songs < MaxSongs; pos++)
- if (module[0x206 + pos] == 0x8f || module[0x206 + pos] == 0xef)
- ParseCmcSong(module, pos + 1);
- }
-
- static bool IsDltTrackEmpty(byte[] module, int pos)
- {
- return module[0x2006 + pos] >= 0x43
- && module[0x2106 + pos] >= 0x40
- && module[0x2206 + pos] >= 0x40
- && module[0x2306 + pos] >= 0x40;
- }
-
- static bool IsDltPatternEnd(byte[] module, int pos, int i)
- {
- for (int ch = 0; ch < 4; ch++) {
- int pattern = module[0x2006 + (ch << 8) + pos];
- if (pattern < 64) {
- int offset = 6 + (pattern << 7) + (i << 1);
- if ((module[offset] & 0x80) == 0 && (module[offset + 1] & 0x80) != 0)
- return true;
- }
- }
- return false;
- }
-
- void ParseDltSong!(byte[] module, bool[]! seen, int pos)
- {
- while (pos < 128 && !seen[pos] && IsDltTrackEmpty(module, pos))
- seen[pos++] = true;
- SongPos[Songs] = pos;
- int playerCalls = 0;
- bool loop = false;
- int tempo = 6;
- while (pos < 128) {
- if (seen[pos]) {
- loop = true;
- break;
- }
- seen[pos] = true;
- int p1 = module[0x2006 + pos];
- if (p1 == 0x40 || IsDltTrackEmpty(module, pos))
- break;
- if (p1 == 0x41)
- pos = module[0x2086 + pos];
- else if (p1 == 0x42)
- tempo = module[0x2086 + pos++];
- else {
- for (int i = 0; i < 64 && !IsDltPatternEnd(module, pos, i); i++)
- playerCalls += tempo;
- pos++;
- }
- }
- if (playerCalls > 0) {
- Loops[Songs] = loop;
- AddSong(playerCalls);
- }
- }
-
- void ParseDlt!(byte[] module, int moduleLen)
- throws
+ void ParseDlt!(byte[] module, int moduleLen)
+ throws
{
if (moduleLen != 0x2c06 && moduleLen != 0x2c07)
throw "Invalid module length";
@@ -713,7 +440,9 @@
seen[i] = SeenBefore;
for (int patternRows = module[0x1ce]; --patternRows >= 0; ) {
for (ch = 3; ch >= 0; ch--) {
- if (patternOffset[ch] == 0 || --blankRowsCounter[ch] >= 0)
+ if (patternOffset[ch] == 0)
+ continue;
+ if (--blankRowsCounter[ch] >= 0)
continue;
for (;;) {
i = module[patternOffset[ch]++];
@@ -987,6 +716,7 @@
Player = 0x600;
if (Songs == 0)
throw "No songs found";
+#if !OPENCL
byte[MaxTextLength] title;
int titleLen;
for (titleLen = 0; titleLen < MaxTextLength && 10 + blockLen + titleLen < moduleLen; titleLen++) {
@@ -997,6 +727,7 @@
title[titleLen] = IsValidChar(c) ? c : ' ';
}
Title = Encoding.UTF8.GetString(title, 0, titleLen);
+#endif
}
void ParseTmcSong!(byte[] module, int pos)
@@ -1056,6 +787,7 @@
AddSong(frames);
}
+#if !OPENCL
static int ParseTmcTitle(byte[]! title, int titleLen, byte[] module, int moduleOffset)
{
int lastOffset = moduleOffset + 29;
@@ -1098,6 +830,7 @@
}
return titleLen;
}
+#endif
void ParseTmc!(byte[] module, int moduleLen)
throws
@@ -1132,9 +865,11 @@
if (i < 1 || i > 4)
throw "Unsupported player call rate";
Fastplay = 312 / i;
+#if !OPENCL
byte[MaxTextLength] title;
int titleLen = ParseTmcTitle(title, 0, module, 6);
Title = Encoding.UTF8.GetString(title, 0, titleLen);
+#endif
}
void ParseTm2Song!(byte[] module, int pos)
@@ -1161,609 +896,920 @@
for (int ch = 7; ch >= 0; ch--) {
if (--blankRows[ch] >= 0)
continue;
- for (;;) {
- int i = module[patternOffset[ch]++];
- if (i == 0) {
- patternOffset[ch]++;
- break;
- }
- if (i < 0x40) {
- if (module[patternOffset[ch]++] >= 0x80)
- patternOffset[ch]++;
- break;
- }
- if (i < 0x80) {
- patternOffset[ch]++;
- break;
- }
- if (i == 0x80) {
- blankRows[ch] = module[patternOffset[ch]++];
- break;
- }
- if (i < 0xc0)
- break;
- if (i < 0xd0) {
- tempo = i - 0xbf;
- continue;
- }
- if (i < 0xe0) {
- patternOffset[ch]++;
- break;
+ for (;;) {
+ int i = module[patternOffset[ch]++];
+ if (i == 0) {
+ patternOffset[ch]++;
+ break;
+ }
+ if (i < 0x40) {
+ if (module[patternOffset[ch]++] >= 0x80)
+ patternOffset[ch]++;
+ break;
+ }
+ if (i < 0x80) {
+ patternOffset[ch]++;
+ break;
+ }
+ if (i == 0x80) {
+ blankRows[ch] = module[patternOffset[ch]++];
+ break;
+ }
+ if (i < 0xc0)
+ break;
+ if (i < 0xd0) {
+ tempo = i - 0xbf;
+ continue;
+ }
+ if (i < 0xe0) {
+ patternOffset[ch]++;
+ break;
+ }
+ if (i < 0xf0) {
+ patternOffset[ch] += 2;
+ break;
+ }
+ if (i < 0xff) {
+ blankRows[ch] = i - 0xf0;
+ break;
+ }
+ blankRows[ch] = 64;
+ break;
+ }
+ }
+ playerCalls += tempo;
+ }
+ pos += 17;
+ }
+ AddSong(playerCalls);
+ }
+
+ void ParseTm2!(byte[] module, int moduleLen)
+ throws
+ {
+ if (moduleLen < 0x3a4)
+ throw "Module too short";
+ Type = ASAPModuleType.Tm2;
+ ParseModule(module, moduleLen);
+ int i = module[0x25];
+ if (i < 1 || i > 4)
+ throw "Unsupported player call rate";
+ Fastplay = 312 / i;
+ Player = 0x800;
+ if (module[0x1f] != 0)
+ Channels = 2;
+ int lastPos = 0xffff;
+ for (i = 0; i < 0x80; i++) {
+ int instrAddr = module[0x86 + i] + (module[0x306 + i] << 8);
+ if (instrAddr != 0 && instrAddr < lastPos)
+ lastPos = instrAddr;
+ }
+ for (i = 0; i < 0x100; i++) {
+ int patternAddr = module[0x106 + i] + (module[0x206 + i] << 8);
+ if (patternAddr != 0 && patternAddr < lastPos)
+ lastPos = patternAddr;
+ }
+ lastPos -= GetWord(module, 2) + 0x380;
+ if (0x386 + lastPos >= moduleLen)
+ throw "Module too short";
+ // skip trailing stop/jump commands
+ int c;
+ do {
+ if (lastPos <= 0)
+ throw "No songs found";
+ lastPos -= 17;
+ c = module[0x386 + 16 + lastPos];
+ } while (c == 0 || c >= 0x80);
+ Songs = 0;
+ ParseTm2Song(module, 0);
+ for (i = 0; i < lastPos && Songs < MaxSongs; i += 17) {
+ c = module[0x386 + 16 + i];
+ if (c == 0 || c >= 0x80)
+ ParseTm2Song(module, i + 17);
+ }
+#if !OPENCL
+ byte[MaxTextLength] title;
+ int titleLen = ParseTmcTitle(title, 0, module, 0x27);
+ titleLen = ParseTmcTitle(title, titleLen, module, 0x47);
+ titleLen = ParseTmcTitle(title, titleLen, module, 0x67);
+ Title = Encoding.UTF8.GetString(title, 0, titleLen);
+#endif
+ }
+
+ static int AfterFF(byte[] module, int moduleLen, int currentOffset)
+ throws
+ {
+ while (currentOffset < moduleLen) {
+ if (module[currentOffset++] == 0xff)
+ return currentOffset;
+ }
+ throw "Module too short";
+ }
+
+ static int GetFcTrackCommand(byte[] module, int[] trackPos, int n)
+ => module[3 + (n << 8) + trackPos[n]];
+
+ static bool IsFcSongEnd(byte[] module, int[] trackPos)
+ {
+ // stops when one channel (or more) has STOP command or each channel has LOOP command
+ bool allLoop = true;
+ for (int n = 0; n < 3; n++) {
+ if (trackPos[n] >= 0x100)
+ return true;
+ switch (GetFcTrackCommand(module, trackPos, n)) {
+ case 0xfe: // STOP
+ return true;
+ case 0xff: // LOOP
+ break;
+ default:
+ allLoop = false;
+ break;
+ }
+ }
+ return allLoop;
+ }
+
+ static bool ValidateFc(byte[] module, int moduleLen)
+ {
+ if (moduleLen < 0x383)
+ return false;
+ if (module[0] != 0x26 || module[1] != 0x23)
+ return false;
+ return true;
+ }
+
+ void ParseFc!(byte[] module, int moduleLen)
+ throws
+ {
+ if (!ValidateFc(module, moduleLen))
+ throw "Invalid FC file";
+ Type = ASAPModuleType.Fc;
+
+ Player = 0x400;
+ Music = 0xa00;
+ Songs = 0;
+ HeaderLen = -1;
+
+ int[0x40] patternOffsets;
+ int currentOffset = 0x383;
+ // patterns
+ for (int i = 0; i < 0x40; i++) {
+ patternOffsets[i] = currentOffset;
+ currentOffset = AfterFF(module, moduleLen, currentOffset);
+ }
+ // envelopes
+ for (int i = 0; i < 0x20; i++)
+ currentOffset = AfterFF(module, moduleLen, currentOffset);
+
+ for (int pos = 0; pos < 0x100 && Songs < MaxSongs; ) {
+ int[3] trackPos;
+ for (int n = 0; n < 3; n++)
+ trackPos[n] = pos;
+ int[3] patternDelay = 0;
+ int[3] noteDuration = 0;
+ int[3] patternPos = 0;
+ int playerCalls = 0;
+ Loops[Songs] = true;
+
+ while (!IsFcSongEnd(module, trackPos)) {
+ for (int n = 0; n < 3; n++) {
+ if (GetFcTrackCommand(module, trackPos, n) == 0xff)
+ continue;
+ if (patternDelay[n]-- > 0)
+ continue;
+ while (trackPos[n] < 0x100) {
+ int trackCmd = GetFcTrackCommand(module, trackPos, n);
+ if (trackCmd < 0x40) {
+ int patternCmd = module[patternOffsets[trackCmd] + patternPos[n]++];
+ if (patternCmd < 0x40) {
+ patternDelay[n] = noteDuration[n];
+ break;
+ }
+ else if (patternCmd < 0x60)
+ noteDuration[n] = patternCmd - 0x40;
+ else if (patternCmd == 0xff) {
+ patternDelay[n] = 0;
+ noteDuration[n] = 0;
+ patternPos[n] = 0;
+ trackPos[n]++;
+ }
}
- if (i < 0xf0) {
- patternOffset[ch] += 2;
+ else if (trackCmd == 0x40)
+ trackPos[n] += 2;
+ else if (trackCmd == 0xfe) {
+ Loops[Songs] = false;
break;
}
- if (i < 0xff) {
- blankRows[ch] = i - 0xf0;
+ else if (trackCmd == 0xff)
break;
- }
- blankRows[ch] = 64;
- break;
+ else
+ trackPos[n]++;
}
}
- playerCalls += tempo;
+ if (IsFcSongEnd(module, trackPos))
+ break;
+ playerCalls += module[2];
}
- pos += 17;
+
+ pos = -1;
+ for (int n = 0; n < 3; n++) {
+ int nxtrkpos = trackPos[n];
+ if (patternPos[n] > 0)
+ nxtrkpos++;
+ if (pos < nxtrkpos)
+ pos = nxtrkpos;
+ }
+ pos++;
+ if (pos <= 0x100)
+ AddSong(playerCalls);
}
- AddSong(playerCalls);
}
- void ParseTm2!(byte[] module, int moduleLen)
+#if !OPENCL
+ static string() ParseText(byte[] module, int i, int argEnd)
+ {
+ if (i < 0 || argEnd - i < 2 || module[i] != '"' || module[argEnd - 1] != '"')
+ return ""; // silently ignore malformed AUTHOR/NAME/DATE
+ if (module[i + 1] == '<' && module[i + 2] == '?' && module[i + 3] == '>')
+ return "";
+ return Encoding.UTF8.GetString(module, i + 1, argEnd - i - 2);
+ }
+#endif
+
+ static bool HasStringAt(byte[] module, int moduleIndex, string s)
+ {
+ int n = s.Length;
+ for (int i = 0; i < n; i++)
+ if (module[moduleIndex + i] != s[i])
+ return false;
+ return true;
+ }
+
+ static int ParseDec(byte[] module, int i, int argEnd, int minVal, int maxVal)
throws
{
- if (moduleLen < 0x3a4)
- throw "Module too short";
- Type = ASAPModuleType.Tm2;
- ParseModule(module, moduleLen);
- int i = module[0x25];
- if (i < 1 || i > 4)
- throw "Unsupported player call rate";
- Fastplay = 312 / i;
- Player = 0x800;
- if (module[0x1f] != 0)
- Channels = 2;
- int lastPos = 0xffff;
- for (i = 0; i < 0x80; i++) {
- int instrAddr = module[0x86 + i] + (module[0x306 + i] << 8);
- if (instrAddr != 0 && instrAddr < lastPos)
- lastPos = instrAddr;
+ if (i < 0)
+ throw "Missing number";
+ int r = 0;
+ while (i < argEnd) {
+ int c = module[i++];
+ if (c < '0' || c > '9')
+ throw "Invalid number";
+ r = r * 10 + c - '0';
+ if (r > maxVal)
+ throw "Number too big";
}
- for (i = 0; i < 0x100; i++) {
- int patternAddr = module[0x106 + i] + (module[0x206 + i] << 8);
- if (patternAddr != 0 && patternAddr < lastPos)
- lastPos = patternAddr;
+ if (r < minVal)
+ throw "Number too small";
+ return r;
+ }
+
+ static int ParseHex(byte[] module, int i, int argEnd)
+ throws
+ {
+ if (i < 0)
+ throw "Missing number";
+ int r = 0;
+ while (i < argEnd) {
+ int c = module[i++];
+ if (r > 0xfff)
+ throw "Number too big";
+ r <<= 4;
+ if (c >= '0' && c <= '9')
+ r += c - '0';
+ else if (c >= 'A' && c <= 'F')
+ r += c - 'A' + 10;
+ else if (c >= 'a' && c <= 'f')
+ r += c - 'a' + 10;
+ else
+ throw "Invalid number";
}
- lastPos -= GetWord(module, 2) + 0x380;
- if (0x386 + lastPos >= moduleLen)
- throw "Module too short";
- // skip trailing stop/jump commands
- int c;
- do {
- if (lastPos <= 0)
- throw "No songs found";
- lastPos -= 17;
- c = module[0x386 + 16 + lastPos];
- } while (c == 0 || c >= 0x80);
- Songs = 0;
- ParseTm2Song(module, 0);
- for (i = 0; i < lastPos && Songs < MaxSongs; i += 17) {
- c = module[0x386 + 16 + i];
- if (c == 0 || c >= 0x80)
- ParseTm2Song(module, i + 17);
+ return r;
+ }
+
+ /// Returns the number of milliseconds represented by the given string.
+ public static int ParseDuration(
+ /// Time in the `"mm:ss.xxx"` format.
+ string s)
+ throws
+ {
+ DurationParser() parser;
+ return parser.Parse(s);
+ }
+
+ static bool ValidateSap(byte[] module, int moduleLen)
+ => moduleLen >= 30 && HasStringAt(module, 0, "SAP\r\n");
+
+ void ParseSap!(byte[] module, int moduleLen)
+ throws
+ {
+ if (!ValidateSap(module, moduleLen))
+ throw "Invalid SAP file";
+ Fastplay = -1;
+ int type = 0;
+ int moduleIndex = 5;
+ int durationIndex = 0;
+ while (module[moduleIndex] != 0xff) {
+ // find where the tag ends
+ int lineStart = moduleIndex;
+ while (module[moduleIndex] > ' ') {
+ if (++moduleIndex >= moduleLen)
+ throw "Invalid SAP file";
+ }
+ int tagLen = moduleIndex - lineStart;
+
+ // find where is the argument, if any
+ int argStart = -1;
+ int argEnd = -1;
+ for (;;) {
+ int c = module[moduleIndex];
+ if (c > ' ') {
+ CheckValidChar(c);
+ if (argStart < 0)
+ argStart = moduleIndex;
+ argEnd = -1;
+ }
+ else {
+ if (argEnd < 0)
+ argEnd = moduleIndex;
+ if (c == '\n')
+ break;
+ }
+ if (++moduleIndex >= moduleLen)
+ throw "Invalid SAP file";
+ }
+ if (++moduleIndex + 6 >= moduleLen)
+ throw "Invalid SAP file";
+
+ // handle tags, ignore unknown
+ switch (Encoding.UTF8.GetString(module, lineStart, tagLen)) {
+#if !OPENCL
+ case "AUTHOR":
+ Author = ParseText(module, argStart, argEnd);
+ break;
+ case "NAME":
+ Title = ParseText(module, argStart, argEnd);
+ break;
+ case "DATE":
+ Date = ParseText(module, argStart, argEnd);
+ break;
+ case "TIME":
+ if (durationIndex >= MaxSongs)
+ throw "Too many TIME tags";
+ if (argStart < 0)
+ throw "Missing TIME argument";
+ if (argEnd - argStart > 5 && HasStringAt(module, argEnd - 5, " LOOP")) {
+ Loops[durationIndex] = true;
+ argEnd -= 5;
+ }
+ {
+ string() arg = Encoding.UTF8.GetString(module, argStart, argEnd - argStart);
+ Durations[durationIndex++] = ParseDuration(arg);
+ }
+ break;
+#endif
+ case "SONGS":
+ Songs = ParseDec(module, argStart, argEnd, 1, MaxSongs);
+ break;
+ case "DEFSONG":
+ DefaultSong = ParseDec(module, argStart, argEnd, 0, MaxSongs - 1);
+ break;
+ case "TYPE":
+ if (argStart < 0)
+ throw "Missing TYPE argument";
+ type = module[argStart];
+ break;
+ case "FASTPLAY":
+ Fastplay = ParseDec(module, argStart, argEnd, 1, 32767);
+ break;
+ case "MUSIC":
+ Music = ParseHex(module, argStart, argEnd);
+ break;
+ case "INIT":
+ Init = ParseHex(module, argStart, argEnd);
+ break;
+ case "PLAYER":
+ Player = ParseHex(module, argStart, argEnd);
+ break;
+ case "COVOX":
+ CovoxAddr = ParseHex(module, argStart, argEnd);
+ if (CovoxAddr != 0xd600)
+ throw "COVOX should be D600";
+ Channels = 2;
+ break;
+ case "STEREO":
+ Channels = 2;
+ break;
+ case "NTSC":
+ Ntsc = true;
+ break;
+ default:
+ break;
+ }
+ }
+
+ if (DefaultSong >= Songs)
+ throw "DEFSONG too big";
+ switch (type) {
+ case 'B':
+ if (Player < 0)
+ throw "Missing PLAYER tag";
+ if (Init < 0)
+ throw "Missing INIT tag";
+ Type = ASAPModuleType.SapB;
+ break;
+ case 'C':
+ if (Player < 0)
+ throw "Missing PLAYER tag";
+ if (Music < 0)
+ throw "Missing MUSIC tag";
+ Type = ASAPModuleType.SapC;
+ break;
+ case 'D':
+ if (Init < 0)
+ throw "Missing INIT tag";
+ Type = ASAPModuleType.SapD;
+ break;
+ case 'S':
+ if (Init < 0)
+ throw "Missing INIT tag";
+ Type = ASAPModuleType.SapS;
+ if (Fastplay < 0)
+ Fastplay = 78;
+ break;
+ default:
+ throw "Unsupported TYPE";
}
- byte[MaxTextLength] title;
- int titleLen = ParseTmcTitle(title, 0, module, 0x27);
- titleLen = ParseTmcTitle(title, titleLen, module, 0x47);
- titleLen = ParseTmcTitle(title, titleLen, module, 0x67);
- Title = Encoding.UTF8.GetString(title, 0, titleLen);
+ if (Fastplay < 0)
+ Fastplay = Ntsc ? 262 : 312;
+ if (module[moduleIndex + 1] != 0xff)
+ throw "Invalid binary header";
+ HeaderLen = moduleIndex;
}
- static int AfterFF(byte[] module, int moduleLen, int currentOffset)
- throws
+ internal static int PackExt(string ext)
+ => ext.Length == 2 && ext[0] <= 'z' && ext[1] <= 'z' ? ext[0] | ext[1] << 8 | 0x202020
+ : ext.Length == 3 && ext[0] <= 'z' && ext[1] <= 'z' && ext[2] <= 'z' ? ext[0] | ext[1] << 8 | ext[2] << 16 | 0x202020
+ : 0;
+
+ internal static int GetPackedExt(string filename)
{
- while (currentOffset < moduleLen) {
- if (module[currentOffset++] == 0xff)
- return currentOffset;
+ int ext = 0;
+ for (int i = filename.Length; --i > 0; ) {
+ int c = filename[i];
+ if (c <= ' ' || c > 'z')
+ return 0;
+ if (c == '.')
+ return ext | 0x202020;
+ ext = (ext << 8) + c;
}
- throw "Module too short";
+ return 0;
}
- static int GetFcTrackCommand(byte[] module, int[] trackPos, int n)
- => module[3 + (n << 8) + trackPos[n]];
-
- static bool IsFcSongEnd(byte[] module, int[] trackPos)
+ static bool IsOurPackedExt(int ext)
{
- // stops when one channel (or more) has STOP command or each channel has LOOP command
- bool allLoop = true;
- for (int n = 0; n < 3; n++) {
- if (trackPos[n] >= 0x100)
- return true;
- switch (GetFcTrackCommand(module, trackPos, n)) {
- case 0xfe: // STOP
- return true;
- case 0xff: // LOOP
- break;
- default:
- allLoop = false;
- break;
- }
+ switch (ext) {
+ case PackExt("SAP"):
+#if !ASAP_ONLY_SAP
+ case PackExt("CMC"):
+ case PackExt("CM3"):
+ case PackExt("CMR"):
+ case PackExt("CMS"):
+ case PackExt("DMC"):
+ case PackExt("DLT"):
+ case PackExt("MPT"):
+ case PackExt("MPD"):
+ case PackExt("RMT"):
+ case PackExt("TMC"):
+ case PackExt("TM8"):
+ case PackExt("TM2"):
+ case PackExt("FC"):
+#if EXPERIMENTAL_XEX
+ case PackExt("XEX"):
+#endif
+#endif
+ return true;
+ default:
+ return false;
}
- return allLoop;
}
- static bool ValidateFc(byte[] module, int moduleLen)
+ /// Checks whether the filename represents a module type supported by ASAP.
+ /// Returns `true` if the filename is supported by ASAP.
+ public static bool IsOurFile(
+ /// Filename to check the extension of.
+ string filename)
+ => IsOurPackedExt(GetPackedExt(filename));
+
+ /// Checks whether the filename extension represents a module type supported by ASAP.
+ /// Returns `true` if the filename extension is supported by ASAP.
+ public static bool IsOurExt(
+ /// Filename extension without the leading dot.
+ string ext)
+ => IsOurPackedExt(PackExt(ext));
+
+ static int GuessPackedExt(byte[] module, int moduleLen)
+ throws
{
- if (moduleLen < 0x383)
- return false;
- if (module[0] != 0x26 || module[1] != 0x23)
- return false;
- return true;
+ if (ValidateSap(module, moduleLen))
+ return PackExt("SAP");
+ if (ValidateFc(module, moduleLen))
+ return PackExt("FC");
+ if (ValidateRmt(module, moduleLen))
+ return PackExt("RMT");
+ throw "Unknown format";
}
- void ParseFc!(byte[] module, int moduleLen)
+ /// Loads file information.
+ public void Load!(
+ /// Filename, used to determine the format.
+ string filename,
+ /// Contents of the file.
+ byte[] module,
+ /// Length of the file.
+ int moduleLen)
throws
{
- if (!ValidateFc(module, moduleLen))
- throw "Invalid FC file";
- Type = ASAPModuleType.Fc;
-
- Player = 0x400;
- Music = 0xa00;
- Songs = 0;
- HeaderLen = -1;
-
- int[0x40] patternOffsets;
- int currentOffset = 0x383;
- // patterns
- for (int i = 0; i < 0x40; i++) {
- patternOffsets[i] = currentOffset;
- currentOffset = AfterFF(module, moduleLen, currentOffset);
- }
- // envelopes
- for (int i = 0; i < 0x20; i++)
- currentOffset = AfterFF(module, moduleLen, currentOffset);
-
- for (int pos = 0; pos < 0x100 && Songs < MaxSongs; ) {
- int[3] trackPos;
- for (int n = 0; n < 3; n++)
- trackPos[n] = pos;
- int[3] patternDelay = 0;
- int[3] noteDuration = 0;
- int[3] patternPos = 0;
- int playerCalls = 0;
- Loops[Songs] = true;
-
- while (!IsFcSongEnd(module, trackPos)) {
- for (int n = 0; n < 3; n++) {
- int trackCmd = GetFcTrackCommand(module, trackPos, n);
- if (trackCmd != 0xff && patternDelay[n]-- <= 0) { //"<" for junks in track
- while (trackPos[n] < 0x100) {
- trackCmd = GetFcTrackCommand(module, trackPos, n);
- if (trackCmd < 0x40) {
- int patternCmd = module[patternOffsets[trackCmd] + patternPos[n]++];
- if (patternCmd < 0x40) {
- patternDelay[n] = noteDuration[n];
- break;
- }
- else if (patternCmd < 0x60)
- noteDuration[n] = patternCmd - 0x40;
- else if (patternCmd == 0xff) {
- patternDelay[n] = 0;
- noteDuration[n] = 0;
- patternPos[n] = 0;
- trackPos[n]++;
- }
- }
- else if (trackCmd == 0x40)
- trackPos[n] += 2;
- else if (trackCmd == 0xfe) {
- Loops[Songs] = false;
- break;
- }
- else if (trackCmd == 0xff)
- break;
- else
- trackPos[n]++;
- }
- }
- }
- if (IsFcSongEnd(module, trackPos))
+ int ext;
+ if (filename != null) {
+ int len = filename.Length;
+ int basename = 0;
+ ext = -1;
+ for (int i = len; --i >= 0; ) {
+ int c = filename[i];
+ if (c == '/' || c == '\\') {
+ basename = i + 1;
break;
- playerCalls += module[2];
+ }
+ if (c == '.')
+ ext = i;
}
+ if (ext < 0)
+ throw "Filename has no extension";
+ ext -= basename;
+ if (ext > MaxTextLength)
+ ext = MaxTextLength;
+#if !OPENCL
+ Filename = filename.Substring(basename, ext);
+#endif
+ ext = GetPackedExt(filename);
+ }
+ else {
+#if !OPENCL
+ Filename = "";
+#endif
+ ext = GuessPackedExt(module, moduleLen);
+ }
- pos = -1;
- for (int n = 0; n < 3; n++) {
- int nxtrkpos = trackPos[n];
- if (patternPos[n] > 0)
- nxtrkpos++;
- if (pos < nxtrkpos)
- pos = nxtrkpos;
- }
- pos++;
- if (pos <= 0x100)
- AddSong(playerCalls);
+#if !OPENCL
+ Author = "";
+ Title = "";
+ Date = "";
+#endif
+ Channels = 1;
+ Songs = 1;
+ DefaultSong = 0;
+ for (int i = 0; i < MaxSongs; i++) {
+ Durations[i] = -1;
+ Loops[i] = false;
+ }
+ Ntsc = false;
+ Fastplay = 312;
+ Music = -1;
+ Init = -1;
+ Player = -1;
+ CovoxAddr = -1;
+ HeaderLen = 0;
+ switch (ext) {
+ case PackExt("SAP"):
+ ParseSap(module, moduleLen);
+ return;
+#if !ASAP_ONLY_SAP
+ case PackExt("CMC"):
+ ParseCmc(module, moduleLen, ASAPModuleType.Cmc);
+ return;
+ case PackExt("CM3"):
+ ParseCmc(module, moduleLen, ASAPModuleType.Cm3);
+ return;
+ case PackExt("CMR"):
+ ParseCmc(module, moduleLen, ASAPModuleType.Cmr);
+ return;
+ case PackExt("CMS"):
+ Channels = 2;
+ ParseCmc(module, moduleLen, ASAPModuleType.Cms);
+ return;
+ case PackExt("DMC"):
+ Fastplay = 156;
+ ParseCmc(module, moduleLen, ASAPModuleType.Cmc);
+ return;
+ case PackExt("DLT"):
+ ParseDlt(module, moduleLen);
+ return;
+ case PackExt("MPT"):
+ ParseMpt(module, moduleLen);
+ return;
+ case PackExt("MPD"):
+ Fastplay = 156;
+ ParseMpt(module, moduleLen);
+ return;
+ case PackExt("RMT"):
+ ParseRmt(module, moduleLen);
+ return;
+ case PackExt("TMC"):
+ case PackExt("TM8"):
+ ParseTmc(module, moduleLen);
+ return;
+ case PackExt("TM2"):
+ ParseTm2(module, moduleLen);
+ return;
+ case PackExt("FC"):
+ ParseFc(module, moduleLen);
+ return;
+#if EXPERIMENTAL_XEX
+ case PackExt("XEX"):
+ if (moduleLen < 7 || module[0] != 0xff || module[1] != 0xff)
+ throw "Missing 0xff,0xff header";
+ Type = ASAPModuleType.Xex;
+ return;
+#endif
+#endif
+ default:
+ throw "Unknown filename extension";
}
}
- static bool HasStringAt(byte[] module, int moduleIndex, string s)
+#if !OPENCL
+
+ static void CheckValidText(string s)
+ throws
{
int n = s.Length;
+ if (n > MaxTextLength)
+ throw "Text too long";
for (int i = 0; i < n; i++)
- if (module[moduleIndex + i] != s[i])
- return false;
- return true;
+ CheckValidChar(s[i]);
}
- static int ParseDec(string s, int minVal, int maxVal)
+ /// Returns author's name.
+ /// A nickname may be included in parentheses after the real name.
+ /// Multiple authors are separated with `" & "`.
+ /// An empty string means the author is unknown.
+ public string GetAuthor() => Author;
+
+ /// Sets author's name.
+ /// A nickname may be included in parentheses after the real name.
+ /// Multiple authors are separated with `" & "`.
+ /// An empty string means the author is unknown.
+ public void SetAuthor!(
+ /// New author's name for the current music.
+ string value)
throws
{
- int r = 0;
- int len = s.Length;
- for (int i = 0; i < len; i++) {
- int c = s[i];
- if (c < '0' || c > '9')
- throw "Invalid number";
- r = r * 10 + c - '0';
- if (r > maxVal)
- throw "Number too big";
- }
- if (r < minVal)
- throw "Number too small";
- return r;
+ CheckValidText(value);
+ Author = value;
}
- static int ParseHex(string s)
+ /// Returns music title.
+ /// An empty string means the title is unknown.
+ public string GetTitle() => Title;
+
+ /// Sets music title.
+ /// An empty string means the title is unknown.
+ public void SetTitle!(
+ /// New title for the current music.
+ string value)
throws
{
- int r = 0;
- int len = s.Length;
- for (int i = 0; i < len; i++) {
- if (r > 0xfff)
- throw "Number too big";
- int c = s[i];
- r <<= 4;
- if (c >= '0' && c <= '9')
- r += c - '0';
- else if (c >= 'A' && c <= 'F')
- r += c - 'A' + 10;
- else if (c >= 'a' && c <= 'f')
- r += c - 'a' + 10;
- else
- throw "Invalid number";
- }
- return r;
+ CheckValidText(value);
+ Title = value;
}
- /// Returns the number of milliseconds represented by the given string.
- public static int ParseDuration(
- /// Time in the `"mm:ss.xxx"` format.
- string s)
+ /// Returns music title or filename.
+ /// If title is unknown returns filename without the path or extension.
+ public string GetTitleOrFilename() => Title.Length > 0 ? Title : Filename;
+
+ /// Returns music creation date.
+ /// Some of the possible formats are:
+ /// * YYYY
+ /// * MM/YYYY
+ /// * DD/MM/YYYY
+ /// * YYYY-YYYY
+ ///
+ /// An empty string means the date is unknown.
+ public string GetDate() => Date;
+
+ /// Sets music creation date.
+ /// Some of the possible formats are:
+ /// * YYYY
+ /// * MM/YYYY
+ /// * DD/MM/YYYY
+ /// * YYYY-YYYY
+ ///
+ /// An empty string means the date is unknown.
+ public void SetDate!(
+ /// New music creation date.
+ string value)
throws
{
- DurationParser() parser;
- return parser.Parse(s);
+ CheckValidText(value);
+ Date = value;
}
- static bool ValidateSap(byte[] module, int moduleLen)
- => moduleLen >= 30 && HasStringAt(module, 0, "SAP\r\n");
-
- void ParseSap!(byte[] module, int moduleLen)
- throws
+ int CheckDate()
{
- if (!ValidateSap(module, moduleLen))
- throw "Invalid SAP file";
- Fastplay = -1;
- int type = 0;
- int moduleIndex = 5;
- int durationIndex = 0;
- while (module[moduleIndex] != 0xff) {
- // find where the tag ends
- int lineStart = moduleIndex;
- while (module[moduleIndex] > ' ') {
- if (++moduleIndex >= moduleLen)
- throw "Invalid SAP file";
+ int n = Date.Length;
+ switch (n) {
+ case 4: // YYYY
+ case 7: // MM/YYYY
+ case 10: // DD/MM/YYYY
+ break;
+ default:
+ return -1;
+ }
+ for (int i = 0; i < n; i++) {
+ int c = Date[i];
+ if (i == n - 5 || i == n - 8) {
+ if (c != '/')
+ return -1;
}
- int tagLen = moduleIndex - lineStart;
+ else if (c < '0' || c > '9')
+ return -1;
+ }
+ return n;
+ }
- // find where is the argument, if any
- int argStart = -1;
- int argLen = -1;
- for (;;) {
- int c = module[moduleIndex];
- if (c > ' ') {
- CheckValidChar(c);
- if (argStart < 0)
- argStart = moduleIndex;
- argLen = -1;
- }
- else {
- if (argLen < 0)
- argLen = moduleIndex - argStart;
- if (c == '\n')
- break;
- }
- if (++moduleIndex >= moduleLen)
- throw "Invalid SAP file";
- }
- if (++moduleIndex + 6 >= moduleLen)
- throw "Invalid SAP file";
+ int GetTwoDateDigits(int i) => (Date[i] - '0') * 10 + Date[i + 1] - '0';
- // handle tags, ignore unknown
- const int maxTagLen = "FASTPLAY".Length;
- if (tagLen <= maxTagLen) {
- string() tag = Encoding.UTF8.GetString(module, lineStart, tagLen);
- if (argStart >= 0 && argLen <= MaxTextLength + 2) {
- string() arg = Encoding.UTF8.GetString(module, argStart, argLen);
- if (argLen >= 3 && arg[0] == '"' && arg[argLen - 1] == '"'
- && arg != "\"\"") {
- if (tag == "AUTHOR")
- Author = arg.Substring(1, argLen - 2);
- else if (tag == "NAME")
- Title = arg.Substring(1, argLen - 2);
- else if (tag == "DATE")
- Date = arg.Substring(1, argLen - 2);
- }
- else if (tag == "SONGS")
- Songs = ParseDec(arg, 1, MaxSongs);
- else if (tag == "DEFSONG")
- DefaultSong = ParseDec(arg, 0, MaxSongs - 1);
- else if (tag == "TIME") {
- if (durationIndex >= MaxSongs)
- throw "Too many TIME tags";
- if (argLen > 5 && HasStringAt(module, argStart + argLen - 5, " LOOP")) {
- Loops[durationIndex] = true;
- arg = arg.Substring(0, argLen - 5);
- }
- Durations[durationIndex++] = ParseDuration(arg);
- }
- else if (tag == "TYPE")
- type = arg[0];
- else if (tag == "FASTPLAY")
- Fastplay = ParseDec(arg, 1, 32767);
- else if (tag == "MUSIC")
- Music = ParseHex(arg);
- else if (tag == "INIT")
- Init = ParseHex(arg);
- else if (tag == "PLAYER")
- Player = ParseHex(arg);
- else if (tag == "COVOX") {
- CovoxAddr = ParseHex(arg);
- if (CovoxAddr != 0xd600)
- throw "COVOX should be D600";
- Channels = 2;
- }
- }
- else if (tag == "STEREO")
- Channels = 2;
- else if (tag == "NTSC")
- Ntsc = true;
- }
- }
+ /// Returns music creation year.
+ /// -1 means the year is unknown.
+ public int GetYear()
+ {
+ int n = CheckDate();
+ if (n < 0)
+ return -1;
+ return GetTwoDateDigits(n - 4) * 100 + GetTwoDateDigits(n - 2);
+ }
- if (DefaultSong >= Songs)
- throw "DEFSONG too big";
- switch (type) {
- case 'B':
- if (Player < 0)
- throw "Missing PLAYER tag";
- if (Init < 0)
- throw "Missing INIT tag";
- Type = ASAPModuleType.SapB;
- break;
- case 'C':
- if (Player < 0)
- throw "Missing PLAYER tag";
- if (Music < 0)
- throw "Missing MUSIC tag";
- Type = ASAPModuleType.SapC;
- break;
- case 'D':
- if (Init < 0)
- throw "Missing INIT tag";
- Type = ASAPModuleType.SapD;
- break;
- case 'S':
- if (Init < 0)
- throw "Missing INIT tag";
- Type = ASAPModuleType.SapS;
- if (Fastplay < 0)
- Fastplay = 78;
- break;
- default:
- throw "Unsupported TYPE";
- }
- if (Fastplay < 0)
- Fastplay = Ntsc ? 262 : 312;
- if (module[moduleIndex + 1] != 0xff)
- throw "Invalid binary header";
- HeaderLen = moduleIndex;
+ /// Returns music creation month (1-12).
+ /// -1 means the month is unknown.
+ public int GetMonth()
+ {
+ int n = CheckDate();
+ if (n < 7)
+ return -1;
+ return GetTwoDateDigits(n - 7);
+ }
+
+ /// Returns day of month of the music creation date.
+ /// -1 means the day is unknown.
+ public int GetDayOfMonth()
+ {
+ int n = CheckDate();
+ if (n != 10)
+ return -1;
+ return GetTwoDateDigits(0);
+ }
+
+#endif
+
+ /// Returns 1 for mono or 2 for stereo.
+ public int GetChannels() => Channels;
+
+ /// Returns number of songs in the file.
+ public int GetSongs() => Songs;
+
+ /// Returns 0-based index of the "main" song.
+ /// The specified song should be played by default.
+ public int GetDefaultSong() => DefaultSong;
+
+ /// Sets the 0-based index of the "main" song.
+ public void SetDefaultSong!(
+ /// New default song.
+ int song)
+ throws
+ {
+ if (song < 0 || song >= Songs)
+ throw "Song out of range";
+ DefaultSong = song;
+ }
+
+ /// Returns length of the specified song.
+ /// The length is specified in milliseconds. -1 means the length is indeterminate.
+ public int GetDuration(
+ /// Song to get length of, 0-based.
+ int song)
+ => Durations[song];
+
+ /// Sets length of the specified song.
+ /// The length is specified in milliseconds. -1 means the length is indeterminate.
+ public void SetDuration!(
+ /// Song to set length of, 0-based.
+ int song,
+ /// New length in milliseconds.
+ int duration)
+ throws
+ {
+ if (song < 0 || song >= Songs)
+ throw "Song out of range";
+ Durations[song] = duration;
}
- internal static int PackExt(string ext)
- => ext.Length == 2 && ext[0] <= 'z' && ext[1] <= 'z' ? ext[0] | ext[1] << 8 | 0x202020
- : ext.Length == 3 && ext[0] <= 'z' && ext[1] <= 'z' && ext[2] <= 'z' ? ext[0] | ext[1] << 8 | ext[2] << 16 | 0x202020
- : 0;
+ /// Returns information whether the specified song loops.
+ /// Returns:
+ /// * `true` if the song loops
+ /// * `false` if the song stops
+ public bool GetLoop(
+ /// Song to check for looping, 0-based.
+ int song)
+ => Loops[song];
- internal static int GetPackedExt(string filename)
+ /// Sets information whether the specified song loops.
+ /// Use:
+ /// * `true` if the song loops
+ /// * `false` if the song stops
+ public void SetLoop!(
+ /// Song to set as looping, 0-based.
+ int song,
+ /// `true` if the song loops.
+ bool loop)
+ throws
{
- int ext = 0;
- for (int i = filename.Length; --i > 0; ) {
- int c = filename[i];
- if (c <= ' ' || c > 'z')
- return 0;
- if (c == '.')
- return ext | 0x202020;
- ext = (ext << 8) + c;
- }
- return 0;
+ if (song < 0 || song >= Songs)
+ throw "Song out of range";
+ Loops[song] = loop;
}
- static bool IsOurPackedExt(int ext)
+ /// Returns `true` for NTSC song and `false` for PAL song.
+ public bool IsNtsc() => Ntsc;
+
+ /// Returns the letter argument for the TYPE SAP tag.
+ /// Returns zero for non-SAP files.
+ public int GetTypeLetter()
{
- switch (ext) {
- case PackExt("SAP"):
-#if !ASAP_ONLY_SAP
- case PackExt("CMC"):
- case PackExt("CM3"):
- case PackExt("CMR"):
- case PackExt("CMS"):
- case PackExt("DMC"):
- case PackExt("DLT"):
- case PackExt("MPT"):
- case PackExt("MPD"):
- case PackExt("RMT"):
- case PackExt("TMC"):
- case PackExt("TM8"):
- case PackExt("TM2"):
- case PackExt("FC"):
-#if EXPERIMENTAL_XEX
- case PackExt("XEX"):
-#endif
-#endif
- return true;
- default:
- return false;
+ switch (Type) {
+ case ASAPModuleType.SapB: return 'B';
+ case ASAPModuleType.SapC: return 'C';
+ case ASAPModuleType.SapD: return 'D';
+ case ASAPModuleType.SapS: return 'S';
+ default: return 0;
}
}
- /// Checks whether the filename represents a module type supported by ASAP.
- /// Returns `true` if the filename is supported by ASAP.
- public static bool IsOurFile(
- /// Filename to check the extension of.
- string filename)
- => IsOurPackedExt(GetPackedExt(filename));
+ /// Returns player routine rate in Atari scanlines.
+ public int GetPlayerRateScanlines() => Fastplay;
- /// Checks whether the filename extension represents a module type supported by ASAP.
- /// Returns `true` if the filename extension is supported by ASAP.
- public static bool IsOurExt(
- /// Filename extension without the leading dot.
- string ext)
- => IsOurPackedExt(PackExt(ext));
+ /// Returns approximate player routine rate in Hz.
+ public int GetPlayerRateHz()
+ {
+ int scanlineClock = Ntsc ? 1789772 / 114 : 1773447 / 114;
+ return (scanlineClock + (Fastplay >> 1)) / Fastplay;
+ }
- static int GuessPackedExt(byte[] module, int moduleLen)
+ /// Returns the address of the module.
+ /// Returns -1 if unknown.
+ public int GetMusicAddress() => Music;
+
+ /// Causes music to be relocated.
+ /// Use only with `ASAPWriter.Write`.
+ public void SetMusicAddress!(
+ /// New music address.
+ int address)
throws
{
- if (ValidateSap(module, moduleLen))
- return PackExt("SAP");
- if (ValidateFc(module, moduleLen))
- return PackExt("FC");
- if (ValidateRmt(module, moduleLen))
- return PackExt("RMT");
- throw "Unknown format";
+ if (address < 0 || address >= 0xffff)
+ throw "Invalid music address";
+ Music = address;
}
- /// Loads file information.
- public void Load!(
- /// Filename, used to determine the format.
- string filename,
- /// Contents of the file.
+ /// Returns the address of the player initialization routine.
+ /// Returns -1 if no initialization routine.
+ public int GetInitAddress() => Init;
+
+ /// Returns the address of the player routine.
+ public int GetPlayerAddress() => Player;
+
+ /// Returns the address of the COVOX chip.
+ /// Returns -1 if no COVOX enabled.
+ public int GetCovoxAddress() => CovoxAddr;
+
+ /// Returns the length of the SAP header in bytes.
+ public int GetSapHeaderLength() => HeaderLen;
+
+ /// Returns the offset of instrument names for RMT module.
+ /// Returns -1 if not an RMT module or RMT module without instrument names.
+ public int GetInstrumentNamesOffset(
+ /// Content of the RMT file.
byte[] module,
- /// Length of the file.
+ /// Length of the RMT file.
int moduleLen)
- throws
{
- int ext;
- if (filename != null) {
- int len = filename.Length;
- int basename = 0;
- ext = -1;
- for (int i = len; --i >= 0; ) {
- int c = filename[i];
- if (c == '/' || c == '\\') {
- basename = i + 1;
- break;
- }
- if (c == '.')
- ext = i;
- }
- if (ext < 0)
- throw "Filename has no extension";
- ext -= basename;
- if (ext > MaxTextLength)
- ext = MaxTextLength;
- Filename = filename.Substring(basename, ext);
- ext = GetPackedExt(filename);
- }
- else {
- Filename = "";
- ext = GuessPackedExt(module, moduleLen);
- }
-
- Author = "";
- Title = "";
- Date = "";
- Channels = 1;
- Songs = 1;
- DefaultSong = 0;
- for (int i = 0; i < MaxSongs; i++) {
- Durations[i] = -1;
- Loops[i] = false;
- }
- Ntsc = false;
- Fastplay = 312;
- Music = -1;
- Init = -1;
- Player = -1;
- CovoxAddr = -1;
- HeaderLen = 0;
- switch (ext) {
- case PackExt("SAP"):
- ParseSap(module, moduleLen);
- return;
-#if !ASAP_ONLY_SAP
- case PackExt("CMC"):
- ParseCmc(module, moduleLen, ASAPModuleType.Cmc);
- return;
- case PackExt("CM3"):
- ParseCmc(module, moduleLen, ASAPModuleType.Cm3);
- return;
- case PackExt("CMR"):
- ParseCmc(module, moduleLen, ASAPModuleType.Cmr);
- return;
- case PackExt("CMS"):
- Channels = 2;
- ParseCmc(module, moduleLen, ASAPModuleType.Cms);
- return;
- case PackExt("DMC"):
- Fastplay = 156;
- ParseCmc(module, moduleLen, ASAPModuleType.Cmc);
- return;
- case PackExt("DLT"):
- ParseDlt(module, moduleLen);
- return;
- case PackExt("MPT"):
- ParseMpt(module, moduleLen);
- return;
- case PackExt("MPD"):
- Fastplay = 156;
- ParseMpt(module, moduleLen);
- return;
- case PackExt("RMT"):
- ParseRmt(module, moduleLen);
- return;
- case PackExt("TMC"):
- case PackExt("TM8"):
- ParseTmc(module, moduleLen);
- return;
- case PackExt("TM2"):
- ParseTm2(module, moduleLen);
- return;
- case PackExt("FC"):
- ParseFc(module, moduleLen);
- return;
-#if EXPERIMENTAL_XEX
- case PackExt("XEX"):
- if (moduleLen < 7 || module[0] != 0xff || module[1] != 0xff)
- throw "Missing 0xff,0xff header";
- Type = ASAPModuleType.Xex;
- return;
-#endif
-#endif
- default:
- throw "Unknown filename extension";
+ if (Type != ASAPModuleType.Rmt)
+ return -1;
+ for (int offset = GetWord(module, 4) - GetWord(module, 2) + 12; offset < moduleLen; offset++) {
+ if (module[offset - 1] == 0)
+ return offset;
}
+ return -1;
}
#if !ASAP_ONLY_SAP
@@ -1780,7 +1826,7 @@
case PackExt("CM3"): return "CMC \"3/4\"";
case PackExt("CMR"): return "CMC \"Rzog\"";
case PackExt("CMS"): return "Stereo Double CMC";
- case PackExt("DMC"): return "DoublePlay CMC";
+ case PackExt("DMC"): return "CMC DoublePlay";
case PackExt("DLT"): return "Delta Music Composer";
case PackExt("MPT"): return "Music ProTracker";
case PackExt("MPD"): return "MPT DoublePlay";
diff -Nru kodi-audiodecoder-asap-20.2.0/lib/asap-code/asap.spec kodi-audiodecoder-asap-20.3.0/lib/asap-code/asap.spec
--- kodi-audiodecoder-asap-20.2.0/lib/asap-code/asap.spec 2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-asap-20.3.0/lib/asap-code/asap.spec 2013-05-31 22:59:22.000000000 +0000
@@ -1,5 +1,5 @@
Name: asap
-Version: 5.0.1
+Version: 5.2.0
Release: 1
Summary: Player of Atari 8-bit music
License: GPLv2+
@@ -22,17 +22,6 @@
%description devel
These are the files needed for compiling programs that use libasap.
-%package xmms
-Summary: ASAP plugin for XMMS
-Group: Applications/Multimedia
-Requires: xmms
-BuildRequires: xmms-devel
-
-%description xmms
-Provides playback of Atari 8-bit music in XMMS.
-Supports the following file formats:
-SAP, CMC, CM3, CMR, CMS, DMC, DLT, MPT, MPD, RMT, TMC, TM8, TM2, FC.
-
%package vlc
Summary: ASAP plugin for VLC
Group: Applications/Multimedia
@@ -43,17 +32,26 @@
Provides playback of Atari 8-bit music in VLC.
Supports the following file formats: SAP, RMT, FC.
+%package xmms2
+Summary: ASAP plugin for XMMS2
+Group: Applications/Multimedia
+Requires: xmms2
+BuildRequires: xmms2-devel
+
+%description xmms2
+Provides playback of Atari 8-bit music (SAP format) in XMMS2.
+
%global debug_package %{nil}
%prep
%setup -q
%build
-make asapconv libasap.a asap-xmms asap-vlc
+make asapconv libasap.a asap-vlc asap-xmms2
%install
rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install install-xmms install-vlc
+make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} libdir=%{_libdir} install install-vlc install-xmms2
%clean
rm -rf $RPM_BUILD_ROOT
@@ -67,15 +65,25 @@
%{_includedir}/asap.h
%{_libdir}/libasap.a
-%files xmms
-%defattr(-,root,root)
-%{_libdir}/xmms/Input/libasap-xmms.so
-
%files vlc
%defattr(-,root,root)
%{_libdir}/vlc/plugins/demux/libasap_plugin.so
+%files xmms2
+%defattr(-,root,root)
+%{_libdir}/xmms2/libxmms_asap.so
+
%changelog
+* Wed Dec 8 2021 Piotr Fusik ASAP is based on a development library, which you can easily embed in your program. It's not only a fully portable C library - it's better than that. Since ASAP is written in Ć, - it is also available as pure C++, Java, C# and JavaScript.
+ it is also available as pure C++, C#, Java, JavaScript, Python, Swift and OpenCL.Third-party projects using ASAP
The following projects already use ASAP:
@@ -59,5 +59,7 @@apt, not snap.
Then install the ASAP plugin: On Fedora, install VLC from RPM Fusion,
- then install the 64-bit ASAP plugin:
- XMMS
-XMMS is included in Fedora.
- Install the 64-bit ASAP plugin:
+ XMMS2
+On Ubuntu install XMMS2 with sudo apt install xmms2.
+ Then install the ASAP plugin:
On Fedora: sudo dnf install xmms2,
+ then
Command-line converter
For command-line conversions (e.g. to WAV or between SAP and the tracker formats) and editing the metadata, install asapconv:
-
-
- on Ubuntu 64-bit:
- on Fedora 64-bit:
- on Fedora 32-bit:
- on Ubuntu:
- on Fedora:
Run asapconv from the shell to see the syntax.
The -o/--output option selects the output format and is mandatory.
-
+
- Fixed "click" glitches. Depending on the music and the ASAP port, they were happening every dozen of seconds or not at all. +
- New XMMS2 plugin. Ubuntu and Fedora packages available. +
- Experimental OpenCL port running on a GPU. +
- Limited memory allocations on loading SAP files. +
- foobar2000: Minor stability fix for parallel conversions. +
-
+
- Control playback from the notification and the lock screen. +
- Voice assistant commands (such as "pause playback", "next song", "seek to one minute"). No voice search yet. +
- Display metadata and control playback via Bluetooth. +
- Pause playback on Bluetooth disconnected. +
- Requires Android 5.0+. +
-
+
- Android app includes the current state of the ASMA repo. +
- Fixed memory leaks in the BASS/AIMP plugin. +
- Unicode filenames in Windows Explorer. +
- Fixed "-ft" in chksap. +
- SAP filenames shown in TortoiseMerge. +
- Windows and macOS binaries are now signed. +
- Pure Python and Swift ASAP2WAVs. +
- JavaScript ASAP2WAV supports Node.js, drops support for DMDScript and JScript. +
- Android: search by author. diff -Nru kodi-audiodecoder-asap-20.2.0/lib/asap-code/www/sap-format.xml kodi-audiodecoder-asap-20.3.0/lib/asap-code/www/sap-format.xml --- kodi-audiodecoder-asap-20.2.0/lib/asap-code/www/sap-format.xml 2013-05-31 22:59:22.000000000 +0000 +++ kodi-audiodecoder-asap-20.3.0/lib/asap-code/www/sap-format.xml 2013-05-31 22:59:22.000000000 +0000 @@ -6,26 +6,26 @@
- Slight Atari Player (SAP) by Adam Bienias
- Another Slight Atari Player (ASAP) by Piotr Fusik (me) -
- Game_Music_Emu (GME) by Shay Green +
- Game_Music_Emu (GME) by Shay Green
- sapemu by Adrian Matoga -
- Altirra by Avery Lee +
- Altirra by Avery Lee
History
The SAP format was created in the 1990s by Adam Bienias and was intended to be a single format for playback of any Atari 8-bit music on a PC. - Adam Bienias has also created the first player for Windows and later published - its source code. Later, other players appeared.
+ Adam Bienias has also created the first SAP player for Windows and later published + its source code. Other players appeared later.At the time of writing, there are five independent players of the SAP format:
There are many players for different platforms based on either SAP, ASAP or GME. sapemu runs on an Atari XL/XE computer with 128 KB RAM. Windows-only Altirra is a full emulator of Atari computers.
Concept
-A SAP file contains the original data and code used to playback +
A SAP file contains the original data and code needed to playback the Atari music. SAP players actually run the program contained in the SAP file on an emulated or real (sapemu) 6502 processor. The program controls the POKEY chip, which generates the sound.
-Identical method is used with platforms other than Atari, +
Same method is used with platforms other than Atari, for example the SID format for the C64 music.
Important advantages of SAP over, let's say, MP3, are that SAP files are very small (about 5 KB on average) and play more accurately @@ -47,14 +47,13 @@
copy /b music.txt+music.bin music.sap
On macOS or Linux:
cat music.txt music.bin >music.sap+
Part One - Text Header
This part consists of tags, one tag per line. - Lines must be terminated by a CR/LF (0x0d, 0x0a) pair - (required by ASAP, other SAP players may be more forgiving). + Lines should be terminated by a CR/LF (0x0d, 0x0a) pair. A line consists of an uppercase tag name and an optional argument, which might be a string, a decimal integer, a hexadecimal integer or a single letter. - The argument should be separated from the tag name with a single space. - Extra whitespace is not allowed.
+ The argument should be separated from the tag name with a single space.Example header:
SAP AUTHOR "Jakub Husak" @@ -74,7 +73,7 @@ described below. Note that format identification in GStreamer requires the AUTHOR tag to be placed right after the "SAP" line.-The arguments to AUTHOR, NAME and DATE must be wrapped in doublequotes. - Allowed are characters identical in ASCII and ATASCII (ATari ASCII), + Allowed are characters which are identical in ASCII and ATASCII (ATari ASCII), that is: characters with ASCII codes from space to underscore plus all lowercase letters, plus the pipe character (`|`). There are no backquote, tilde nor curly brackets in ATASCII. @@ -120,7 +119,7 @@ DATE "23-26/07/2010" DATE "199?"
The last example means some unknown year in the 1990s.
+The last example represents some unknown year in the 1990s.
Number of subsongs in the file. If there is just one song in the file, it is recommended to omit this tag. ASAP currently limits the number of songs to 32. - The biggest known number of songs in a SAP file is 20.
+ The largest known number of songs in a SAP file is 20.Hexadecimal address of the player routine.
+Hexadecimal address of the player routine, + called with constant frequency (see FASTPLAY).
Song duration in minutes, seconds and milliseconds. - In files with subsongs the TIME tag may occur many times - (for example 3 times if there are 3 subsongs). + In files with subsongs, there is a separate TIME tag for every subsong. The optional LOOP modifier specifies that the song starts looping endlessly - at the specified moment. - The exact format of the argument is:
+ at the specified moment. Players can decide to play such songs longer. + The exact format of the TIME argument is:- one or two digits specifying minutes
- colon @@ -215,36 +214,41 @@
- a header of two 0xFF bytes (required for the first block, + optional for subsequent blocks) +
- memory address where to load the data (16-bit little endian) +
- memory address of the last byte (16-bit little endian) +
- the data of the block (
end_address-start_address+1bytes)
+ - 0000-CFFF @@ -253,7 +257,7 @@
- D000-D0FF
- GTIA chip mirrored 8 times. ASAP maps just the PAL register at D014 for NTSC/PAL detection - and the CONSOL register at D01F for 1-bit sounds, the rest is RAM. + and the CONSOL register at D01F for 1-bit sounds. The rest is RAM.
Part Two - Binary Data
This part contains the player routine and music data in the format - of Atari executables. This format has a two-byte header 0xFF, 0xFF. - The two following bytes are the starting memory address (little endian), - the next two bytes are the ending address. Then data bytes follow. - Usually there are multiple blocks - (the 0xFF/0xFF header is only required for the first block).
-The difference from real Atari executables is that - INIT (0x2e2) and RUN (0x2e0) blocks are not supported.
+ of Atari executables. An Atari executable is a sequence of one or more blocks. + Every block consists of: +-
+
In real Atari executables memory locations 0x2E0-0x2E1 specify the run address + and 0x2E2-0x2E3 specify the initialization address. + In the SAP format these are ordinary RAM locations with no special treatment.
Example:
------------------------------------------------------------- FF FF - executable header (always 0xFF, 0xFF) 00 06 - start address of the first block (0x0600) -01 06 - end address of the first block (0x0601) -AB CD - first block data - loaded to 0x0600-0x0601 +02 06 - end address of the first block (0x0602) +AB CD EF - first block data - loaded to 0x0600-0x0602 25 20 - start address of the second block (0x2025) 27 20 - end address of the second block (0x2027) 01 42 A3 - second block data - loaded to 0x2025-0x2027 ------------------------------------------------------------- -Some players allow files that end in the middle of start/end address - or block data, but this practice is strongly discouraged.
+Files that end in the middle of block data or the addresses are considered + malformed, but some SAP players accept them.
Execution Model
The program from the SAP file is run inside an emulated machine that resembles a limited Atari computer with the 6502 processor, POKEY chip - (at least the audio part) and 64 KB RAM. + (at least its audio part) and 64 KB RAM. Some players include emulation of parts of the ANTIC and GTIA chips, as well as the COVOX expansion. Since SAP files may be played on a real Atari, they should be prepared for the possibility that all the original hardware is present - (for example PIA doing the bankswitching).
+ (for example PIA controlling memory bank switching).Memory map:
Timing: The main clock is 1773447 Hz (PAL) or 1789772.5 Hz (NTSC). There are 114 cycles per scanline, including 9 cycles memory refresh - not available for the 6502 - same as in the Atari with ANTIC DMA + when the 6502 is stalled - same as in the Atari with ANTIC DMA disabled completely. WSYNC and VCOUNT registers may be used for delays. Note that some SAP players reset VCOUNT at the FASTPLAY rate instead of every frame.
@@ -312,7 +316,8 @@This type is for easy handling CMC (Chaos Music Composer) music. +
This type is for convenient handling of music + composed in CMC (Chaos Music Composer) . The player is initialized using the values of MUSIC, PLAYER and DEFSONG as follows:
lda #$70 @@ -338,15 +343,15 @@ (which is initially clear, allowing interrupts). All 6502 registers (including flags) are saved when calling the PLAYER routine and restored when it returns to the running INIT routine. - In ASAP 2.1.0 and above the PLAYER tag is optional for TYPE D. - First call to PLAYER usually occurs before the first instruction of INIT - gets executed.