diff options
author | Dominik Wenger <domonoky@googlemail.com> | 2010-11-08 20:25:14 +0000 |
---|---|---|
committer | Dominik Wenger <domonoky@googlemail.com> | 2010-11-08 20:25:14 +0000 |
commit | 23cf4ad82fdfcc2002ec98ccc7588f9db7d0f523 (patch) | |
tree | e13349f9055446911b264adbb4026a10d548bebf | |
parent | c25887a2b92e914f62685bab66a27a8ac051d8a9 (diff) | |
download | rockbox-23cf4ad82fdfcc2002ec98ccc7588f9db7d0f523.tar.gz rockbox-23cf4ad82fdfcc2002ec98ccc7588f9db7d0f523.zip |
update the asap codec to version 2.1.2
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28535 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/codecs/libasap/README | 14 | ||||
-rw-r--r-- | apps/codecs/libasap/README.rockbox | 5 | ||||
-rw-r--r-- | apps/codecs/libasap/acpu.c | 91 | ||||
-rw-r--r-- | apps/codecs/libasap/anylang.h | 2 | ||||
-rw-r--r-- | apps/codecs/libasap/apokeysnd.c | 7 | ||||
-rw-r--r-- | apps/codecs/libasap/asap.c | 207 | ||||
-rw-r--r-- | apps/codecs/libasap/asap.h | 8 | ||||
-rw-r--r-- | apps/codecs/libasap/asap_internal.h | 5 |
8 files changed, 198 insertions, 141 deletions
diff --git a/apps/codecs/libasap/README b/apps/codecs/libasap/README index 4da0aa7b90..d4fbfe6297 100644 --- a/apps/codecs/libasap/README +++ b/apps/codecs/libasap/README | |||
@@ -22,8 +22,9 @@ but the current version has a completely new original emulation core. | |||
22 | ASAP includes the following programs: | 22 | ASAP includes the following programs: |
23 | 23 | ||
24 | - asapconv - portable command-line converter {asapwin=} | 24 | - asapconv - portable command-line converter {asapwin=} |
25 | - WASAP - tiny player for Windows {asapwin=} | 25 | - WASAP - tiny player for Windows {asapwin=}{asapwince=} |
26 | - plugin for http://koti.welho.com/hylinen/apollo/[Apollo] {asapwin=} | 26 | - plugin for http://koti.welho.com/hylinen/apollo/[Apollo] {asapwin=} |
27 | - plugin for http://audacious-media-player.org/[Audacious] | ||
27 | - plugin for http://foobar2000.org/[foobar2000] {asapwin=} | 28 | - plugin for http://foobar2000.org/[foobar2000] {asapwin=} |
28 | - plugin for http://hp.vector.co.jp/authors/VA032810/[GSPlayer] {asapwin=}{asapwince=} | 29 | - plugin for http://hp.vector.co.jp/authors/VA032810/[GSPlayer] {asapwin=}{asapwince=} |
29 | - plugin for http://moc.daper.net/[MOC] | 30 | - plugin for http://moc.daper.net/[MOC] |
@@ -31,15 +32,20 @@ ASAP includes the following programs: | |||
31 | - plugin for http://www.microsoft.com/windows/windowsmedia/player/[Windows Media Player] {asapwin=} | 32 | - plugin for http://www.microsoft.com/windows/windowsmedia/player/[Windows Media Player] {asapwin=} |
32 | - plugin for http://xbmc.org/[XBMC] {asapwin=} | 33 | - plugin for http://xbmc.org/[XBMC] {asapwin=} |
33 | - plugin for http://xmms.org/[XMMS] | 34 | - plugin for http://xmms.org/[XMMS] |
34 | - plugin for http://www.un4seen.com/[XMPlay] {asapwin=} | 35 | - plugin for http://www.un4seen.com/xmplay.html[XMPlay] {asapwin=} |
36 | - add-on for http://www.un4seen.com/bass.html[BASS] (for http://www.aimp.ru/[AIMP] and http://www.un4seen.com/bass_showcase.php[other players]) {asapwin=} | ||
35 | - POKEY sound emulation DLL for http://raster.infos.cz/atari/rmt/rmt.htm[Raster Music Tracker] {asapwin=} | 37 | - POKEY sound emulation DLL for http://raster.infos.cz/atari/rmt/rmt.htm[Raster Music Tracker] {asapwin=} |
38 | - Windows Explorer extension - shows metadata {asapwin=} | ||
36 | - Java version of ASAP2WAV - command-line converter to WAV files {asapjava=} | 39 | - Java version of ASAP2WAV - command-line converter to WAV files {asapjava=} |
37 | - Java applet - for web pages {asapjava=}{asapwww?(see link:applet.html[online demo])} | 40 | - Java applet - for web pages {asapjava=}{asapwww?(see link:applet.html[online demo])} |
38 | - Java midlet - for mobile devices {asapjava=} | 41 | - Java midlet - for mobile devices {asapjava=} |
39 | - C# version of ASAP2WAV | 42 | - C# version of ASAP2WAV |
40 | - experimental JScript version of ASAP2WAV running in Windows Script Host {asapjavascript=} | 43 | - JavaScript version of ASAP2WAV running in http://en.wikipedia.org/wiki/Windows_Script_Host[Windows Script Host], https://developer.mozilla.org/en/Rhino_Shell[Rhino Shell], http://code.google.com/p/v8/[V8 Shell], http://en.wikipedia.org/wiki/JScript_.NET[JScript .NET] and http://en.wikipedia.org/wiki/JaegerMonkey[JaegerMonkey] {asapjavascript=} |
41 | - experimental JavaScript version of ASAP2WAV running in Firefox {asapjavascript=} | 44 | - experimental JavaScript version of ASAP2WAV running in Firefox {asapjavascript=} |
42 | - Flash player - for web pages {asapflash=}{asapwww?(see link:flash.html[online demo])} | 45 | - Flash player - for web pages {asapflash=}{asapwww?(see link:flash.html[online demo])} |
46 | - asapplay - simple command-line player in C# | ||
47 | - http://www.silverlight.net/[Silverlight] player - for web pages {asapwww?(see link:silverlight.html[online demo])} | ||
48 | - AndroidASAP - for mobile devices | ||
43 | 49 | ||
44 | {asapports}The summary of the differences between the above versions is in link:PORTS.xml[this table]. | 50 | {asapports}The summary of the differences between the above versions is in link:PORTS.xml[this table]. |
45 | 51 | ||
@@ -117,7 +123,7 @@ include::win32/USAGE[] | |||
117 | endif::asapwin[] | 123 | endif::asapwin[] |
118 | 124 | ||
119 | ifdef::asapwince[] | 125 | ifdef::asapwince[] |
120 | include::gsplayer/USAGE[] | 126 | include::win32/wince/USAGE[] |
121 | endif::asapwince[] | 127 | endif::asapwince[] |
122 | 128 | ||
123 | include::NEWS[] | 129 | include::NEWS[] |
diff --git a/apps/codecs/libasap/README.rockbox b/apps/codecs/libasap/README.rockbox index 6ea47e9639..62184822d4 100644 --- a/apps/codecs/libasap/README.rockbox +++ b/apps/codecs/libasap/README.rockbox | |||
@@ -1,5 +1,6 @@ | |||
1 | Library: asap-2.1.0 | 1 | Library: asap-2.1.2 |
2 | Imported: 2010-02-02 by Dominik Wenger | 2 | Imported: 2010-02-02 by Dominik Wenger |
3 | Updated: 2010-08-11 by Dominik Wenger | ||
3 | 4 | ||
4 | This directory contains a local version of asap (http://asap.sourceforge.net/) for decoding Atari 8bit .sap | 5 | This directory contains a local version of asap (http://asap.sourceforge.net/) for decoding Atari 8bit .sap |
5 | audio streams. | 6 | audio streams. |
@@ -13,7 +14,7 @@ The Licence is the same as the rest of Rockbox. | |||
13 | 14 | ||
14 | IMPORT DETAILS | 15 | IMPORT DETAILS |
15 | 16 | ||
16 | The .[ch] files in apps/codec/asap are copied from ASAP. | 17 | The .[ch] files in apps/codec/libasap are copied from ASAP. |
17 | 18 | ||
18 | players.h (contains binarys of players) was generated and copied | 19 | players.h (contains binarys of players) was generated and copied |
19 | into Rockbox. | 20 | into Rockbox. |
diff --git a/apps/codecs/libasap/acpu.c b/apps/codecs/libasap/acpu.c index c5bff47a5d..0e91f9083a 100644 --- a/apps/codecs/libasap/acpu.c +++ b/apps/codecs/libasap/acpu.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * acpu.c - another 6502 CPU emulator | 2 | * acpu.c - another 6502 CPU emulator |
3 | * | 3 | * |
4 | * Copyright (C) 2007-2009 Piotr Fusik | 4 | * Copyright (C) 2007-2010 Piotr Fusik |
5 | * | 5 | * |
6 | * This file is part of ASAP (Another Slight Atari Player), | 6 | * This file is part of ASAP (Another Slight Atari Player), |
7 | * see http://asap.sourceforge.net | 7 | * see http://asap.sourceforge.net |
@@ -77,10 +77,8 @@ END_CONST_ARRAY; | |||
77 | { \ | 77 | { \ |
78 | /* binary mode */ \ | 78 | /* binary mode */ \ |
79 | V(int, tmp) = a + data + c; \ | 79 | V(int, tmp) = a + data + c; \ |
80 | vdi = (vdi & (D_FLAG | I_FLAG)) + (((~(data ^ a) & (a ^ tmp)) >> 1) & V_FLAG); \ | ||
80 | c = tmp >> 8; \ | 81 | c = tmp >> 8; \ |
81 | vdi &= D_FLAG | I_FLAG; \ | ||
82 | if (((a ^ data) & 0x80) == 0 && ((data ^ tmp) & 0x80) != 0) \ | ||
83 | vdi += V_FLAG; \ | ||
84 | nz = a = tmp & 0xff; \ | 82 | nz = a = tmp & 0xff; \ |
85 | } | 83 | } |
86 | 84 | ||
@@ -88,68 +86,55 @@ END_CONST_ARRAY; | |||
88 | { \ | 86 | { \ |
89 | /* binary mode */ \ | 87 | /* binary mode */ \ |
90 | V(int, tmp) = a - data - 1 + c; \ | 88 | V(int, tmp) = a - data - 1 + c; \ |
89 | vdi = (vdi & (D_FLAG | I_FLAG)) + ((((data ^ a) & (a ^ tmp)) >> 1) & V_FLAG); \ | ||
91 | c = (tmp >= 0) ? 1 : 0; \ | 90 | c = (tmp >= 0) ? 1 : 0; \ |
92 | vdi &= D_FLAG | I_FLAG; \ | ||
93 | if (((a ^ tmp) & 0x80) != 0 && ((a ^ data) & 0x80) != 0) \ | ||
94 | vdi += V_FLAG; \ | ||
95 | nz = a = tmp & 0xff; \ | 91 | nz = a = tmp & 0xff; \ |
96 | } | 92 | } |
97 | 93 | ||
98 | #else /* ACPU_NO_DECIMAL */ | 94 | #else /* ACPU_NO_DECIMAL */ |
99 | 95 | ||
100 | #define DO_ADC \ | 96 | #define DO_ADC \ |
101 | if ((vdi & D_FLAG) == 0) { \ | 97 | { \ |
102 | /* binary mode */ \ | ||
103 | V(int, tmp) = a + data + c; \ | 98 | V(int, tmp) = a + data + c; \ |
104 | c = tmp >> 8; \ | 99 | nz = tmp & 0xff; \ |
105 | vdi &= D_FLAG | I_FLAG; \ | 100 | if ((vdi & D_FLAG) == 0) { \ |
106 | if (((a ^ data) & 0x80) == 0 && ((data ^ tmp) & 0x80) != 0) \ | 101 | /* binary mode */ \ |
107 | vdi += V_FLAG; \ | 102 | vdi = (vdi & (D_FLAG | I_FLAG)) + (((~(data ^ a) & (a ^ tmp)) >> 1) & V_FLAG); \ |
108 | nz = a = tmp & 0xff; \ | 103 | c = tmp >> 8; \ |
109 | } \ | 104 | a = nz; \ |
110 | else { \ | 105 | } \ |
111 | /* decimal mode */ \ | 106 | else { \ |
112 | V(int, tmp) = (a & 0x0f) + (data & 0x0f) + c; \ | 107 | /* decimal mode */ \ |
113 | if (tmp >= 10) \ | 108 | V(int, al) = (a & 0x0f) + (data & 0x0f) + c; \ |
114 | tmp = (tmp - 10) | 0x10; \ | 109 | if (al >= 10) \ |
115 | tmp += (a & 0xf0) + (data & 0xf0); \ | 110 | tmp += (al < 26) ? 6 : -10; \ |
116 | nz = ((tmp & 0x80) << 1) + ((a + data + c) & 0xff); \ | 111 | nz = ((tmp & 0x80) << 1) + (nz != 0 ? 1 : 0); \ |
117 | vdi &= D_FLAG | I_FLAG; \ | 112 | vdi = (vdi & (D_FLAG | I_FLAG)) + (((~(data ^ a) & (a ^ tmp)) >> 1) & V_FLAG); \ |
118 | if (((a ^ data) & 0x80) == 0 && ((data ^ tmp) & 0x80) != 0) \ | 113 | if (tmp >= 0xa0) { \ |
119 | vdi += V_FLAG; \ | 114 | c = 1; \ |
120 | if (tmp > 0x9f) \ | 115 | a = (tmp + 0x60) & 0xff; \ |
121 | tmp += 0x60; \ | 116 | } \ |
122 | c = (tmp > 0xff) ? 1 : 0; \ | 117 | else { \ |
123 | a = tmp & 0xff; \ | 118 | c = 0; \ |
119 | a = tmp; \ | ||
120 | } \ | ||
121 | } \ | ||
124 | } | 122 | } |
125 | 123 | ||
126 | #define DO_SBC \ | 124 | #define DO_SBC \ |
127 | if ((vdi & D_FLAG) == 0) { \ | 125 | {\ |
128 | /* binary mode */ \ | ||
129 | V(int, tmp) = a - data - 1 + c; \ | 126 | V(int, tmp) = a - data - 1 + c; \ |
127 | V(int, al) = (a & 0x0f) - (data & 0x0f) - 1 + c; \ | ||
128 | vdi = (vdi & (D_FLAG | I_FLAG)) + ((((data ^ a) & (a ^ tmp)) >> 1) & V_FLAG); \ | ||
130 | c = (tmp >= 0) ? 1 : 0; \ | 129 | c = (tmp >= 0) ? 1 : 0; \ |
131 | vdi &= D_FLAG | I_FLAG; \ | ||
132 | if (((a ^ tmp) & 0x80) != 0 && ((a ^ data) & 0x80) != 0) \ | ||
133 | vdi += V_FLAG; \ | ||
134 | nz = a = tmp & 0xff; \ | 130 | nz = a = tmp & 0xff; \ |
135 | } \ | 131 | if ((vdi & D_FLAG) != 0) { \ |
136 | else { \ | 132 | /* decimal mode */ \ |
137 | /* decimal mode */ \ | 133 | if (al < 0) \ |
138 | V(int, tmp) = a - data - 1 + c; \ | 134 | a += (al < -10) ? 10 : -6; \ |
139 | V(int, al) = (a & 0x0f) - (data & 0x0f) - 1 + c; \ | 135 | if (c == 0) \ |
140 | V(int, ah) = (a >> 4) - (data >> 4); \ | 136 | a = (a - 0x60) & 0xff; \ |
141 | if ((al & 0x10) != 0) { \ | ||
142 | al -= 6; \ | ||
143 | ah--; \ | ||
144 | } \ | 137 | } \ |
145 | if ((ah & 0x10) != 0) \ | ||
146 | ah -= 6; \ | ||
147 | c = tmp >= 0 ? 1 : 0; \ | ||
148 | vdi &= D_FLAG | I_FLAG; \ | ||
149 | if (((a ^ tmp) & 0x80) != 0 && ((a ^ data) & 0x80) != 0) \ | ||
150 | vdi += V_FLAG; \ | ||
151 | nz = tmp & 0xff; \ | ||
152 | a = ((ah & 0xf) << 4) + (al & 0x0f); \ | ||
153 | } | 138 | } |
154 | 139 | ||
155 | #endif /* ACPU_NO_DECIMAL */ | 140 | #endif /* ACPU_NO_DECIMAL */ |
@@ -301,7 +286,7 @@ FUNC(void, Cpu_RunScanlines, (P(ASAP_State PTR, ast), P(int, scanlines))) | |||
301 | cycle = ast _ cycle; | 286 | cycle = ast _ cycle; |
302 | if (cycle >= ast _ nearest_event_cycle) { | 287 | if (cycle >= ast _ nearest_event_cycle) { |
303 | if (cycle >= ast _ next_scanline_cycle) { | 288 | if (cycle >= ast _ next_scanline_cycle) { |
304 | if (++ast _ scanline_number == 312) | 289 | if (++ast _ scanline_number == (ast _ module_info.ntsc ? 262 : 312)) |
305 | ast _ scanline_number = 0; | 290 | ast _ scanline_number = 0; |
306 | ast _ cycle = cycle += 9; | 291 | ast _ cycle = cycle += 9; |
307 | ast _ next_scanline_cycle += 114; | 292 | ast _ next_scanline_cycle += 114; |
@@ -352,7 +337,7 @@ FUNC(void, Cpu_RunScanlines, (P(ASAP_State PTR, ast), P(int, scanlines))) | |||
352 | case 0xb2: | 337 | case 0xb2: |
353 | case 0xd2: | 338 | case 0xd2: |
354 | case 0xf2: | 339 | case 0xf2: |
355 | ast _ scanline_number = (ast _ scanline_number + scanlines - 1) % 312; | 340 | ast _ scanline_number = (ast _ scanline_number + scanlines - 1) % (ast _ module_info.ntsc ? 262 : 312); |
356 | scanlines = 1; | 341 | scanlines = 1; |
357 | ast _ cycle = cycle_limit; | 342 | ast _ cycle = cycle_limit; |
358 | break; | 343 | break; |
diff --git a/apps/codecs/libasap/anylang.h b/apps/codecs/libasap/anylang.h index 4d955d6026..e56dfbae0e 100644 --- a/apps/codecs/libasap/anylang.h +++ b/apps/codecs/libasap/anylang.h | |||
@@ -156,7 +156,7 @@ | |||
156 | #define EMPTY_STRING(s) (s) = string.Empty | 156 | #define EMPTY_STRING(s) (s) = string.Empty |
157 | #define SUBSTR(s, i) (s).Substring(i) | 157 | #define SUBSTR(s, i) (s).Substring(i) |
158 | #define BYTES_TO_STRING(dest, src, src_offset, len) \ | 158 | #define BYTES_TO_STRING(dest, src, src_offset, len) \ |
159 | (dest) = System.Text.Encoding.ASCII.GetString(src, src_offset, len) | 159 | (dest) = System.Text.Encoding.UTF8.GetString(src, src_offset, len) |
160 | #define SUBSTRING(dest, src, src_offset, len) \ | 160 | #define SUBSTRING(dest, src, src_offset, len) \ |
161 | (dest) = (src).Substring(src_offset, len) | 161 | (dest) = (src).Substring(src_offset, len) |
162 | 162 | ||
diff --git a/apps/codecs/libasap/apokeysnd.c b/apps/codecs/libasap/apokeysnd.c index ead611be5f..811e2f9b4a 100644 --- a/apps/codecs/libasap/apokeysnd.c +++ b/apps/codecs/libasap/apokeysnd.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * apokeysnd.c - another POKEY sound emulator | 2 | * apokeysnd.c - another POKEY sound emulator |
3 | * | 3 | * |
4 | * Copyright (C) 2007-2009 Piotr Fusik | 4 | * Copyright (C) 2007-2010 Piotr Fusik |
5 | * | 5 | * |
6 | * This file is part of ASAP (Another Slight Atari Player), | 6 | * This file is part of ASAP (Another Slight Atari Player), |
7 | * see http://asap.sourceforge.net | 7 | * see http://asap.sourceforge.net |
@@ -469,13 +469,14 @@ FUNC(void, PokeySound_StartFrame, (P(ASAP_State PTR, ast))) | |||
469 | 469 | ||
470 | FUNC(void, PokeySound_EndFrame, (P(ASAP_State PTR, ast), P(int, current_cycle))) | 470 | FUNC(void, PokeySound_EndFrame, (P(ASAP_State PTR, ast), P(int, current_cycle))) |
471 | { | 471 | { |
472 | V(int, clk) = ASAP_MAIN_CLOCK(ast); | ||
472 | end_frame(ast, ADDRESSOF ast _ base_pokey, current_cycle); | 473 | end_frame(ast, ADDRESSOF ast _ base_pokey, current_cycle); |
473 | if (ast _ extra_pokey_mask != 0) | 474 | if (ast _ extra_pokey_mask != 0) |
474 | end_frame(ast, ADDRESSOF ast _ extra_pokey, current_cycle); | 475 | end_frame(ast, ADDRESSOF ast _ extra_pokey, current_cycle); |
475 | ast _ sample_offset += current_cycle * ASAP_SAMPLE_RATE; | 476 | ast _ sample_offset += current_cycle * ASAP_SAMPLE_RATE; |
476 | ast _ sample_index = 0; | 477 | ast _ sample_index = 0; |
477 | ast _ samples = TO_INT(ast _ sample_offset / ASAP_MAIN_CLOCK); | 478 | ast _ samples = TO_INT(ast _ sample_offset / clk); |
478 | ast _ sample_offset %= ASAP_MAIN_CLOCK; | 479 | ast _ sample_offset %= clk; |
479 | } | 480 | } |
480 | 481 | ||
481 | /* Fills buffer with samples from delta_buffer. */ | 482 | /* Fills buffer with samples from delta_buffer. */ |
diff --git a/apps/codecs/libasap/asap.c b/apps/codecs/libasap/asap.c index c79682c38b..510807362a 100644 --- a/apps/codecs/libasap/asap.c +++ b/apps/codecs/libasap/asap.c | |||
@@ -23,21 +23,37 @@ | |||
23 | 23 | ||
24 | #include "asap_internal.h" | 24 | #include "asap_internal.h" |
25 | 25 | ||
26 | #ifdef ASAP_ONLY_INFO | ||
27 | |||
28 | #define GET_PLAYER(name) NULL | ||
29 | |||
30 | #else | ||
31 | |||
32 | #define GET_PLAYER(name) GET_RESOURCE(name, obx) | ||
33 | |||
26 | FUNC(int, ASAP_GetByte, (P(ASAP_State PTR, ast), P(int, addr))) | 34 | FUNC(int, ASAP_GetByte, (P(ASAP_State PTR, ast), P(int, addr))) |
27 | { | 35 | { |
28 | switch (addr & 0xff0f) { | 36 | switch (addr & 0xff1f) { |
37 | case 0xd014: | ||
38 | return ast _ module_info.ntsc ? 0xf : 1; | ||
29 | case 0xd20a: | 39 | case 0xd20a: |
40 | case 0xd21a: | ||
30 | return PokeySound_GetRandom(ast, addr, ast _ cycle); | 41 | return PokeySound_GetRandom(ast, addr, ast _ cycle); |
31 | case 0xd20e: | 42 | case 0xd20e: |
32 | if ((addr & ast _ extra_pokey_mask) != 0) { | 43 | return ast _ irqst; |
44 | case 0xd21e: | ||
45 | if (ast _ extra_pokey_mask != 0) { | ||
33 | /* interrupts in the extra POKEY not emulated at the moment */ | 46 | /* interrupts in the extra POKEY not emulated at the moment */ |
34 | return 0xff; | 47 | return 0xff; |
35 | } | 48 | } |
36 | return ast _ irqst; | 49 | return ast _ irqst; |
37 | case 0xd20f: | 50 | case 0xd20c: |
38 | /* just because some SAP files rely on this */ | 51 | case 0xd21c: |
52 | case 0xd20f: /* just because some SAP files rely on this */ | ||
53 | case 0xd21f: | ||
39 | return 0xff; | 54 | return 0xff; |
40 | case 0xd40b: | 55 | case 0xd40b: |
56 | case 0xd41b: | ||
41 | return ast _ scanline_number >> 1; | 57 | return ast _ scanline_number >> 1; |
42 | default: | 58 | default: |
43 | return dGetByte(addr); | 59 | return dGetByte(addr); |
@@ -99,10 +115,14 @@ FUNC(void, ASAP_PutByte, (P(ASAP_State PTR, ast), P(int, addr), P(int, data))) | |||
99 | dPutByte(addr, data); | 115 | dPutByte(addr, data); |
100 | } | 116 | } |
101 | 117 | ||
118 | #endif /* ASAP_ONLY_INFO */ | ||
119 | |||
102 | #define UWORD(array, index) (UBYTE(array[index]) + (UBYTE(array[(index) + 1]) << 8)) | 120 | #define UWORD(array, index) (UBYTE(array[index]) + (UBYTE(array[(index) + 1]) << 8)) |
103 | 121 | ||
104 | #ifndef ASAP_ONLY_SAP | 122 | #ifndef ASAP_ONLY_SAP |
105 | 123 | ||
124 | #ifndef ASAP_ONLY_INFO | ||
125 | |||
106 | #ifndef JAVA | 126 | #ifndef JAVA |
107 | #include "players.h" | 127 | #include "players.h" |
108 | #endif | 128 | #endif |
@@ -117,6 +137,8 @@ CONST_ARRAY(byte, cmr_bass_table) | |||
117 | 0x25, 0x24, 0x21, 0x1F, 0x1E | 137 | 0x25, 0x24, 0x21, 0x1F, 0x1E |
118 | END_CONST_ARRAY; | 138 | END_CONST_ARRAY; |
119 | 139 | ||
140 | #endif /* ASAP_ONLY_INFO */ | ||
141 | |||
120 | CONST_ARRAY(int, perframe2fastplay) | 142 | CONST_ARRAY(int, perframe2fastplay) |
121 | 312, 312 / 2, 312 / 3, 312 / 4 | 143 | 312, 312 / 2, 312 / 3, 312 / 4 |
122 | END_CONST_ARRAY; | 144 | END_CONST_ARRAY; |
@@ -126,17 +148,21 @@ PRIVATE FUNC(abool, load_native, ( | |||
126 | P(ASAP_State PTR, ast), P(ASAP_ModuleInfo PTR, module_info), | 148 | P(ASAP_State PTR, ast), P(ASAP_ModuleInfo PTR, module_info), |
127 | P(CONST BYTEARRAY, module), P(int, module_len), P(RESOURCE, player))) | 149 | P(CONST BYTEARRAY, module), P(int, module_len), P(RESOURCE, player))) |
128 | { | 150 | { |
151 | #ifndef ASAP_ONLY_INFO | ||
129 | V(int, player_last_byte); | 152 | V(int, player_last_byte); |
153 | #endif | ||
130 | V(int, music_last_byte); | 154 | V(int, music_last_byte); |
131 | V(int, block_len); | 155 | V(int, block_len); |
132 | if ((UBYTE(module[0]) != 0xff || UBYTE(module[1]) != 0xff) | 156 | if ((UBYTE(module[0]) != 0xff || UBYTE(module[1]) != 0xff) |
133 | && (module[0] != 0 || module[1] != 0)) /* some CMC and clones start with zeros */ | 157 | && (module[0] != 0 || module[1] != 0)) /* some CMC and clones start with zeros */ |
134 | return FALSE; | 158 | return FALSE; |
159 | module_info _ music = UWORD(module, 2); | ||
160 | #ifndef ASAP_ONLY_INFO | ||
135 | module_info _ player = UWORD(player, 2); | 161 | module_info _ player = UWORD(player, 2); |
136 | player_last_byte = UWORD(player, 4); | 162 | player_last_byte = UWORD(player, 4); |
137 | module_info _ music = UWORD(module, 2); | ||
138 | if (module_info _ music <= player_last_byte) | 163 | if (module_info _ music <= player_last_byte) |
139 | return FALSE; | 164 | return FALSE; |
165 | #endif | ||
140 | music_last_byte = UWORD(module, 4); | 166 | music_last_byte = UWORD(module, 4); |
141 | if (module_info _ music <= 0xd7ff && music_last_byte >= 0xd000) | 167 | if (module_info _ music <= 0xd7ff && music_last_byte >= 0xd000) |
142 | return FALSE; | 168 | return FALSE; |
@@ -154,10 +180,12 @@ PRIVATE FUNC(abool, load_native, ( | |||
154 | if (10 + block_len + info_len != module_len) | 180 | if (10 + block_len + info_len != module_len) |
155 | return FALSE; | 181 | return FALSE; |
156 | } | 182 | } |
183 | #ifndef ASAP_ONLY_INFO | ||
157 | if (ast != NULL) { | 184 | if (ast != NULL) { |
158 | COPY_ARRAY(ast _ memory, module_info _ music, module, 6, block_len); | 185 | COPY_ARRAY(ast _ memory, module_info _ music, module, 6, block_len); |
159 | COPY_ARRAY(ast _ memory, module_info _ player, player, 6, player_last_byte + 1 - module_info _ player); | 186 | COPY_ARRAY(ast _ memory, module_info _ player, player, 6, player_last_byte + 1 - module_info _ player); |
160 | } | 187 | } |
188 | #endif | ||
161 | return TRUE; | 189 | return TRUE; |
162 | } | 190 | } |
163 | 191 | ||
@@ -256,8 +284,10 @@ PRIVATE FUNC(abool, parse_cmc, ( | |||
256 | module_info _ type = type; | 284 | module_info _ type = type; |
257 | if (!load_native(ast, module_info, module, module_len, player)) | 285 | if (!load_native(ast, module_info, module, module_len, player)) |
258 | return FALSE; | 286 | return FALSE; |
287 | #ifndef ASAP_ONLY_INFO | ||
259 | if (ast != NULL && type == ASAP_TYPE_CMR) | 288 | if (ast != NULL && type == ASAP_TYPE_CMR) |
260 | COPY_ARRAY(ast _ memory, 0x500 + CMR_BASS_TABLE_OFFSET, cmr_bass_table, 0, sizeof(cmr_bass_table)); | 289 | COPY_ARRAY(ast _ memory, 0x500 + CMR_BASS_TABLE_OFFSET, cmr_bass_table, 0, sizeof(cmr_bass_table)); |
290 | #endif | ||
261 | last_pos = 0x54; | 291 | last_pos = 0x54; |
262 | while (--last_pos >= 0) { | 292 | while (--last_pos >= 0) { |
263 | if (UBYTE(module[0x206 + last_pos]) < 0xb0 | 293 | if (UBYTE(module[0x206 + last_pos]) < 0xb0 |
@@ -351,7 +381,7 @@ PRIVATE FUNC(abool, parse_dlt, ( | |||
351 | else if (module_len != 0x2c07) | 381 | else if (module_len != 0x2c07) |
352 | return FALSE; | 382 | return FALSE; |
353 | module_info _ type = ASAP_TYPE_DLT; | 383 | module_info _ type = ASAP_TYPE_DLT; |
354 | if (!load_native(ast, module_info, module, module_len, GET_RESOURCE(dlt, obx)) | 384 | if (!load_native(ast, module_info, module, module_len, GET_PLAYER(dlt)) |
355 | || module_info _ music != 0x2000) { | 385 | || module_info _ music != 0x2000) { |
356 | return FALSE; | 386 | return FALSE; |
357 | } | 387 | } |
@@ -452,7 +482,7 @@ PRIVATE FUNC(abool, parse_mpt, ( | |||
452 | if (module_len < 0x1d0) | 482 | if (module_len < 0x1d0) |
453 | return FALSE; | 483 | return FALSE; |
454 | module_info _ type = ASAP_TYPE_MPT; | 484 | module_info _ type = ASAP_TYPE_MPT; |
455 | if (!load_native(ast, module_info, module, module_len, GET_RESOURCE(mpt, obx))) | 485 | if (!load_native(ast, module_info, module, module_len, GET_PLAYER(mpt))) |
456 | return FALSE; | 486 | return FALSE; |
457 | track0_addr = UWORD(module, 2) + 0x1ca; | 487 | track0_addr = UWORD(module, 2) + 0x1ca; |
458 | if (UBYTE(module[0x1c6]) + (UBYTE(module[0x1ca]) << 8) != track0_addr) | 488 | if (UBYTE(module[0x1c6]) + (UBYTE(module[0x1ca]) << 8) != track0_addr) |
@@ -689,7 +719,7 @@ PRIVATE FUNC(abool, parse_rmt, ( | |||
689 | return FALSE; | 719 | return FALSE; |
690 | module_info _ type = ASAP_TYPE_RMT; | 720 | module_info _ type = ASAP_TYPE_RMT; |
691 | if (!load_native(ast, module_info, module, module_len, | 721 | if (!load_native(ast, module_info, module, module_len, |
692 | module_info _ channels == 2 ? GET_RESOURCE(rmt8, obx) : GET_RESOURCE(rmt4, obx))) | 722 | module_info _ channels == 2 ? GET_PLAYER(rmt8) : GET_PLAYER(rmt4))) |
693 | return FALSE; | 723 | return FALSE; |
694 | song_len = UWORD(module, 4) + 1 - UWORD(module, 0x14); | 724 | song_len = UWORD(module, 4) + 1 - UWORD(module, 0x14); |
695 | if (pos_shift == 3 && (song_len & 4) != 0 | 725 | if (pos_shift == 3 && (song_len & 4) != 0 |
@@ -781,7 +811,7 @@ PRIVATE FUNC(abool, parse_tmc, ( | |||
781 | if (module_len < 0x1d0) | 811 | if (module_len < 0x1d0) |
782 | return FALSE; | 812 | return FALSE; |
783 | module_info _ type = ASAP_TYPE_TMC; | 813 | module_info _ type = ASAP_TYPE_TMC; |
784 | if (!load_native(ast, module_info, module, module_len, GET_RESOURCE(tmc, obx))) | 814 | if (!load_native(ast, module_info, module, module_len, GET_PLAYER(tmc))) |
785 | return FALSE; | 815 | return FALSE; |
786 | module_info _ channels = 2; | 816 | module_info _ channels = 2; |
787 | i = 0; | 817 | i = 0; |
@@ -899,7 +929,7 @@ PRIVATE FUNC(abool, parse_tm2, ( | |||
899 | if (module_len < 0x3a4) | 929 | if (module_len < 0x3a4) |
900 | return FALSE; | 930 | return FALSE; |
901 | module_info _ type = ASAP_TYPE_TM2; | 931 | module_info _ type = ASAP_TYPE_TM2; |
902 | if (!load_native(ast, module_info, module, module_len, GET_RESOURCE(tm2, obx))) | 932 | if (!load_native(ast, module_info, module, module_len, GET_PLAYER(tm2))) |
903 | return FALSE; | 933 | return FALSE; |
904 | i = module[0x25]; | 934 | i = module[0x25]; |
905 | if (i < 1 || i > 4) | 935 | if (i < 1 || i > 4) |
@@ -1064,6 +1094,7 @@ PRIVATE FUNC(abool, parse_sap_header, ( | |||
1064 | V(int, duration_index) = 0; | 1094 | V(int, duration_index) = 0; |
1065 | if (!has_string_at(module, 0, "SAP\r\n")) | 1095 | if (!has_string_at(module, 0, "SAP\r\n")) |
1066 | return FALSE; | 1096 | return FALSE; |
1097 | module_info _ fastplay = -1; | ||
1067 | module_index = 5; | 1098 | module_index = 5; |
1068 | while (UBYTE(module[module_index]) != 0xff) { | 1099 | while (UBYTE(module[module_index]) != 0xff) { |
1069 | if (module_index + 8 >= module_len) | 1100 | if (module_index + 8 >= module_len) |
@@ -1093,6 +1124,8 @@ PRIVATE FUNC(abool, parse_sap_header, ( | |||
1093 | } | 1124 | } |
1094 | else if (TAG_IS("STEREO\r")) | 1125 | else if (TAG_IS("STEREO\r")) |
1095 | module_info _ channels = 2; | 1126 | module_info _ channels = 2; |
1127 | else if (TAG_IS("NTSC\r")) | ||
1128 | module_info _ ntsc = TRUE; | ||
1096 | else if (TAG_IS("TIME ")) { | 1129 | else if (TAG_IS("TIME ")) { |
1097 | V(int, i); | 1130 | V(int, i); |
1098 | #ifdef C | 1131 | #ifdef C |
@@ -1101,7 +1134,7 @@ PRIVATE FUNC(abool, parse_sap_header, ( | |||
1101 | V(STRING, s); | 1134 | V(STRING, s); |
1102 | #endif | 1135 | #endif |
1103 | module_index += 5; | 1136 | module_index += 5; |
1104 | for (i = 0; module[module_index + i] != 0xd; i++); | 1137 | for (i = 0; module[module_index + i] != 0xd; i++) { } |
1105 | if (i > 5 && has_string_at(module, module_index + i - 5, " LOOP")) { | 1138 | if (i > 5 && has_string_at(module, module_index + i - 5, " LOOP")) { |
1106 | module_info _ loops[duration_index] = TRUE; | 1139 | module_info _ loops[duration_index] = TRUE; |
1107 | i -= 5; | 1140 | i -= 5; |
@@ -1171,6 +1204,10 @@ PRIVATE FUNC(abool, parse_sap_header, ( | |||
1171 | default: | 1204 | default: |
1172 | return FALSE; | 1205 | return FALSE; |
1173 | } | 1206 | } |
1207 | if (module_info _ fastplay < 0) | ||
1208 | module_info _ fastplay = module_info _ ntsc ? 262 : 312; | ||
1209 | else if (module_info _ ntsc && module_info _ fastplay > 262) | ||
1210 | return FALSE; | ||
1174 | if (UBYTE(module[module_index + 1]) != 0xff) | 1211 | if (UBYTE(module[module_index + 1]) != 0xff) |
1175 | return FALSE; | 1212 | return FALSE; |
1176 | module_info _ header_len = module_index; | 1213 | module_info _ header_len = module_index; |
@@ -1287,6 +1324,7 @@ PRIVATE FUNC(abool, parse_file, ( | |||
1287 | module_info _ durations[i] = -1; | 1324 | module_info _ durations[i] = -1; |
1288 | module_info _ loops[i] = FALSE; | 1325 | module_info _ loops[i] = FALSE; |
1289 | } | 1326 | } |
1327 | module_info _ ntsc = FALSE; | ||
1290 | module_info _ fastplay = 312; | 1328 | module_info _ fastplay = 312; |
1291 | module_info _ music = -1; | 1329 | module_info _ music = -1; |
1292 | module_info _ init = -1; | 1330 | module_info _ init = -1; |
@@ -1297,17 +1335,17 @@ PRIVATE FUNC(abool, parse_file, ( | |||
1297 | return parse_sap(ast, module_info, module, module_len); | 1335 | return parse_sap(ast, module_info, module, module_len); |
1298 | #ifndef ASAP_ONLY_SAP | 1336 | #ifndef ASAP_ONLY_SAP |
1299 | case ASAP_EXT('C', 'M', 'C'): | 1337 | case ASAP_EXT('C', 'M', 'C'): |
1300 | return parse_cmc(ast, module_info, module, module_len, ASAP_TYPE_CMC, GET_RESOURCE(cmc, obx)); | 1338 | return parse_cmc(ast, module_info, module, module_len, ASAP_TYPE_CMC, GET_PLAYER(cmc)); |
1301 | case ASAP_EXT('C', 'M', '3'): | 1339 | case ASAP_EXT('C', 'M', '3'): |
1302 | return parse_cmc(ast, module_info, module, module_len, ASAP_TYPE_CM3, GET_RESOURCE(cm3, obx)); | 1340 | return parse_cmc(ast, module_info, module, module_len, ASAP_TYPE_CM3, GET_PLAYER(cm3)); |
1303 | case ASAP_EXT('C', 'M', 'R'): | 1341 | case ASAP_EXT('C', 'M', 'R'): |
1304 | return parse_cmc(ast, module_info, module, module_len, ASAP_TYPE_CMR, GET_RESOURCE(cmc, obx)); | 1342 | return parse_cmc(ast, module_info, module, module_len, ASAP_TYPE_CMR, GET_PLAYER(cmc)); |
1305 | case ASAP_EXT('C', 'M', 'S'): | 1343 | case ASAP_EXT('C', 'M', 'S'): |
1306 | module_info _ channels = 2; | 1344 | module_info _ channels = 2; |
1307 | return parse_cmc(ast, module_info, module, module_len, ASAP_TYPE_CMS, GET_RESOURCE(cms, obx)); | 1345 | return parse_cmc(ast, module_info, module, module_len, ASAP_TYPE_CMS, GET_PLAYER(cms)); |
1308 | case ASAP_EXT('D', 'M', 'C'): | 1346 | case ASAP_EXT('D', 'M', 'C'): |
1309 | module_info _ fastplay = 156; | 1347 | module_info _ fastplay = 156; |
1310 | return parse_cmc(ast, module_info, module, module_len, ASAP_TYPE_CMC, GET_RESOURCE(cmc, obx)); | 1348 | return parse_cmc(ast, module_info, module, module_len, ASAP_TYPE_CMC, GET_PLAYER(cmc)); |
1311 | case ASAP_EXT('D', 'L', 'T'): | 1349 | case ASAP_EXT('D', 'L', 'T'): |
1312 | return parse_dlt(ast, module_info, module, module_len); | 1350 | return parse_dlt(ast, module_info, module, module_len); |
1313 | case ASAP_EXT('M', 'P', 'T'): | 1351 | case ASAP_EXT('M', 'P', 'T'): |
@@ -1335,6 +1373,8 @@ FUNC(abool, ASAP_GetModuleInfo, ( | |||
1335 | return parse_file(NULL, module_info, filename, module, module_len); | 1373 | return parse_file(NULL, module_info, filename, module, module_len); |
1336 | } | 1374 | } |
1337 | 1375 | ||
1376 | #ifndef ASAP_ONLY_INFO | ||
1377 | |||
1338 | FUNC(abool, ASAP_Load, ( | 1378 | FUNC(abool, ASAP_Load, ( |
1339 | P(ASAP_State PTR, ast), P(STRING, filename), | 1379 | P(ASAP_State PTR, ast), P(STRING, filename), |
1340 | P(CONST BYTEARRAY, module), P(int, module_len))) | 1380 | P(CONST BYTEARRAY, module), P(int, module_len))) |
@@ -1345,7 +1385,7 @@ FUNC(abool, ASAP_Load, ( | |||
1345 | 1385 | ||
1346 | FUNC(void, ASAP_DetectSilence, (P(ASAP_State PTR, ast), P(int, seconds))) | 1386 | FUNC(void, ASAP_DetectSilence, (P(ASAP_State PTR, ast), P(int, seconds))) |
1347 | { | 1387 | { |
1348 | ast _ silence_cycles = seconds * ASAP_MAIN_CLOCK; | 1388 | ast _ silence_cycles = seconds * ASAP_MAIN_CLOCK(ast); |
1349 | } | 1389 | } |
1350 | 1390 | ||
1351 | PRIVATE FUNC(void, call_6502, (P(ASAP_State PTR, ast), P(int, addr), P(int, max_scanlines))) | 1391 | PRIVATE FUNC(void, call_6502, (P(ASAP_State PTR, ast), P(int, addr), P(int, max_scanlines))) |
@@ -1562,18 +1602,14 @@ PRIVATE FUNC(void, serialize_int, (P(BYTEARRAY, buffer), P(int, offset), P(int, | |||
1562 | buffer[offset + 3] = TO_BYTE(value >> 24); | 1602 | buffer[offset + 3] = TO_BYTE(value >> 24); |
1563 | } | 1603 | } |
1564 | 1604 | ||
1565 | FUNC(void, ASAP_GetWavHeaderForPart, ( | 1605 | FUNC(void, ASAP_GetWavHeader, ( |
1566 | P(CONST ASAP_State PTR, ast), P(BYTEARRAY, buffer), | 1606 | P(CONST ASAP_State PTR, ast), P(BYTEARRAY, buffer), P(ASAP_SampleFormat, format))) |
1567 | P(ASAP_SampleFormat, format), P(int, blocks))) | ||
1568 | { | 1607 | { |
1569 | V(int, use_16bit) = format != ASAP_FORMAT_U8 ? 1 : 0; | 1608 | V(int, use_16bit) = format != ASAP_FORMAT_U8 ? 1 : 0; |
1570 | V(int, block_size) = ast _ module_info.channels << use_16bit; | 1609 | V(int, block_size) = ast _ module_info.channels << use_16bit; |
1571 | V(int, bytes_per_second) = ASAP_SAMPLE_RATE * block_size; | 1610 | V(int, bytes_per_second) = ASAP_SAMPLE_RATE * block_size; |
1572 | V(int, remaining_blocks) = milliseconds_to_blocks(ast _ current_duration) - ast _ blocks_played; | 1611 | V(int, total_blocks) = milliseconds_to_blocks(ast _ current_duration); |
1573 | V(int, n_bytes); | 1612 | V(int, n_bytes) = (total_blocks - ast _ blocks_played) * block_size; |
1574 | if (blocks > remaining_blocks) | ||
1575 | blocks = remaining_blocks; | ||
1576 | n_bytes = blocks * block_size; | ||
1577 | buffer[0] = CAST(byte) CHARCODE('R'); | 1613 | buffer[0] = CAST(byte) CHARCODE('R'); |
1578 | buffer[1] = CAST(byte) CHARCODE('I'); | 1614 | buffer[1] = CAST(byte) CHARCODE('I'); |
1579 | buffer[2] = CAST(byte) CHARCODE('F'); | 1615 | buffer[2] = CAST(byte) CHARCODE('F'); |
@@ -1608,13 +1644,6 @@ FUNC(void, ASAP_GetWavHeaderForPart, ( | |||
1608 | serialize_int(buffer, 40, n_bytes); | 1644 | serialize_int(buffer, 40, n_bytes); |
1609 | } | 1645 | } |
1610 | 1646 | ||
1611 | FUNC(void, ASAP_GetWavHeader, ( | ||
1612 | P(CONST ASAP_State PTR, ast), P(BYTEARRAY, buffer), P(ASAP_SampleFormat, format))) | ||
1613 | { | ||
1614 | V(int, remaining_blocks) = milliseconds_to_blocks(ast _ current_duration) - ast _ blocks_played; | ||
1615 | ASAP_GetWavHeaderForPart(ast, buffer, format, remaining_blocks); | ||
1616 | } | ||
1617 | |||
1618 | #endif /* ACTIONSCRIPT */ | 1647 | #endif /* ACTIONSCRIPT */ |
1619 | 1648 | ||
1620 | PRIVATE FUNC(int, ASAP_GenerateAt, (P(ASAP_State PTR, ast), P(VOIDPTR, buffer), P(int, buffer_offset), P(int, buffer_len), P(ASAP_SampleFormat, format))) | 1649 | PRIVATE FUNC(int, ASAP_GenerateAt, (P(ASAP_State PTR, ast), P(VOIDPTR, buffer), P(int, buffer_offset), P(int, buffer_len), P(ASAP_SampleFormat, format))) |
@@ -1650,7 +1679,15 @@ FUNC(int, ASAP_Generate, (P(ASAP_State PTR, ast), P(VOIDPTR, buffer), P(int, buf | |||
1650 | return ASAP_GenerateAt(ast, buffer, 0, buffer_len, format); | 1679 | return ASAP_GenerateAt(ast, buffer, 0, buffer_len, format); |
1651 | } | 1680 | } |
1652 | 1681 | ||
1653 | #if defined(C) && !defined(ASAP_ONLY_SAP) | 1682 | #endif /* ASAP_ONLY_INFO */ |
1683 | |||
1684 | #ifdef C | ||
1685 | |||
1686 | abool ASAP_CanSetModuleInfo(const char *filename) | ||
1687 | { | ||
1688 | int ext = get_packed_ext(filename); | ||
1689 | return ext == ASAP_EXT('S', 'A', 'P'); | ||
1690 | } | ||
1654 | 1691 | ||
1655 | abool ASAP_ChangeExt(char *filename, const char *ext) | 1692 | abool ASAP_ChangeExt(char *filename, const char *ext) |
1656 | { | 1693 | { |
@@ -1668,12 +1705,6 @@ abool ASAP_ChangeExt(char *filename, const char *ext) | |||
1668 | return TRUE; | 1705 | return TRUE; |
1669 | } | 1706 | } |
1670 | 1707 | ||
1671 | abool ASAP_CanSetModuleInfo(const char *filename) | ||
1672 | { | ||
1673 | int ext = get_packed_ext(filename); | ||
1674 | return ext == ASAP_EXT('S', 'A', 'P'); | ||
1675 | } | ||
1676 | |||
1677 | static byte *put_string(byte *dest, const char *str) | 1708 | static byte *put_string(byte *dest, const char *str) |
1678 | { | 1709 | { |
1679 | while (*str != '\0') | 1710 | while (*str != '\0') |
@@ -1717,21 +1748,6 @@ static byte *put_dec_tag(byte *dest, const char *tag, int value) | |||
1717 | return dest; | 1748 | return dest; |
1718 | } | 1749 | } |
1719 | 1750 | ||
1720 | static byte *put_hex_tag(byte *dest, const char *tag, int value) | ||
1721 | { | ||
1722 | int i; | ||
1723 | if (value < 0) | ||
1724 | return dest; | ||
1725 | dest = put_string(dest, tag); | ||
1726 | for (i = 12; i >= 0; i -= 4) { | ||
1727 | int digit = (value >> i) & 0xf; | ||
1728 | *dest++ = (byte) (digit + (digit < 10 ? '0' : 'A' - 10)); | ||
1729 | } | ||
1730 | *dest++ = '\r'; | ||
1731 | *dest++ = '\n'; | ||
1732 | return dest; | ||
1733 | } | ||
1734 | |||
1735 | static byte *start_sap_header(byte *dest, const ASAP_ModuleInfo *module_info) | 1751 | static byte *start_sap_header(byte *dest, const ASAP_ModuleInfo *module_info) |
1736 | { | 1752 | { |
1737 | dest = put_string(dest, "SAP\r\n"); | 1753 | dest = put_string(dest, "SAP\r\n"); |
@@ -1798,24 +1814,6 @@ static byte *put_durations(byte *dest, const ASAP_ModuleInfo *module_info) | |||
1798 | return dest; | 1814 | return dest; |
1799 | } | 1815 | } |
1800 | 1816 | ||
1801 | static byte *put_sap_header(byte *dest, const ASAP_ModuleInfo *module_info, char type, int music, int init, int player) | ||
1802 | { | ||
1803 | dest = start_sap_header(dest, module_info); | ||
1804 | if (dest == NULL) | ||
1805 | return NULL; | ||
1806 | dest = put_string(dest, "TYPE "); | ||
1807 | *dest++ = type; | ||
1808 | *dest++ = '\r'; | ||
1809 | *dest++ = '\n'; | ||
1810 | if (module_info->fastplay != 312) | ||
1811 | dest = put_dec_tag(dest, "FASTPLAY ", module_info->fastplay); | ||
1812 | dest = put_hex_tag(dest, "MUSIC ", music); | ||
1813 | dest = put_hex_tag(dest, "INIT ", init); | ||
1814 | dest = put_hex_tag(dest, "PLAYER ", player); | ||
1815 | dest = put_durations(dest, module_info); | ||
1816 | return dest; | ||
1817 | } | ||
1818 | |||
1819 | int ASAP_SetModuleInfo(const ASAP_ModuleInfo *module_info, const BYTEARRAY module, int module_len, BYTEARRAY out_module) | 1817 | int ASAP_SetModuleInfo(const ASAP_ModuleInfo *module_info, const BYTEARRAY module, int module_len, BYTEARRAY out_module) |
1820 | { | 1818 | { |
1821 | byte *dest; | 1819 | byte *dest; |
@@ -1851,6 +1849,8 @@ int ASAP_SetModuleInfo(const ASAP_ModuleInfo *module_info, const BYTEARRAY modul | |||
1851 | return dest - out_module; | 1849 | return dest - out_module; |
1852 | } | 1850 | } |
1853 | 1851 | ||
1852 | #if !defined(ASAP_ONLY_SAP) && !defined(ASAP_ONLY_INFO) | ||
1853 | |||
1854 | #define RMT_INIT 0x0c80 | 1854 | #define RMT_INIT 0x0c80 |
1855 | #define TM2_INIT 0x1080 | 1855 | #define TM2_INIT 0x1080 |
1856 | 1856 | ||
@@ -1903,6 +1903,39 @@ const char *ASAP_CanConvert( | |||
1903 | return NULL; | 1903 | return NULL; |
1904 | } | 1904 | } |
1905 | 1905 | ||
1906 | static byte *put_hex_tag(byte *dest, const char *tag, int value) | ||
1907 | { | ||
1908 | int i; | ||
1909 | if (value < 0) | ||
1910 | return dest; | ||
1911 | dest = put_string(dest, tag); | ||
1912 | for (i = 12; i >= 0; i -= 4) { | ||
1913 | int digit = (value >> i) & 0xf; | ||
1914 | *dest++ = (byte) (digit + (digit < 10 ? '0' : 'A' - 10)); | ||
1915 | } | ||
1916 | *dest++ = '\r'; | ||
1917 | *dest++ = '\n'; | ||
1918 | return dest; | ||
1919 | } | ||
1920 | |||
1921 | static byte *put_sap_header(byte *dest, const ASAP_ModuleInfo *module_info, char type, int music, int init, int player) | ||
1922 | { | ||
1923 | dest = start_sap_header(dest, module_info); | ||
1924 | if (dest == NULL) | ||
1925 | return NULL; | ||
1926 | dest = put_string(dest, "TYPE "); | ||
1927 | *dest++ = type; | ||
1928 | *dest++ = '\r'; | ||
1929 | *dest++ = '\n'; | ||
1930 | if (module_info->fastplay != 312) | ||
1931 | dest = put_dec_tag(dest, "FASTPLAY ", module_info->fastplay); | ||
1932 | dest = put_hex_tag(dest, "MUSIC ", music); | ||
1933 | dest = put_hex_tag(dest, "INIT ", init); | ||
1934 | dest = put_hex_tag(dest, "PLAYER ", player); | ||
1935 | dest = put_durations(dest, module_info); | ||
1936 | return dest; | ||
1937 | } | ||
1938 | |||
1906 | int ASAP_Convert( | 1939 | int ASAP_Convert( |
1907 | const char *filename, const ASAP_ModuleInfo *module_info, | 1940 | const char *filename, const ASAP_ModuleInfo *module_info, |
1908 | const BYTEARRAY module, int module_len, BYTEARRAY out_module) | 1941 | const BYTEARRAY module, int module_len, BYTEARRAY out_module) |
@@ -2203,4 +2236,32 @@ int ASAP_Convert( | |||
2203 | } | 2236 | } |
2204 | } | 2237 | } |
2205 | 2238 | ||
2206 | #endif /* defined(C) && !defined(ASAP_ONLY_SAP) */ | 2239 | #endif /* !defined(ASAP_ONLY_SAP) && !defined(ASAP_ONLY_INFO) */ |
2240 | |||
2241 | static abool has_two_digits(const char *s) | ||
2242 | { | ||
2243 | return s[0] >= '0' && s[0] <= '9' && s[1] >= '0' && s[1] <= '9'; | ||
2244 | } | ||
2245 | |||
2246 | /* "DD/MM/YYYY", "MM/YYYY", "YYYY" -> "YYYY" */ | ||
2247 | abool ASAP_DateToYear(const char *date, char *year) | ||
2248 | { | ||
2249 | if (!has_two_digits(date)) | ||
2250 | return FALSE; | ||
2251 | if (date[2] == '/') { | ||
2252 | date += 3; | ||
2253 | if (!has_two_digits(date)) | ||
2254 | return FALSE; | ||
2255 | if (date[2] == '/') { | ||
2256 | date += 3; | ||
2257 | if (!has_two_digits(date)) | ||
2258 | return FALSE; | ||
2259 | } | ||
2260 | } | ||
2261 | if (!has_two_digits(date + 2) || date[4] != '\0') | ||
2262 | return FALSE; | ||
2263 | memcpy(year, date, 5); | ||
2264 | return TRUE; | ||
2265 | } | ||
2266 | |||
2267 | #endif /* C */ | ||
diff --git a/apps/codecs/libasap/asap.h b/apps/codecs/libasap/asap.h index b43b3ce0c2..0758b60bfb 100644 --- a/apps/codecs/libasap/asap.h +++ b/apps/codecs/libasap/asap.h | |||
@@ -31,8 +31,8 @@ extern "C" { | |||
31 | /* ASAP version. */ | 31 | /* ASAP version. */ |
32 | #define ASAP_VERSION_MAJOR 2 | 32 | #define ASAP_VERSION_MAJOR 2 |
33 | #define ASAP_VERSION_MINOR 1 | 33 | #define ASAP_VERSION_MINOR 1 |
34 | #define ASAP_VERSION_MICRO 0 | 34 | #define ASAP_VERSION_MICRO 2 |
35 | #define ASAP_VERSION "2.1.0" | 35 | #define ASAP_VERSION "2.1.2" |
36 | 36 | ||
37 | /* Short credits of the ASAP engine. */ | 37 | /* Short credits of the ASAP engine. */ |
38 | #define ASAP_YEARS "2005-2010" | 38 | #define ASAP_YEARS "2005-2010" |
@@ -98,6 +98,7 @@ typedef struct { | |||
98 | int durations[ASAP_SONGS_MAX]; /* lengths of songs, in milliseconds, -1 = indeterminate */ | 98 | int durations[ASAP_SONGS_MAX]; /* lengths of songs, in milliseconds, -1 = indeterminate */ |
99 | abool loops[ASAP_SONGS_MAX]; /* whether songs repeat or not */ | 99 | abool loops[ASAP_SONGS_MAX]; /* whether songs repeat or not */ |
100 | /* the following technical information should not be used outside ASAP. */ | 100 | /* the following technical information should not be used outside ASAP. */ |
101 | abool ntsc; | ||
101 | int type; | 102 | int type; |
102 | int fastplay; | 103 | int fastplay; |
103 | int music; | 104 | int music; |
@@ -216,6 +217,9 @@ abool ASAP_ChangeExt(char *filename, const char *ext); | |||
216 | abool ASAP_GetModuleInfo(ASAP_ModuleInfo *module_info, const char *filename, | 217 | abool ASAP_GetModuleInfo(ASAP_ModuleInfo *module_info, const char *filename, |
217 | const byte module[], int module_len); | 218 | const byte module[], int module_len); |
218 | 219 | ||
220 | /* Extracts year from date. */ | ||
221 | abool ASAP_DateToYear(const char *date, char *year); | ||
222 | |||
219 | /* Loads music data. | 223 | /* Loads music data. |
220 | "ast" is the destination structure. | 224 | "ast" is the destination structure. |
221 | "filename" determines file format. | 225 | "filename" determines file format. |
diff --git a/apps/codecs/libasap/asap_internal.h b/apps/codecs/libasap/asap_internal.h index 1e38496344..5367085c7e 100644 --- a/apps/codecs/libasap/asap_internal.h +++ b/apps/codecs/libasap/asap_internal.h | |||
@@ -76,8 +76,6 @@ void trace_cpu(const ASAP_State *ast, int pc, int a, int x, int y, int s, int nz | |||
76 | 76 | ||
77 | #endif /* C */ | 77 | #endif /* C */ |
78 | 78 | ||
79 | #define ASAP_MAIN_CLOCK 1773447 | ||
80 | |||
81 | #define V_FLAG 0x40 | 79 | #define V_FLAG 0x40 |
82 | #define D_FLAG 0x08 | 80 | #define D_FLAG 0x08 |
83 | #define I_FLAG 0x04 | 81 | #define I_FLAG 0x04 |
@@ -111,6 +109,7 @@ void trace_cpu(const ASAP_State *ast, int pc, int a, int x, int y, int s, int nz | |||
111 | #define PutByte(addr, data) do { if (((addr) & 0xf900) == 0xd000) ASAP_PutByte(ast, addr, data); else dPutByte(addr, data); } while (FALSE) | 109 | #define PutByte(addr, data) do { if (((addr) & 0xf900) == 0xd000) ASAP_PutByte(ast, addr, data); else dPutByte(addr, data); } while (FALSE) |
112 | #define RMW_GetByte(dest, addr) do { if (((addr) >> 8) == 0xd2) { dest = ASAP_GetByte(ast, addr); ast _ cycle--; ASAP_PutByte(ast, addr, dest); ast _ cycle++; } else dest = dGetByte(addr); } while (FALSE) | 110 | #define RMW_GetByte(dest, addr) do { if (((addr) >> 8) == 0xd2) { dest = ASAP_GetByte(ast, addr); ast _ cycle--; ASAP_PutByte(ast, addr, dest); ast _ cycle++; } else dest = dGetByte(addr); } while (FALSE) |
113 | 111 | ||
114 | #define CYCLE_TO_SAMPLE(cycle) TO_INT(((cycle) * ASAP_SAMPLE_RATE + ast _ sample_offset) / ASAP_MAIN_CLOCK) | 112 | #define ASAP_MAIN_CLOCK(ast) ((ast) _ module_info.ntsc ? 1789772 : 1773447) |
113 | #define CYCLE_TO_SAMPLE(cycle) TO_INT(((cycle) * ASAP_SAMPLE_RATE + ast _ sample_offset) / ASAP_MAIN_CLOCK(ast)) | ||
115 | 114 | ||
116 | #endif /* _ASAP_INTERNAL_H_ */ | 115 | #endif /* _ASAP_INTERNAL_H_ */ |